2d8cb0f · unity8 · git.iko.soy

debian/changelog+53

compare with xenial

unifiedsplit

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

1+unity8 (8.11+15.04.20150817-0ubuntu1) vivid; urgency=medium

2+

3+ [ Albert Astals Cid ]

4+ * Drop gcc 4.9 requirement in debian/rules

5+ * Make the test more stable

6+ * Optimize scope.preview() calls (LP: #1478022)

7+

8+ [ Alberto Mardegan ]

9+ * Set currentIndex after the model change is completed (LP: #1433442)

10+

11+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 17 Aug 2015 11:57:31 +0000

12+

13+unity8 (8.11+15.04.20150814-0ubuntu1) vivid; urgency=medium

14+

15+ [ Albert Astals Cid ]

16+ * Make the test pass again after rework of appmanager

17+ * fix testPhoneStage

18+

19+ [ CI Train Bot ]

20+ * New rebuild forced.

21+

22+ [ Daniel d'Andrada ]

23+ * Fix and clean up InputInfo plugin

24+

25+ [ Rodney Dawes ]

26+ * Do not call verify in the payments button code. (LP: #1468038)

27+

28+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 14 Aug 2015 09:53:11 +0000

29+

30+unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium

31+

32+ [ Albert Astals Cid ]

33+ * Add a test that checks that items in an expandable are the correct

34+ size after expanding the expandable

35+ * Fix the expandable test

36+ * Replace some waitForRendering with wait(0)

37+ * Workaround for bug 1473471 (LP: #1473471)

38+

39+ [ Gary.Wzl ]

40+ * Fix layout issue when adding audio track widget in expandable widget

41+

42+ [ handsome_feng ]

43+ * Added indication for running apps. (LP: #1471577)

44+ * Adjust the color to highlighting indicator. (LP: #1457098)

45+ * Convert the MouseArea to MultiPointTouchArea to track multiple touch

46+ points. (LP: #1445472)

47+

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

49+ * Convert the MouseArea to MultiPointTouchArea to track multiple touch

50+ points. (LP: #1445472)

51+

52+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 12 Aug 2015 08:41:24 +0000

53+

1unity8 (8.10+15.10.20150804-0ubuntu1) wily; urgency=medium

54unity8 (8.10+15.10.20150804-0ubuntu1) wily; urgency=medium

2

55

3 [ Kevin Gunn ]

56 [ Kevin Gunn ]

debian/control+1−1

@@ -128,7 +128,7 @@ Depends: qml-module-qtquick-layouts,

128 unity-application-impl-6,

129 unity-notifications-impl-3,

130 unity-plugin-scopes | unity-scopes-impl,

131− unity-scopes-impl-6,

131+ unity-scopes-impl-7,

132 unity8-fake-env | unity-application-impl,

133 ${misc:Depends},

134Breaks: unity8 (<< 7.86),

debian/rules−5

@@ -8,11 +8,6 @@ include /usr/share/dpkg/default.mk

8export DPKG_GENSYMBOLS_CHECK_LEVEL=4

9export NO_PNG_PKG_MANGLE=1

10

11−# Explicitly selecting a G{CC,++}-version here to avoid accidental

12−# ABI breaks introduced by toolchain updates.

13−export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9

14−export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9

15−

16%:

11%:

17 dh $@ --parallel --fail-missing --with python3

12 dh $@ --parallel --fail-missing --with python3

18

13

plugins/Ubuntu/Payments/Payments.cpp−2

@@ -123,8 +123,6 @@ void Payments::setStoreItemId(const QString &store_item_id)

123 if (m_store_item_id.isEmpty()) {

124 return;

125 }

126−

127− pay_package_item_start_verification(m_package, m_store_item_id.toLocal8Bit().data());

128}

126}

129

127

130void Payments::setPurchasing(bool is_purchasing)

128void Payments::setPurchasing(bool is_purchasing)

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−11

@@ -101,8 +101,6 @@ void QInputDeviceInfoPrivate::init()

101 if (!iDevice)

102 continue;

103

104− qDebug() << "*** ADDING DEVICE" << eventPath;

105−

106 iDevice->setTypes(getInputTypes(dev));

104 iDevice->setTypes(getInputTypes(dev));

107

105

108 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)

106 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)

@@ -125,12 +123,6 @@ void QInputDeviceInfoPrivate::init()

125

123

126QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)

124QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)

127{

125{

128− qDebug() << "******* have input type Keyboard" << udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");

129− qDebug() << "******* have input type Mouse" << udev_device_get_property_value(dev, "ID_INPUT_MOUSE");

130− qDebug() << "******* have input type Touchpad" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD");

131− qDebug() << "******* have input type Touchscreen" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN");

132− qDebug() << "******* have input type Tablet" << udev_device_get_property_value(dev, "ID_INPUT_TABLET");

133− qDebug() << "******* have input type joystick" << udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");

134 QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;

126 QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;

135 if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )

127 if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )

136 types |= QInputDeviceInfo::Keyboard;

128 types |= QInputDeviceInfo::Keyboard;

@@ -151,6 +143,7 @@ QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev

151QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)

143QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)

152{

144{

153 QInputDevice *inputDevice = new QInputDevice(this);

145 QInputDevice *inputDevice = new QInputDevice(this);

146+ inputDevice->setDevicePath(path);

154

147

155 struct libevdev *dev = NULL;

148 struct libevdev *dev = NULL;

156 int fd;

149 int fd;

@@ -158,17 +151,15 @@ QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)

158 fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);

151 fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);

159

152

160 if (fd == -1) {

153 if (fd == -1) {

161− qDebug() << "Failed to open";

162 return inputDevice;

154 return inputDevice;

163 }

155 }

164 rc = libevdev_new_from_fd(fd, &dev);

156 rc = libevdev_new_from_fd(fd, &dev);

165 if (rc < 0) {

157 if (rc < 0) {

166− qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";

158+ qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";

167 return inputDevice;

159 return inputDevice;

168 }

160 }

169

161

170 inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));

162 inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));

171− inputDevice->setDevicePath(path);

172 for (int i = 0; i < EV_MAX; i++) {

163 for (int i = 0; i < EV_MAX; i++) {

173 if (i == EV_KEY || i == EV_SW || i == EV_REL

164 if (i == EV_KEY || i == EV_SW || i == EV_REL

174 || i == EV_REL || i == EV_ABS) {

165 || i == EV_REL || i == EV_ABS) {

plugins/Unity/Launcher/launchermodel.cpp−1

@@ -516,7 +516,6 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

516 Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});

517 }

518 item->setRunning(true);

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

520 } else {

519 } else {

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

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

522 item->setRecent(true);

521 item->setRecent(true);

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-08-04 05:41+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

po/be.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: 2015-07-25 05:38+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

po/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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

21

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

23msgid "Password: "

po/ca.po+3−3

@@ -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-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

@@ -376,7 +376,7 @@ msgstr "La contrasenya no és correcta"

376#: qml/Greeter/NarrowView.qml:121

377msgctxt "passphrase"

378msgid "Please re-enter"

379−msgstr ""

379+msgstr "Torneu-ho a introduir"

380

381#: qml/Greeter/NarrowView.qml:122

382msgid "Sorry, incorrect passcode"

po/ca@valencia.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/ce.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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20"Language: cs\n"

21

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

po/cy.po+2−2

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

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

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

18"2 : 3;\n"

19−"X-Launchpad-Export-Date: 2015-08-04 05:41+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

po/da.po+2−2

@@ -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-07-25 05:38+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/en_GB.po+3−3

@@ -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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

@@ -370,7 +370,7 @@ msgstr "Sorry, incorrect passphrase"

370#: qml/Greeter/NarrowView.qml:121

371msgctxt "passphrase"

372msgid "Please re-enter"

373−msgstr ""

373+msgstr "Please re-enter"

374

375#: qml/Greeter/NarrowView.qml:122

376msgid "Sorry, incorrect passcode"

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/eu.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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/fi.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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-28 05:40+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/ga.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 ? 1 : 2;\n"

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

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21"Language: gd\n"

22

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

po/gl.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: 2015-08-04 05:41+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/gv.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 ? 1 : 2);\n"

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

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-08-04 05:41+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

po/ia.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/is.po+2−2

@@ -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-07-25 05:39+0000\n"

20+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

21−"X-Generator: Launchpad (build 17628)\n"

21+"X-Generator: Launchpad (build 17686)\n"

22"Language: is\n"

23

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

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/km.po+40−40

@@ -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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

@@ -133,7 +133,7 @@ msgstr[1] ""

133#: qml/Components/Dialogs.qml:69

134msgctxt "Title: Lock/Log out dialog"

135msgid "Log out"

136−msgstr ""

136+msgstr "ចេញ"

137

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

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

@@ -142,12 +142,12 @@ msgstr "តើអ្នកពិតជាចង់ចេញមែ

142#: qml/Components/Dialogs.qml:72

143msgctxt "Button: Lock the system"

144msgid "Lock"

145−msgstr ""

145+msgstr "ចាក់សោ"

146

147#: qml/Components/Dialogs.qml:79

148msgctxt "Button: Log out from the system"

149msgid "Log Out"

150−msgstr ""

150+msgstr "ចេញ"

151

152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117

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

@@ -157,7 +157,7 @@ msgstr "បោះបង់"

157#: qml/Components/Dialogs.qml:98

158msgctxt "Title: Reboot/Shut down dialog"

159msgid "Shut down"

160−msgstr ""

160+msgstr "បិទ"

161

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

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

@@ -166,17 +166,17 @@ msgstr "តើអ្នកពិតជាចង់បិទមែ

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

167msgctxt "Button: Reboot the system"

168msgid "Reboot"

169−msgstr ""

169+msgstr "ចាប់ផ្ដើមឡើងវិញ"

170

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

172msgctxt "Button: Shut down the system"

173msgid "Shut down"

174−msgstr ""

174+msgstr "បិទ"

175

176#: qml/Components/Dialogs.qml:129

177msgctxt "Title: Reboot dialog"

178msgid "Reboot"

179−msgstr ""

179+msgstr "ចាប់ផ្ដើមឡើងវិញ"

180

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

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

@@ -193,7 +193,7 @@ msgstr "បាទ/ចាស"

193#: qml/Components/Dialogs.qml:152

194msgctxt "Title: Power off/Restart dialog"

195msgid "Power"

196−msgstr ""

196+msgstr "ថាមពល"

197

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

199msgid ""

@@ -206,12 +206,12 @@ msgstr ""

206#: qml/Components/Dialogs.qml:155

207msgctxt "Button: Power off the system"

208msgid "Power off"

209−msgstr ""

209+msgstr "បិទ"

210

211#: qml/Components/Dialogs.qml:164

212msgctxt "Button: Restart the system"

213msgid "Restart"

214−msgstr ""

214+msgstr "ចាប់ផ្ដើមឡើងវិញ"

215

216#: qml/Components/Lockscreen.qml:245

217msgid "Return to Call"

@@ -236,22 +236,22 @@ msgstr "មើលទាំងអស់"

236#: qml/Dash/GenericScopeView.qml:601

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

238msgid "Search"

239−msgstr ""

239+msgstr "ស្វែងរក"

240

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

242msgctxt "Button: Open the Ubuntu Store"

243msgid "Store"

244−msgstr ""

244+msgstr "រក្សាទុក"

245

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

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

248msgid "Search"

249−msgstr ""

249+msgstr "ស្វែងរក"

250

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

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

253msgid "Settings"

254−msgstr ""

254+msgstr "ការកំណត់"

255

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

257msgid "Remove from Favorites"

@@ -295,11 +295,11 @@ msgstr ""

295

296#: qml/Dash/ScopesList.qml:67

297msgid "Manage"

298−msgstr ""

298+msgstr "គ្រប់គ្រង"

299

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

301msgid "Home"

302−msgstr ""

302+msgstr "ផ្ទះ"

303

304#: qml/Dash/ScopesList.qml:114

305msgid "Also installed"

@@ -307,11 +307,11 @@ msgstr ""

307

308#: qml/Greeter/CoverPage.qml:107

309msgid "Unlock"

310−msgstr ""

310+msgstr "ដោះសោ"

311

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

313msgid "Retry"

314−msgstr ""

314+msgstr "ព្យាយាមម្ដងទៀត"

315

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

317msgid "Tap to unlock"

@@ -452,7 +452,7 @@ msgstr "បានបរាជ័យ ប៉ះ ដើម្បីព្

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

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

454msgid "Reply"

455−msgstr ""

455+msgstr "ឆ្លើយតប"

456

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

458msgid "Unlock SIM"

@@ -522,26 +522,26 @@ msgstr ""

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

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

524msgid "Back"

525−msgstr ""

525+msgstr "ថយក្រោយ"

526

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

528msgid "Hi!"

529−msgstr ""

529+msgstr "សួស្ដី!"

530

531#: qml/Wizard/Pages/10-welcome.qml:44

532msgid "Welcome to your Ubuntu phone."

533−msgstr ""

533+msgstr "សូមស្វាគមន៍មកកាន់ទូរស័ព្ទ Ubuntu ។"

534

535#: qml/Wizard/Pages/10-welcome.qml:52

536msgid "Let’s get started."

537−msgstr ""

537+msgstr "តោះចាប់ផ្ដើម។"

538

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

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

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

542#: qml/Wizard/Pages/passwd-set.qml:90

543msgid "Continue"

544−msgstr ""

544+msgstr "បន្ត"

545

546#: qml/Wizard/Pages/20-sim.qml:25

547msgid "Add a SIM card and restart your device"

@@ -553,11 +553,11 @@ msgstr ""

553

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

555msgid "Skip"

556−msgstr ""

556+msgstr "រំលង"

557

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

559msgid "Lock security"

560−msgstr ""

560+msgstr "ចាក់សោសុវត្ថិភាព"

561

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

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

@@ -566,7 +566,7 @@ msgstr ""

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

567msgctxt "Label: Type of security method"

568msgid "Swipe"

569−msgstr ""

569+msgstr "រុញ"

570

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

572msgctxt "Label: Description of security method"

@@ -586,7 +586,7 @@ msgstr ""

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

587msgctxt "Label: Type of security method"

588msgid "Passphrase"

589−msgstr ""

589+msgstr "ឃ្លាសម្ងាត់"

590

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

592msgctxt "Label: Description of security method"

@@ -607,7 +607,7 @@ msgstr ""

607

608#: qml/Wizard/Pages/50-location.qml:27

609msgid "Location"

610−msgstr ""

610+msgstr "ទីតាំង"

611

612#: qml/Wizard/Pages/50-location.qml:62

613msgid "Let the phone detect your location:"

@@ -654,27 +654,27 @@ msgstr ""

654

655#: qml/Wizard/Pages/80-finished.qml:24

656msgid "All done"

657−msgstr ""

657+msgstr "ធ្វើរួចទាំងអស់"

658

659#: qml/Wizard/Pages/80-finished.qml:39

660msgid "Nice work!"

661−msgstr ""

661+msgstr "ដំណើរការល្អ!"

662

663#: qml/Wizard/Pages/80-finished.qml:46

664msgid "Your phone is now ready to use."

665−msgstr ""

665+msgstr "ទូរស័ព្ទរបស់អ្នកឥឡូវអាចប្រើបាន។"

666

667#: qml/Wizard/Pages/80-finished.qml:53

668msgid "Finish"

669−msgstr ""

669+msgstr "បញ្ចប់"

670

671#: qml/Wizard/Pages/here-terms.qml:27

672msgid "Terms & Conditions"

673−msgstr ""

673+msgstr "លក្ខខណ្ឌប្រើប្រាស់"

674

675#: qml/Wizard/Pages/passwd-confirm.qml:49

676msgid "Confirm passphrase"

677−msgstr ""

677+msgstr "បញ្ជាក់ឃ្លាសម្ងាត់"

678

679#: qml/Wizard/Pages/passwd-confirm.qml:50

680msgid "Confirm passcode"

@@ -683,7 +683,7 @@ msgstr ""

683#: qml/Wizard/Pages/passwd-confirm.qml:53

684#: qml/Wizard/Pages/passwd-confirm.qml:54

685msgid "Please try again."

686−msgstr ""

686+msgstr "សូមព្យាយាមម្ដងទៀត។"

687

688#: qml/Wizard/Pages/passwd-set.qml:61

689msgid "Choose your passcode"

@@ -697,13 +697,13 @@ msgstr ""

697#: qml/Wizard/StackButton.qml:39

698#, qt-format

699msgid "〈 %1"

700−msgstr ""

700+msgstr "〈 %1"

701

702#. Translators: This is the arrow for "Forward" buttons

703#: qml/Wizard/StackButton.qml:42

704#, qt-format

705msgid "%1 〉"

706−msgstr ""

706+msgstr "%1 〉"

707

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

709#~ msgstr "សាកល្បងអូសពីគែមស្ដាំ ដើម្បីដោះសោទូរស័ព្ទ"

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/ku.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/mr.po+12−12

@@ -15,12 +15,12 @@ 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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

23−msgstr ""

23+msgstr "पासवर्ड: "

24

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

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

@@ -142,7 +142,7 @@ msgstr ""

142#: qml/Components/Dialogs.qml:72

143msgctxt "Button: Lock the system"

144msgid "Lock"

145−msgstr ""

145+msgstr "लॉक करा"

146

147#: qml/Components/Dialogs.qml:79

148msgctxt "Button: Log out from the system"

@@ -152,7 +152,7 @@ msgstr ""

152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117

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

154msgid "Cancel"

155−msgstr ""

155+msgstr "रद्द"

156

157#: qml/Components/Dialogs.qml:98

158msgctxt "Title: Reboot/Shut down dialog"

@@ -184,11 +184,11 @@ msgstr ""

184

185#: qml/Components/Dialogs.qml:132

186msgid "No"

187−msgstr ""

187+msgstr "नाही"

188

189#: qml/Components/Dialogs.qml:138

190msgid "Yes"

191−msgstr ""

191+msgstr "हो"

192

193#: qml/Components/Dialogs.qml:152

194msgctxt "Title: Power off/Restart dialog"

@@ -234,7 +234,7 @@ msgstr ""

234#: qml/Dash/GenericScopeView.qml:601

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

236msgid "Search"

237−msgstr ""

237+msgstr "शोध"

238

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

240msgctxt "Button: Open the Ubuntu Store"

@@ -244,7 +244,7 @@ msgstr ""

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

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

246msgid "Search"

247−msgstr ""

247+msgstr "शोध"

248

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

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

@@ -253,11 +253,11 @@ msgstr ""

253

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

255msgid "Remove from Favorites"

256−msgstr ""

256+msgstr "आवड पासून काढूण टाका"

257

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

259msgid "Add to Favorites"

260−msgstr ""

260+msgstr "आवड मध्ये जोडा"

261

262#: qml/Dash/Previews/PreviewActionCombo.qml:35

263msgid "More..."

@@ -277,7 +277,7 @@ msgstr ""

277

278#: qml/Dash/Previews/PreviewRatingInput.qml:169

279msgid "Send"

280−msgstr ""

280+msgstr "पाठवा"

281

282#: qml/Dash/PullToRefreshScopeStyle.qml:55

283msgid "Pull to refresh…"

po/ms.po+81−73

@@ -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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

@@ -135,7 +135,7 @@ msgstr[1] "Sila tunggu %1 minit kemudian cuba lagi..."

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

136msgctxt "Title: Lock/Log out dialog"

137msgid "Log out"

138−msgstr ""

138+msgstr "Daftar keluar"

139

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

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

@@ -144,12 +144,12 @@ msgstr "Anda pasti mahu mendaftar keluar?"

144#: qml/Components/Dialogs.qml:72

145msgctxt "Button: Lock the system"

146msgid "Lock"

147−msgstr ""

147+msgstr "Kunci"

148

149#: qml/Components/Dialogs.qml:79

150msgctxt "Button: Log out from the system"

151msgid "Log Out"

152−msgstr ""

152+msgstr "Daftar Keluar"

153

154#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117

155#: qml/Components/Dialogs.qml:173

@@ -159,7 +159,7 @@ msgstr "Batal"

159#: qml/Components/Dialogs.qml:98

160msgctxt "Title: Reboot/Shut down dialog"

161msgid "Shut down"

162−msgstr ""

162+msgstr "Matikan"

163

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

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

@@ -168,17 +168,17 @@ msgstr "Anda pasti mahu matikan?"

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

169msgctxt "Button: Reboot the system"

170msgid "Reboot"

171−msgstr ""

171+msgstr "But Semula"

172

173#: qml/Components/Dialogs.qml:109

174msgctxt "Button: Shut down the system"

175msgid "Shut down"

176−msgstr ""

176+msgstr "Matikan"

177

178#: qml/Components/Dialogs.qml:129

179msgctxt "Title: Reboot dialog"

180msgid "Reboot"

181−msgstr ""

181+msgstr "But Semula"

182

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

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

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

195#: qml/Components/Dialogs.qml:152

196msgctxt "Title: Power off/Restart dialog"

197msgid "Power"

198−msgstr ""

198+msgstr "Kuasa"

199

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

201msgid ""

@@ -206,16 +206,16 @@ msgstr "Anda pasti mahu tutup?"

206#: qml/Components/Dialogs.qml:155

207msgctxt "Button: Power off the system"

208msgid "Power off"

209−msgstr ""

209+msgstr "Padam"

210

211#: qml/Components/Dialogs.qml:164

212msgctxt "Button: Restart the system"

213msgid "Restart"

214−msgstr ""

214+msgstr "Mula Semula"

215

216#: qml/Components/Lockscreen.qml:245

217msgid "Return to Call"

218−msgstr ""

218+msgstr "Kembali ke Panggilan"

219

220#: qml/Components/Lockscreen.qml:245

221msgid "Emergency Call"

@@ -236,22 +236,22 @@ msgstr "Lihat semua"

236#: qml/Dash/GenericScopeView.qml:601

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

238msgid "Search"

239−msgstr ""

239+msgstr "Gelintar"

240

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

242msgctxt "Button: Open the Ubuntu Store"

243msgid "Store"

244−msgstr ""

244+msgstr "Kedai"

245

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

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

248msgid "Search"

249−msgstr ""

249+msgstr "Gelintar"

250

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

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

253msgid "Settings"

254−msgstr ""

254+msgstr "Tetapan"

255

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

257msgid "Remove from Favorites"

@@ -291,19 +291,19 @@ msgstr "Lepas untuk segar semula..."

291

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

293msgid "Enable location data"

294−msgstr ""

294+msgstr "Benarkan data lokasi"

295

296#: qml/Dash/ScopesList.qml:67

297msgid "Manage"

298−msgstr ""

298+msgstr "Urus"

299

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

301msgid "Home"

302−msgstr ""

302+msgstr "Rumah"

303

304#: qml/Dash/ScopesList.qml:114

305msgid "Also installed"

306−msgstr ""

306+msgstr "Juga dipasang"

307

308#: qml/Greeter/CoverPage.qml:107

309msgid "Unlock"

@@ -311,11 +311,11 @@ msgstr "Buka"

311

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

313msgid "Retry"

314−msgstr ""

314+msgstr "Cuba Lagi"

315

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

317msgid "Tap to unlock"

318−msgstr ""

318+msgstr "Ketik untuk buka"

319

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

321msgid "Sorry, incorrect passphrase."

@@ -450,7 +450,7 @@ msgstr "Gagal, ketuk untuk cuba lagi"

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

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

452msgid "Reply"

453−msgstr ""

453+msgstr "Balas"

454

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

456msgid "Unlock SIM"

@@ -462,24 +462,24 @@ msgstr "Perayauan"

462

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

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

465−msgstr ""

465+msgstr "Tindakan ini melakukan perkara yang berlainan untuk apl berbeza"

466

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

468msgid "Tap here to finish."

469−msgstr ""

469+msgstr "Ketik di sini untuk selesaikan."

470

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

472msgid "Open special menus"

473−msgstr ""

473+msgstr "Buka menu khas"

474

475#: qml/Tutorial/TutorialBottom.qml:29

476msgid "Swipe up from the bottom edge."

477−msgstr ""

477+msgstr "Leret ke ata dari pinggir bawah."

478

479#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25

480#: qml/Tutorial/TutorialRight.qml:144

481msgid "Tap here to continue."

482−msgstr ""

482+msgstr "Ketik di sini untuk teruskan."

483

484#: qml/Tutorial/TutorialContent.qml:81

485msgid "Click here to finish."

@@ -487,137 +487,139 @@ msgstr ""

487

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

489msgid "These are the shortcuts to favorite apps"

490−msgstr ""

490+msgstr "Ini adalah pintasan ke apl kegemaran"

491

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

493msgid "Open the launcher"

494−msgstr ""

494+msgstr "Buka pelancar"

495

496#: qml/Tutorial/TutorialLeft.qml:27

497msgid "Short swipe from the left edge."

498−msgstr ""

498+msgstr "Leret pendek dari pinggir kiri."

499

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

501msgid "You almost got it!"

502−msgstr ""

502+msgstr "Anda hampir berjaya!"

503

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

505msgid "Try again."

506−msgstr ""

506+msgstr "Cuba lagi."

507

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

509msgid "To view open apps"

510−msgstr ""

510+msgstr "Untuk melihat apl dibuka"

511

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

513msgid "Long swipe from the right edge."

514−msgstr ""

514+msgstr "Leret panjang dari pinggir kanan."

515

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

517msgid "View all your running tasks."

518−msgstr ""

518+msgstr "Lihat semua tugas yang berjalan."

519

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

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

522msgid "Back"

523−msgstr ""

523+msgstr "Kembali"

524

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

526msgid "Hi!"

527−msgstr ""

527+msgstr "Hai"

528

529#: qml/Wizard/Pages/10-welcome.qml:44

530msgid "Welcome to your Ubuntu phone."

531−msgstr ""

531+msgstr "Selamat datang ke telefon Ubuntu anda."

532

533#: qml/Wizard/Pages/10-welcome.qml:52

534msgid "Let’s get started."

535−msgstr ""

535+msgstr "Mari mulakan."

536

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

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

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

540#: qml/Wizard/Pages/passwd-set.qml:90

541msgid "Continue"

542−msgstr ""

542+msgstr "Teruskan"

543

544#: qml/Wizard/Pages/20-sim.qml:25

545msgid "Add a SIM card and restart your device"

546−msgstr ""

546+msgstr "Tambah kad SIM dan mulakan semula peranti anda"

547

548#: qml/Wizard/Pages/20-sim.qml:59

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

550msgstr ""

551+"Tanpanya, anda tidak boleh membuat panggilan atau guna pemesejan teks."

551

552

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

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

553msgid "Skip"

554msgid "Skip"

554−msgstr ""

555+msgstr "Langkau"

555

556

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

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

557msgid "Lock security"

558msgid "Lock security"

558−msgstr ""

559+msgstr "Kunci keselamatan"

559

560

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

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

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

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

562−msgstr ""

563+msgstr "Sila pilih bagaimana anda mahu membuka telefon anda."

563

564

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

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

565msgctxt "Label: Type of security method"

566msgctxt "Label: Type of security method"

566msgid "Swipe"

567msgid "Swipe"

567−msgstr ""

568+msgstr "Leret"

568

569

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

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

570msgctxt "Label: Description of security method"

571msgctxt "Label: Description of security method"

571msgid "No security"

572msgid "No security"

572−msgstr ""

573+msgstr "Tanpa keselamatan"

573

574

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

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

575msgctxt "Label: Type of security method"

576msgctxt "Label: Type of security method"

576msgid "Passcode"

577msgid "Passcode"

577−msgstr ""

578+msgstr "Kod laluan"

578

579

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

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

580msgctxt "Label: Description of security method"

581msgctxt "Label: Description of security method"

581msgid "4 digits only"

582msgid "4 digits only"

582−msgstr ""

583+msgstr "4 digit sahaja"

583

584

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

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

585msgctxt "Label: Type of security method"

586msgctxt "Label: Type of security method"

586msgid "Passphrase"

587msgid "Passphrase"

587−msgstr ""

588+msgstr "Frasa laluan"

588

589

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

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

590msgctxt "Label: Description of security method"

591msgctxt "Label: Description of security method"

591msgid "Numbers and letters"

592msgid "Numbers and letters"

592−msgstr ""

593+msgstr "Nombor dan abjad"

593

594

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

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

595msgid "Connect to Wi‑Fi"

596msgid "Connect to Wi‑Fi"

596−msgstr ""

597+msgstr "Sambung ke Wi-Fi"

597

598

598#: qml/Wizard/Pages/40-wifi.qml:168

599#: qml/Wizard/Pages/40-wifi.qml:168

599msgid "Available networks…"

600msgid "Available networks…"

600−msgstr ""

601+msgstr "Rangkaian tersedia..."

601

602

602#: qml/Wizard/Pages/40-wifi.qml:169

603#: qml/Wizard/Pages/40-wifi.qml:169

603msgid "No available networks."

604msgid "No available networks."

604−msgstr ""

605+msgstr "Tiada rangkaian tersedia."

605

606

606#: qml/Wizard/Pages/50-location.qml:27

607#: qml/Wizard/Pages/50-location.qml:27

607msgid "Location"

608msgid "Location"

608−msgstr ""

609+msgstr "Lokasi"

609

610

610#: qml/Wizard/Pages/50-location.qml:62

611#: qml/Wizard/Pages/50-location.qml:62

611msgid "Let the phone detect your location:"

612msgid "Let the phone detect your location:"

612−msgstr ""

613+msgstr "Biarkan telefon mengesan lokasi anda:"

613

614

614#: qml/Wizard/Pages/50-location.qml:69

615#: qml/Wizard/Pages/50-location.qml:69

615msgid "Using GPS only (less accurate)"

616msgid "Using GPS only (less accurate)"

616−msgstr ""

617+msgstr "Hanya gunakan GPS (kurang tepat)"

617

618

618#: qml/Wizard/Pages/50-location.qml:86

619#: qml/Wizard/Pages/50-location.qml:86

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

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

620msgstr ""

621msgstr ""

622+"Gunakan GPS, Wi-Fi awanama dan maklumat rangkaian selular (disarankan)"

621

623

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

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

623#: qml/Wizard/Pages/50-location.qml:103

625#: qml/Wizard/Pages/50-location.qml:103

@@ -625,83 +627,89 @@ msgid ""

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

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

626"conditions</a>."

628"conditions</a>."

627msgstr ""

629msgstr ""

630+"Dengan memilih pilihan ini anda menyetujui <a href='#'>terma dan syarat</a> "

631+"Nokia HERE."

628

632

629#: qml/Wizard/Pages/50-location.qml:112

633#: qml/Wizard/Pages/50-location.qml:112

630msgid "Not at all"

634msgid "Not at all"

631−msgstr ""

635+msgstr "Tidak sama sekali"

632

636

633#: qml/Wizard/Pages/50-location.qml:124

637#: qml/Wizard/Pages/50-location.qml:124

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

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

635−msgstr ""

639+msgstr "Anda boleh mengubahnya kemudian di dalam Tetapan Sistem."

636

640

637#: qml/Wizard/Pages/60-reporting.qml:24

641#: qml/Wizard/Pages/60-reporting.qml:24

638msgid "Improving your experience"

642msgid "Improving your experience"

639−msgstr ""

643+msgstr "Menambahbaik pengalaman anda"

640

644

641#: qml/Wizard/Pages/60-reporting.qml:36

645#: qml/Wizard/Pages/60-reporting.qml:36

642msgid ""

646msgid ""

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

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

644"partners, the makers of the operating system."

648"partners, the makers of the operating system."

645msgstr ""

649msgstr ""

650+"Telefon anda ditetapkan secara automatik melaporkan ralat kepada Canonical "

651+"dan rakannya, pencipta sistem pengoperasian ini."

646

652

647#: qml/Wizard/Pages/60-reporting.qml:43

653#: qml/Wizard/Pages/60-reporting.qml:43

648msgid ""

654msgid ""

649"This can be disabled in System Settings under Security & "

655"This can be disabled in System Settings under Security & "

650"Privacy"

656"Privacy"

651msgstr ""

657msgstr ""

658+"Ia boleh dilumpuhkan di dalam Tetapan Sistem di bawah Keselamatan "

659+"& Kerahsiaan"

652

660

653#: qml/Wizard/Pages/80-finished.qml:24

661#: qml/Wizard/Pages/80-finished.qml:24

654msgid "All done"

662msgid "All done"

655−msgstr ""

663+msgstr "Semua selesai"

656

664

657#: qml/Wizard/Pages/80-finished.qml:39

665#: qml/Wizard/Pages/80-finished.qml:39

658msgid "Nice work!"

666msgid "Nice work!"

659−msgstr ""

667+msgstr "Selesai!"

660

668

661#: qml/Wizard/Pages/80-finished.qml:46

669#: qml/Wizard/Pages/80-finished.qml:46

662msgid "Your phone is now ready to use."

670msgid "Your phone is now ready to use."

663−msgstr ""

671+msgstr "Telefon anda kini boleh digunakan."

664

672

665#: qml/Wizard/Pages/80-finished.qml:53

673#: qml/Wizard/Pages/80-finished.qml:53

666msgid "Finish"

674msgid "Finish"

667−msgstr ""

675+msgstr "Selesai"

668

676

669#: qml/Wizard/Pages/here-terms.qml:27

677#: qml/Wizard/Pages/here-terms.qml:27

670msgid "Terms & Conditions"

678msgid "Terms & Conditions"

671−msgstr ""

679+msgstr "Terma & Syarat"

672

680

673#: qml/Wizard/Pages/passwd-confirm.qml:49

681#: qml/Wizard/Pages/passwd-confirm.qml:49

674msgid "Confirm passphrase"

682msgid "Confirm passphrase"

675−msgstr ""

683+msgstr "Sahkan frasa laluan"

676

684

677#: qml/Wizard/Pages/passwd-confirm.qml:50

685#: qml/Wizard/Pages/passwd-confirm.qml:50

678msgid "Confirm passcode"

686msgid "Confirm passcode"

679−msgstr ""

687+msgstr "Sahkan kod laluan"

680

688

681#: qml/Wizard/Pages/passwd-confirm.qml:53

689#: qml/Wizard/Pages/passwd-confirm.qml:53

682#: qml/Wizard/Pages/passwd-confirm.qml:54

690#: qml/Wizard/Pages/passwd-confirm.qml:54

683msgid "Please try again."

691msgid "Please try again."

684−msgstr ""

692+msgstr "Sila cuba lagi."

685

693

686#: qml/Wizard/Pages/passwd-set.qml:61

694#: qml/Wizard/Pages/passwd-set.qml:61

687msgid "Choose your passcode"

695msgid "Choose your passcode"

688−msgstr ""

696+msgstr "Pilih kod laluan anda"

689

697

690#: qml/Wizard/Pages/passwd-set.qml:68

698#: qml/Wizard/Pages/passwd-set.qml:68

691msgid "Passphrase must be 4 characters long"

699msgid "Passphrase must be 4 characters long"

692−msgstr ""

700+msgstr "Frasa laluan mestilah sebanyak 4 aksara"

693

701

694#. Translators: This is the arrow for "Back" buttons

702#. Translators: This is the arrow for "Back" buttons

695#: qml/Wizard/StackButton.qml:39

703#: qml/Wizard/StackButton.qml:39

696#, qt-format

704#, qt-format

697msgid "〈 %1"

705msgid "〈 %1"

698−msgstr ""

706+msgstr "〈 %1"

699

707

700#. Translators: This is the arrow for "Forward" buttons

708#. Translators: This is the arrow for "Forward" buttons

701#: qml/Wizard/StackButton.qml:42

709#: qml/Wizard/StackButton.qml:42

702#, qt-format

710#, qt-format

703msgid "%1 〉"

711msgid "%1 〉"

704−msgstr ""

712+msgstr "%1 〉"

705

713

706#~ msgid "Top edge"

714#~ msgid "Top edge"

707#~ msgstr "Pinggir atas"

715#~ msgstr "Pinggir atas"

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/nn.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/oc.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/or.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/pa.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-08-04 05:41+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-08-06 05:46+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/si.po+75−13

@@ -15,12 +15,12 @@ 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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

23−msgstr ""

23+msgstr "මුරපදය: "

24

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

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

@@ -152,7 +152,7 @@ msgstr ""

152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117

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

154msgid "Cancel"

155−msgstr ""

155+msgstr "අවලංගු කරන්න"

156

157#: qml/Components/Dialogs.qml:98

158msgctxt "Title: Reboot/Shut down dialog"

@@ -161,7 +161,7 @@ msgstr ""

161

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

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

164−msgstr ""

164+msgstr "නිවාදැමිම තහවුරු කරන්න"

165

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

167msgctxt "Button: Reboot the system"

@@ -180,15 +180,15 @@ msgstr ""

180

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

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

183−msgstr ""

183+msgstr "යළි පණගැන්වීම තහවුරු කරන්න"

184

185#: qml/Components/Dialogs.qml:132

186msgid "No"

187−msgstr ""

187+msgstr "නැත"

188

189#: qml/Components/Dialogs.qml:138

190msgid "Yes"

191−msgstr ""

191+msgstr "ඔව්"

192

193#: qml/Components/Dialogs.qml:152

194msgctxt "Title: Power off/Restart dialog"

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

200"Are you sure you would like\n"

201"to power off?"

202msgstr ""

203+"පරිගණකය වසාදැමිම\n"

204+"ඔබ තහවුරු කරන්නේද?"

203

205

204#: qml/Components/Dialogs.qml:155

206#: qml/Components/Dialogs.qml:155

205msgctxt "Button: Power off the system"

207msgctxt "Button: Power off the system"

@@ -217,7 +219,7 @@ msgstr ""

217

219

218#: qml/Components/Lockscreen.qml:245

220#: qml/Components/Lockscreen.qml:245

219msgid "Emergency Call"

221msgid "Emergency Call"

220−msgstr ""

222+msgstr "හදිසි ඇමතුම"

221

223

222#: qml/Components/Lockscreen.qml:277

224#: qml/Components/Lockscreen.qml:277

223msgid "OK"

225msgid "OK"

@@ -269,15 +271,15 @@ msgstr ""

269

271

270#: qml/Dash/Previews/PreviewRatingInput.qml:84

272#: qml/Dash/Previews/PreviewRatingInput.qml:84

271msgid "Rate this"

273msgid "Rate this"

272−msgstr ""

274+msgstr "මෙය අගය කරන්න"

273

275

274#: qml/Dash/Previews/PreviewRatingInput.qml:129

276#: qml/Dash/Previews/PreviewRatingInput.qml:129

275msgid "Add a review"

277msgid "Add a review"

276−msgstr ""

278+msgstr "විචාරයක් ලියන්න"

277

279

278#: qml/Dash/Previews/PreviewRatingInput.qml:169

280#: qml/Dash/Previews/PreviewRatingInput.qml:169

279msgid "Send"

281msgid "Send"

280−msgstr ""

282+msgstr "යවන්න"

281

283

282#: qml/Dash/PullToRefreshScopeStyle.qml:55

284#: qml/Dash/PullToRefreshScopeStyle.qml:55

283msgid "Pull to refresh…"

285msgid "Pull to refresh…"

@@ -372,7 +374,7 @@ msgstr ""

372

374

373#: qml/Notifications/NotificationMenuItemFactory.qml:128

375#: qml/Notifications/NotificationMenuItemFactory.qml:128

374msgid "Show password"

376msgid "Show password"

375−msgstr ""

377+msgstr "මුරපදය පෙන්වන්න"

376

378

377#: qml/Panel/ActiveCallHint.qml:79

379#: qml/Panel/ActiveCallHint.qml:79

378msgid "Tap to return to call..."

380msgid "Tap to return to call..."

@@ -696,3 +698,63 @@ msgstr ""

696#, qt-format

698#, qt-format

697msgid "%1 〉"

699msgid "%1 〉"

698msgstr ""

700msgstr ""

701+

702+#~ msgid "Left edge"

703+#~ msgstr "වම් අන්තය"

704+

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

706+#~ msgstr "දුරකථනය අගුලුහරින්න දකුණු අන්තයේ සිට අදින්න"

707+

708+#~ msgid "Right edge"

709+#~ msgstr "දකුණු අන්තය"

710+

711+#~ msgid "Close"

712+#~ msgstr "වසන්න"

713+

714+#~ msgid "Skip intro"

715+#~ msgstr "හැඳින්වීම මඟහරින්න"

716+

717+#~ msgid "Loading. Please Wait..."

718+#~ msgstr "පූරණය වෙමින්. මඳක් රැඳෙන්න..."

719+

720+#~ msgid "Speaking..."

721+#~ msgstr "කතාකරමින්..."

722+

723+#~ msgid "Speak Now..."

724+#~ msgstr "දැන් කථා කරන්න..."

725+

726+#~ msgid "Confirm"

727+#~ msgstr "ස්ථීර කරන්න"

728+

729+#~ msgid "Top edge"

730+#~ msgstr "ඉහළ අන්තය"

731+

732+#~ msgid "Try swiping from the top edge to access the indicators"

733+#~ msgstr "දර්ශකවලට ප්‍රවේශවන්න ඉහළ අන්තයේ සිට අදින්න"

734+

735+#~ msgid "Well done"

736+#~ msgstr "කදිමයි"

737+

738+#~ msgid "Search"

739+#~ msgstr "සෙවුම"

740+

741+#~ msgid "Type or say a command"

742+#~ msgstr "විධානයක් ඇතුල්කරන්න හෝ කියන්න"

743+

744+#~ msgid "Log out"

745+#~ msgstr "ඉවත් වන්න"

746+

747+#~ msgid "Reboot"

748+#~ msgstr "යළි පණගන්වන්න"

749+

750+#~ msgid "Shut down"

751+#~ msgstr "පරිගණකය නිවා දමන්න"

752+

753+#~ msgid "Power"

754+#~ msgstr "බලය"

755+

756+#~ msgid "Restart"

757+#~ msgstr "පරිගණකය යළි පණගන්වන්න"

758+

759+#~ msgid "Power off"

760+#~ msgstr "පරිගණකය නිවා දමන්න"

po/sk.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) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"

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

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

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: 2015-07-25 05:38+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:29+0000\n"

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

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

20

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

22msgid "Password: "

po/sr.po+2−2

@@ -17,8 +17,8 @@ msgstr ""

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

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

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

20−"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"

20+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

21−"X-Generator: Launchpad (build 17628)\n"

21+"X-Generator: Launchpad (build 17686)\n"

22"Language: sr\n"

23

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

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20"Language: sv\n"

21

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

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20"Language: ta\n"

21

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

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/th.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/tr.po+40−40

@@ -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-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

@@ -37,14 +37,14 @@ msgstr "Kısayol iğnesini kaldır"

37#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"

38#: plugins/Utils/relativetimeformatter.cpp:157

39msgid "Yesterday %l:%M %p"

40−msgstr ""

40+msgstr "Dün %l:%M %p"

41

42#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

43#. This format string is used for showing, on a 12-hour clock, times that happened today.

44#. en_US example: "%l:%M %p" --> "1:00 PM"

45#: plugins/Utils/relativetimeformatter.cpp:164

46msgid "%l:%M %p"

47−msgstr ""

47+msgstr "%l:%M %p"

48

49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

@@ -52,7 +52,7 @@ msgstr ""

52#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"

53#: plugins/Utils/relativetimeformatter.cpp:172

54msgid "Tomorrow %l:%M %p"

55−msgstr ""

55+msgstr "Yarın %l:%M %p"

56

57#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

58#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.

@@ -60,7 +60,7 @@ msgstr ""

60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"

61#: plugins/Utils/relativetimeformatter.cpp:181

62msgid "%a %l:%M %p"

63−msgstr ""

63+msgstr "%l:%M %p %a"

64

65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.

@@ -69,7 +69,7 @@ msgstr ""

69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

70#: plugins/Utils/relativetimeformatter.cpp:190

71msgid "%a %d %b %l:%M %p"

72−msgstr ""

72+msgstr "%a %d %b %l:%M %p"

73

74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -77,14 +77,14 @@ msgstr ""

77#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"

78#: plugins/Utils/relativetimeformatter.cpp:201

79msgid "Yesterday %H:%M"

80−msgstr ""

80+msgstr "Dün %H:%M"

81

82#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

83#. This format string is used for showing, on a 24-hour clock, times that happened today.

84#. en_US example: "%H:%M" --> "13:00"

85#: plugins/Utils/relativetimeformatter.cpp:208

86msgid "%H:%M"

87−msgstr ""

87+msgstr "%H:%M"

88

89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

@@ -92,7 +92,7 @@ msgstr ""

92#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"

93#: plugins/Utils/relativetimeformatter.cpp:216

94msgid "Tomorrow %H:%M"

95−msgstr ""

95+msgstr "Yarın %H:%M"

96

97#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

98#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.

@@ -100,7 +100,7 @@ msgstr ""

100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"

101#: plugins/Utils/relativetimeformatter.cpp:225

102msgid "%a %H:%M"

103−msgstr ""

103+msgstr "%H:%M %a"

104

105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.

@@ -109,7 +109,7 @@ msgstr ""

109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

110#: plugins/Utils/relativetimeformatter.cpp:234

111msgid "%a %d %b %H:%M"

112−msgstr ""

112+msgstr "%a %b %d\\u2003%H:%M"

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

@@ -133,7 +133,7 @@ msgstr[1] "Lütfen %1 dakika bekleyin ve yeniden deneyin..."

133#: qml/Components/Dialogs.qml:69

134msgctxt "Title: Lock/Log out dialog"

135msgid "Log out"

136−msgstr ""

136+msgstr "Oturumu kapat"

137

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

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

@@ -142,12 +142,12 @@ msgstr "Oturumu kapatmak istediğinize emin misiniz?"

142#: qml/Components/Dialogs.qml:72

143msgctxt "Button: Lock the system"

144msgid "Lock"

145−msgstr ""

145+msgstr "Kilitle"

146

147#: qml/Components/Dialogs.qml:79

148msgctxt "Button: Log out from the system"

149msgid "Log Out"

150−msgstr ""

150+msgstr "Oturumu Kapat"

151

152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117

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

@@ -157,7 +157,7 @@ msgstr "İptal"

157#: qml/Components/Dialogs.qml:98

158msgctxt "Title: Reboot/Shut down dialog"

159msgid "Shut down"

160−msgstr ""

160+msgstr "Kapat"

161

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

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

@@ -171,7 +171,7 @@ msgstr "Yeniden başlat"

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

172msgctxt "Button: Shut down the system"

173msgid "Shut down"

174−msgstr ""

174+msgstr "Kapat"

175

176#: qml/Components/Dialogs.qml:129

177msgctxt "Title: Reboot dialog"

@@ -204,7 +204,7 @@ msgstr "Bilgisayarı kapatmak istediğinize emin misiniz?"

204#: qml/Components/Dialogs.qml:155

205msgctxt "Button: Power off the system"

206msgid "Power off"

207−msgstr ""

207+msgstr "Sistemi Kapat"

208

209#: qml/Components/Dialogs.qml:164

210msgctxt "Button: Restart the system"

@@ -309,7 +309,7 @@ msgstr "Kilidi Aç"

309

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

311msgid "Retry"

312−msgstr ""

312+msgstr "Tekrar Dene"

313

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

315msgid "Tap to unlock"

@@ -368,7 +368,7 @@ msgstr "Üzgünüm, hatalı parola"

368#: qml/Greeter/NarrowView.qml:121

369msgctxt "passphrase"

370msgid "Please re-enter"

371−msgstr ""

371+msgstr "Lütfen yeniden girin"

372

373#: qml/Greeter/NarrowView.qml:122

374msgid "Sorry, incorrect passcode"

@@ -394,32 +394,32 @@ msgstr "Hiçbir şey çalmıyor"

394#, qt-format

395msgid "%1 hour"

396msgid_plural "%1 hours"

397−msgstr[0] ""

397+msgstr[0] "%1 saat"

398−msgstr[1] ""

398+msgstr[1] "%1 saat"

399

400#: qml/Panel/Indicators/MenuItemFactory.qml:772

401#, qt-format

402msgid "%1 minute"

403msgid_plural "%1 minutes"

404−msgstr[0] ""

404+msgstr[0] "%1 dakika"

405−msgstr[1] ""

405+msgstr[1] "%1 dakika"

406

407#: qml/Panel/Indicators/MenuItemFactory.qml:777

408#, qt-format

409msgid "%1 second"

410msgid_plural "%1 seconds"

411−msgstr[0] ""

411+msgstr[0] "%1 saniye"

412−msgstr[1] ""

412+msgstr[1] "%1 saniye"

413

414#: qml/Panel/Indicators/MenuItemFactory.qml:780

415msgid "0 seconds"

416−msgstr ""

416+msgstr "0 saniye"

417

418#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

419#: qml/Panel/Indicators/MenuItemFactory.qml:782

420#, qt-format

421msgid "%1 remaining"

422−msgstr ""

422+msgstr "%1 kaldı"

423

424#: qml/Panel/Indicators/MenuItemFactory.qml:788

425msgid "In queue…"

@@ -481,23 +481,23 @@ msgstr "Devam etmek için buraya dokunun."

481

482#: qml/Tutorial/TutorialContent.qml:81

483msgid "Click here to finish."

484−msgstr ""

484+msgstr "Bitirmek için buraya tıklayın."

485

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

487msgid "These are the shortcuts to favorite apps"

488−msgstr ""

488+msgstr "Bunlar gözde uygulamalarınız için kısayollardır"

489

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

491msgid "Open the launcher"

492−msgstr ""

492+msgstr "Başlatıcıyı aç"

493

494#: qml/Tutorial/TutorialLeft.qml:27

495msgid "Short swipe from the left edge."

496−msgstr ""

496+msgstr "Sol kenardan kısa kaydırma"

497

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

499msgid "You almost got it!"

500−msgstr ""

500+msgstr "Neredeyse yaptınız!"

501

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

503msgid "Try again."

@@ -509,7 +509,7 @@ msgstr "Açık uygulamaları görmek için"

509

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

511msgid "Long swipe from the right edge."

512−msgstr ""

512+msgstr "Sağ kenardan uzan kaydırma"

513

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

515msgid "View all your running tasks."

@@ -518,7 +518,7 @@ msgstr "Çalışan tüm görevleri incele."

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

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

520msgid "Back"

521−msgstr ""

521+msgstr "Geri"

522

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

524msgid "Hi!"

@@ -563,27 +563,27 @@ msgstr "Lütfen telefonunuzun kilidini nasıl açmak istediğinizi seçin."

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

564msgctxt "Label: Type of security method"

565msgid "Swipe"

566−msgstr ""

566+msgstr "Kaydır"

567

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

569msgctxt "Label: Description of security method"

570msgid "No security"

571−msgstr ""

571+msgstr "Güvenlik yok"

572

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

574msgctxt "Label: Type of security method"

575msgid "Passcode"

576−msgstr ""

576+msgstr "Parola"

577

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

579msgctxt "Label: Description of security method"

580msgid "4 digits only"

581−msgstr ""

581+msgstr "Yalnızca 4 rakam"

582

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

584msgctxt "Label: Type of security method"

585msgid "Passphrase"

586−msgstr ""

586+msgstr "Parola Metni"

587

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

589msgctxt "Label: Description of security method"

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/uk.po+3−3

@@ -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-07-25 05:39+0000\n"

19+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

21

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

23msgid "Password: "

@@ -376,7 +376,7 @@ msgstr "Вибачте, помилковий пароль"

376#: qml/Greeter/NarrowView.qml:121

377msgctxt "passphrase"

378msgid "Please re-enter"

379−msgstr ""

379+msgstr "Введіть ще раз"

380

381#: qml/Greeter/NarrowView.qml:122

382msgid "Sorry, incorrect passcode"

po/ur.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

po/uz.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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-28 05:40+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-07-25 05:39+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20

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

22msgid "Password: "

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: 2015-08-04 05:41+0000\n"

18+"X-Launchpad-Export-Date: 2015-08-12 06:30+0000\n"

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

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

20"Language: zh_TW\n"

21

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

qml/Components/UnityInputInfo/UnityInputInfo.qml+2

@@ -18,6 +18,8 @@ pragma Singleton

18

19import QtQuick 2.3

20import Unity.InputInfo 0.1

21+// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471

22+import Ubuntu.Components 1.3

21

23

22Item {

24Item {

23 id: root

25 id: root

qml/Dash/GenericScopeView.qml+61−31

@@ -72,38 +72,52 @@ FocusScope {

72 pageHeaderLoader.item.resetSearch()

73 }

74

75− function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {

75+ property var maybePreviewResult;

76− if (itemModel.uri.indexOf("scope://") === 0 || scope.id === "clickscope" || (scope.id === "videoaggregator" && categoryId === "myvideos-getstarted")) {

76+ property int maybePreviewIndex;

77− // TODO Technically it is possible that calling activate() will make the scope emit

77+ property var maybePreviewResultsModel;

78− // previewRequested so that we show a preview but there's no scope that does that yet

78+ property int maybePreviewLimitedCategoryItemCount;

79− // so it's not implemented

79+ property string maybePreviewCategoryId;

80− scope.activate(result)

80+

81− } else {

81+ function clearMaybePreviewData() {

82− if (scope.preview(result)) {

82+ scopeView.maybePreviewResult = undefined;

83− openPreview(index, resultsModel, limitedCategoryItemCount);

83+ scopeView.maybePreviewIndex = -1;

84− }

84+ scopeView.maybePreviewResultsModel = undefined;

85− }

85+ scopeView.maybePreviewLimitedCategoryItemCount = -1;

86+ scopeView.maybePreviewCategoryId = "";

86 }

87 }

87

88

88− function itemPressedAndHeld(index, result, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {

89+ function itemClicked(index, result, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {

89− if (itemModel.uri.indexOf("scope://") !== 0 && !(scope.id === "videoaggregator" && categoryId === "myvideos-getstarted")) {

90+ scopeView.maybePreviewResult = result;

91+ scopeView.maybePreviewIndex = index;

92+ scopeView.maybePreviewResultsModel = resultsModel;

93+ scopeView.maybePreviewLimitedCategoryItemCount = limitedCategoryItemCount;

94+ scopeView.maybePreviewCategoryId = categoryId;

95+

90− if (scope.preview(result)) {

96+ scope.activate(result, categoryId);

91− openPreview(index, resultsModel, limitedCategoryItemCount);

92− }

93− }

94 }

97 }

95

98

99+ function itemPressedAndHeld(index, result, resultsModel, limitedCategoryItemCount, categoryId) {

100+ clearMaybePreviewData();

101+

96− function openPreview(index, resultsModel, limitedCategoryItemCount) {

102+ openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId);

103+ }

104+

105+ function openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId) {

106+ var previewStack = scope.preview(result, categoryId);

107+ if (previewStack) {

97− if (limitedCategoryItemCount > 0) {

108+ if (limitedCategoryItemCount > 0) {

98− previewLimitModel.model = resultsModel;

109+ previewLimitModel.model = resultsModel;

99− previewLimitModel.limit = limitedCategoryItemCount;

110+ previewLimitModel.limit = limitedCategoryItemCount;

100− subPageLoader.model = previewLimitModel;

111+ subPageLoader.model = previewLimitModel;

101− } else {

112+ } else {

102− subPageLoader.model = resultsModel;

113+ subPageLoader.model = resultsModel;

114+ }

115+ subPageLoader.initialIndex = -1;

116+ subPageLoader.initialIndex = index;

117+ subPageLoader.categoryId = categoryId;

118+ subPageLoader.previewStack = previewStack;

119+ subPageLoader.openSubPage("preview");

103 }

120 }

104− subPageLoader.initialIndex = -1;

105− subPageLoader.initialIndex = index;

106− subPageLoader.openSubPage("preview");

107 }

121 }

108

122

109 Binding {

123 Binding {

@@ -149,6 +163,17 @@ FocusScope {

149 target: scopeView.scope

163 target: scopeView.scope

150 onShowDash: subPageLoader.closeSubPage()

164 onShowDash: subPageLoader.closeSubPage()

151 onHideDash: subPageLoader.closeSubPage()

165 onHideDash: subPageLoader.closeSubPage()

166+ onPreviewRequested: { // (QVariant const& result)

167+ if (result === scopeView.maybePreviewResult) {

168+ openPreview(result,

169+ scopeView.maybePreviewIndex,

170+ scopeView.maybePreviewResultsModel,

171+ scopeView.maybePreviewLimitedCategoryItemCount,

172+ scopeView.maybePreviewCategoryId);

173+

174+ clearMaybePreviewData();

175+ }

176+ }

152 }

177 }

153

178

154 Connections {

179 Connections {

@@ -357,12 +382,12 @@ FocusScope {

357

382

358 Connections {

383 Connections {

359 target: rendererLoader.item

384 target: rendererLoader.item

360− onClicked: {

385+ onClicked: { // (int index, var result, var item, var itemModel)

361− scopeView.itemClicked(index, result, item, itemModel, target.model, categoryItemCount(), baseItem.category);

386+ scopeView.itemClicked(index, result, itemModel, target.model, categoryItemCount(), baseItem.category);

362 }

387 }

363

388

364− onPressAndHold: {

389+ onPressAndHold: { // (int index, var result, var itemModel)

365− scopeView.itemPressedAndHeld(index, result, itemModel, target.model, categoryItemCount(), baseItem.category);

390+ scopeView.itemPressedAndHeld(index, result, target.model, categoryItemCount(), baseItem.category);

366 }

391 }

367

392

368 function categoryItemCount() {

393 function categoryItemCount() {

@@ -736,6 +761,8 @@ FocusScope {

736 property var scope: scopeView.scope

761 property var scope: scopeView.scope

737 property var scopeStyle: scopeView.scopeStyle

762 property var scopeStyle: scopeView.scopeStyle

738 property int initialIndex: -1

763 property int initialIndex: -1

764+ property var previewStack;

765+ property string categoryId

739 property var model: null

766 property var model: null

740

767

741 readonly property bool processing: item && item.processing || false

768 readonly property bool processing: item && item.processing || false

@@ -767,6 +794,9 @@ FocusScope {

767 item.open = Qt.binding(function() { return subPageLoader.open; } )

794 item.open = Qt.binding(function() { return subPageLoader.open; } )

768 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )

795 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )

769 item.model = Qt.binding(function() { return subPageLoader.model; } )

796 item.model = Qt.binding(function() { return subPageLoader.model; } )

797+ item.categoryId = Qt.binding(function() { return subPageLoader.categoryId; } )

798+ item.initialIndexPreviewStack = subPageLoader.previewStack;

799+ subPageLoader.previewStack = null;

770 }

800 }

771 open = true;

801 open = true;

772 }

802 }

qml/Dash/PageHeader.qml+3−4

@@ -175,11 +175,10 @@ Item {

175 __separator_visible: false

176 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.

177 property var styledItem: searchHeader

178− property string title

179 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

178 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

180 property color panelColor: background.topColor

179 property color panelColor: background.topColor

181 panelForegroundColor: config.foregroundColor

180 panelForegroundColor: config.foregroundColor

182− property var config: PageHeadConfiguration {

181+ config: PageHeadConfiguration {

183 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

182 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

184 backAction: Action {

183 backAction: Action {

185 iconName: "back"

184 iconName: "back"

@@ -248,11 +247,11 @@ Item {

248 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

247 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

249 __separator_visible: false

248 __separator_visible: false

250 property var styledItem: header

249 property var styledItem: header

251− property string title: root.title

252 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

250 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

253 property color panelColor: background.topColor

251 property color panelColor: background.topColor

254 panelForegroundColor: config.foregroundColor

252 panelForegroundColor: config.foregroundColor

255− property var config: PageHeadConfiguration {

253+ config: PageHeadConfiguration {

254+ title: root.title

256 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

255 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

257 backAction: Action {

256 backAction: Action {

258 iconName: backIsClose ? "close" : "back"

257 iconName: backIsClose ? "close" : "back"

qml/Dash/PreviewListView.qml+17−6

@@ -24,8 +24,11 @@ Item {

24 id: root

25

26 property int initialIndex: -1

27+ property var initialIndexPreviewStack: null

27 property var scope: null

28 property var scope: null

28 property var scopeStyle: null

29 property var scopeStyle: null

30+ property string categoryId

31+ property bool usedInitialIndex: false

29

32

30 property alias showSignatureLine: header.showSignatureLine

33 property alias showSignatureLine: header.showSignatureLine

31

34

@@ -83,10 +86,10 @@ Item {

83 }

86 }

84 }

87 }

85

88

86− onCountChanged: {

89+ onModelChanged: {

87− if (count > 0 && initialIndex >= 0) {

90+ if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {

88− currentIndex = initialIndex;

91+ usedInitialIndex = true;

89− initialIndex = -1;

92+ previewListView.positionViewAtIndex(initialIndex, ListView.SnapPosition);

90 }

93 }

91 }

94 }

92

95

@@ -99,8 +102,16 @@ Item {

99 isCurrent: ListView.isCurrentItem

102 isCurrent: ListView.isCurrentItem

100

103

101 previewModel: {

104 previewModel: {

105+ if (root.open) {

106+ if (index === root.initialIndex) {

107+ return root.initialIndexPreviewStack.getPreviewModel(0);

108+ } else {

102− var previewStack = root.scope.preview(result);

109+ var previewStack = root.scope.preview(result, root.categoryId);

103− return previewStack.getPreviewModel(0);

110+ return previewStack.getPreviewModel(0);

111+ }

112+ } else {

113+ return null;

114+ }

104 }

115 }

105 scopeStyle: root.scopeStyle

116 scopeStyle: root.scopeStyle

106 }

117 }

qml/Dash/Previews/PreviewActions.qml+1−1

@@ -25,7 +25,7 @@ import Ubuntu.Components 1.3

25PreviewWidget {

26 id: root

27

28− height: row.height + units.gu(1)

28+ implicitHeight: row.height + units.gu(1)

29

30 Row {

31 id: row

qml/Dash/Previews/PreviewAudioPlayback.qml+1−1

@@ -34,7 +34,7 @@ import Ubuntu.Components 1.3

34

35PreviewWidget {

36 id: root

37− height: childrenRect.height

37+ implicitHeight: childrenRect.height

38

39 onIsCurrentPreviewChanged: if (!isCurrentPreview) audio.stop()

40

qml/Dash/Previews/PreviewHeader.qml+3−3

@@ -30,7 +30,7 @@ import "../"

30PreviewWidget {

31 id: root

32

33− height: childrenRect.height

33+ implicitHeight: childrenRect.height

34

35 Item {

36 id: headerRoot

@@ -43,7 +43,7 @@ PreviewWidget {

43 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

44

45 // Rewire the source since we may have unwired it on onStatusChanged

46− onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;

46+ onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.source.source = mascot;

47

48 implicitHeight: row.height + row.margins * 2

49 width: parent.width

@@ -77,7 +77,7 @@ PreviewWidget {

77

78 sourceComponent: UbuntuShape {

79 objectName: "mascotShape"

80− visible: image.status === Image.Ready

80+ visible: source.status === Image.Ready

81 sourceFillMode: UbuntuShape.PreserveAspectCrop

82 sourceHorizontalAlignment: UbuntuShape.AlignHCenter

83 sourceVerticalAlignment: UbuntuShape.AlignVCenter

qml/Dash/Previews/PreviewRatingDisplay.qml+1−1

@@ -38,7 +38,7 @@ import "../../Components"

38

39PreviewWidget {

40 id: root

41− height: childrenRect.height

41+ implicitHeight: childrenRect.height

42

43 Column {

44 anchors { left: parent.left; right: parent.right; }

qml/Dash/ScopesList.qml+1−1

@@ -124,7 +124,7 @@ Item {

124 onRequestFavorite: root.requestFavorite(scopeId, favorite);

125 onRequestEditMode: root.state = "edit";

126 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);

127− onRequestActivate: root.scope.activate(result);

127+ onRequestActivate: root.scope.activate(result, categoryId);

128 onRequestRestore: root.requestRestore(scopeId);

129 }

130 }

qml/Launcher/Launcher.qml+2−1

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

177 }

178

179 }

180− MouseArea {

180+

181+ MultiPointTouchArea {

181 id: closeMouseArea

182 id: closeMouseArea

182 anchors {

183 anchors {

183 left: launcherDragArea.right

184 left: launcherDragArea.right

qml/Launcher/LauncherDelegate.qml+12

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

24 property int count: 0

25 property bool countVisible: false

26 property int progress: -1

27+ property bool itemRunning: false

27 property bool itemFocused: false

28 property bool itemFocused: false

28 property real maxAngle: 0

29 property real maxAngle: 0

29 property bool inverted: false

30 property bool inverted: false

@@ -215,6 +216,17 @@ Item {

215 }

216 }

217 }

217

218

219+ Image {

220+ objectName: "runningHighlight"

221+ anchors {

222+ left: parent.left

223+ verticalCenter: parent.verticalCenter

224+ }

225+ visible: root.itemRunning

226+ rotation: 180

227+ source: "graphics/focused_app_arrow.png"

228+ }

229+

218 Image {

230 Image {

219 objectName: "focusedHighlight"

231 objectName: "focusedHighlight"

220 anchors {

232 anchors {

qml/Launcher/LauncherPanel.qml+1

@@ -193,6 +193,7 @@ Rectangle {

193 count: model.count

194 countVisible: model.countVisible

195 progress: model.progress

196+ itemRunning: model.running

196 itemFocused: model.focused

197 itemFocused: model.focused

197 inverted: root.inverted

198 inverted: root.inverted

198 alerting: model.alerting

199 alerting: model.alerting

qml/OrientedShell.qml+3

@@ -21,6 +21,9 @@ import GSettings 1.0

21import "Components"

22import "Components/UnityInputInfo"

23import "Rotation"

24+// Backup Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471

25+// in case we remove the UnityInputInfo import

26+import Ubuntu.Components 1.3

24

27

25Rectangle {

28Rectangle {

26 id: root

29 id: root

qml/Panel/IndicatorItem.qml+3−3

@@ -31,9 +31,9 @@ IndicatorDelegate {

31 property bool selected: false

32 property real iconHeight: units.gu(2)

33 readonly property color color: {

34− if (!expanded) return "#ededed";

34+ if (!expanded) return "#ffffff";

35− if (!selected) return "#4c4c4c";

35+ if (!selected) return "#888888";

36− return "#ededed";

36+ return "#ffffff";

37 }

38

39 signal clicked()

qml/Panel/IndicatorItemRow.qml+1−1

@@ -31,7 +31,7 @@ Item {

31 property real unitProgress: 0.0

32 property real selectionChangeBuffer: units.gu(2)

33 property bool enableLateralChanges: false

34− property color hightlightColor: "#ededed"

34+ property color hightlightColor: "#ffffff"

35

36 property real lateralPosition: -1

37 onLateralPositionChanged: {

qml/Panel/IndicatorsBar.qml+1−1

@@ -123,7 +123,7 @@ Item {

123 width: parent.width

124 anchors.bottom: parent.bottom

125

126− color: "#4c4c4c"

126+ color: "#888888"

127 opacity: expanded ? 1.0 : 0.0

128 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }

129 }

tests/mocks/Unity/CMakeLists.txt+1−1

@@ -7,7 +7,7 @@ add_subdirectory(Notifications)

7add_subdirectory(DashCommunicator)

8

9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

10−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)

10+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=7)

11

12include_directories(

13 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_scope.cpp+5−3

@@ -181,18 +181,20 @@ void Scope::setNoResultsHint(const QString& str)

181 }

182}

183

184−void Scope::activate(QVariant const& result)

184+void Scope::activate(QVariant const& result, QString const& categoryId)

185{

186− qDebug() << "Called activate on scope" << m_id << "with result" << result;

186+ qDebug() << "Called activate on scope" << m_id << "with result" << result << "and category" << categoryId;

187 if (result.toString() == "Result.2.2") {

188 Scopes *scopes = dynamic_cast<Scopes*>(parent());

189 m_openScope = scopes->getScopeFromAll("MockScope9");

190 scopes->addTempScope(m_openScope);

191 Q_EMIT openScope(m_openScope);

192+ } else {

193+ Q_EMIT previewRequested(result);

192 }

194 }

193}

195}

194

196

195−PreviewStack* Scope::preview(QVariant const& result)

197+PreviewStack* Scope::preview(QVariant const& result, QString const& /*categoryId*/)

196{

198{

197 Q_UNUSED(result);

199 Q_UNUSED(result);

198

200

tests/mocks/Unity/fake_scope.h+2−2

@@ -60,8 +60,8 @@ public:

60 Q_INVOKABLE void setName(const QString &name); // This is not invokable in the Interface, here for testing benefits

61 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

62

63− Q_INVOKABLE void activate(QVariant const& result) override;

63+ Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;

64− Q_INVOKABLE PreviewStack* preview(QVariant const& result) override;

64+ Q_INVOKABLE PreviewStack* preview(QVariant const& result, QString const& categoryId) override;

65 Q_INVOKABLE void cancelActivation() override;

66 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;

67

tests/mocks/Unity/fake_scopesoverview.cpp+1−1

@@ -41,7 +41,7 @@ void ScopesOverview::setSearchQuery(const QString& search_query)

41 Q_EMIT categoriesChanged();

42}

43

44−Q_INVOKABLE void ScopesOverview::activate(QVariant const& result)

44+Q_INVOKABLE void ScopesOverview::activate(QVariant const& result, QString const& /*categoryId*/)

45{

46 Scopes *scopes = dynamic_cast<Scopes*>(parent());

47 if (scopes->getScope(result.toString())) {

tests/mocks/Unity/fake_scopesoverview.h+1−1

@@ -32,7 +32,7 @@ public:

32 ScopesOverview(Scopes* parent = 0);

33

34 void setSearchQuery(const QString& search_query) override;

35− Q_INVOKABLE void activate(QVariant const& result) override;

35+ Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;

36

37 // This is implementation detail

38 void setFavorite(Scope *scope, bool favorite);

tests/plugins/Unity/Launcher/launchermodeltest.cpp+16

@@ -298,6 +298,22 @@ private Q_SLOTS:

298 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

299 }

300

301+ void testApplicationRunning() {

302+ launcherModel->pin("abs-icon");

303+ launcherModel->pin("no-icon");

304+

305+ QCOMPARE(launcherModel->get(0)->running(), true);

306+ QCOMPARE(launcherModel->get(1)->running(), true);

307+

308+ appManager->stopApplication("abs-icon");

309+ QCOMPARE(launcherModel->get(0)->running(), false);

310+ QCOMPARE(launcherModel->get(1)->running(), true);

311+

312+ appManager->stopApplication("no-icon");

313+ QCOMPARE(launcherModel->get(0)->running(), false);

314+ QCOMPARE(launcherModel->get(1)->running(), false);

315+ }

316+

301 void testApplicationFocused() {

317 void testApplicationFocused() {

302 // all apps unfocused at beginning...

318 // all apps unfocused at beginning...

303 QCOMPARE(launcherModel->get(0)->focused(), false);

319 QCOMPARE(launcherModel->get(0)->focused(), false);

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+147−6

@@ -34,21 +34,122 @@ Rectangle {

34 "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]

35 }

36

37+ property var actionsData: {

38+ "actions": [ {"label": "Some Label", "id": "someid"} ]

39+ }

40+

41+ property var audioData: {

42+ "tracks": [ { title: "Some track name", length: "30", source: "/not/existing/path/testsound1" } ]

43+ }

44+

45+ property var commentData: {

46+ "author": "Claire Thompson",

47+ "comment": "C.",

48+ "source": "../../graphics/avatars/amanda@12.png"

49+ }

50+

51+ property var commentInputData: {

52+ "submit-label": "TestSubmitLabel"

53+ }

54+

55+ property var galleryData: {

56+ "sources": [

57+ "../../graphics/phone_background.jpg",

58+ "../../graphics/tablet_background.jpg",

59+ "../../graphics/clock@18.png",

60+ "../../graphics/borked"

61+ ]

62+ }

63+

64+ property var headerData: {

65+ "title": "THE TITLE",

66+ "subtitle": "Something catchy"

67+ }

68+

69+ property var iconActionsData: {

70+ "actions": [ {"label": "10", "id": "s", "icon": Qt.resolvedUrl("../artwork/avatar@12.png") } ]

71+ }

72+

73+ property var imageData: {

74+ "source": "../../graphics/phone_background.jpg",

75+ "zoomable": false

76+ }

77+

78+ property var paymentsData: {

79+ "source": { "price" : 0.99, "currency": "USD", "store_item_id": "com.example.package" }

80+ }

81+

82+ property var progressData: {

83+ "type": "progress",

84+ "source": { "dbus-name" : "somename", "dbus-object": "somestring" }

85+ }

86+

87+ property var ratingInputData: {

88+ "visible": "both",

89+ "required": "both"

90+ }

91+

92+ property var ratingEditData: {

93+ "visible": "both",

94+ "required": "both",

95+ author: "Some dude",

96+ rating: 4.5,

97+ review: "Very cool app"

98+ }

99+

100+ property var reviewsData: {

101+ "reviews": [ { author: "Some dude", rating: 4.5, review: "Very cool app" } ]

102+ }

103+

104+ property var videoData: {

105+ "source": "",

106+ "screenshot": "../../../tests/qmltests/Components/tst_LazyImage/square.png"

107+ }

108+

37 ListModel {

109 ListModel {

38 id: widgetsModel

110 id: widgetsModel

39 }

111 }

40

112

113+ ListModel {

114+ id: allWidgetsModel

115+ }

116+

41 property var widgetData: {

117 property var widgetData: {

42 "title": "Title here",

118 "title": "Title here",

43 "collapsed-widgets": 2,

119 "collapsed-widgets": 2,

44 "widgets": widgetsModel

120 "widgets": widgetsModel

45 }

121 }

46

122

123+ property var allWidgetsData: {

124+ "title": "Title here",

125+ "collapsed-widgets": 0,

126+ "widgets": allWidgetsModel

127+ }

128+

129+

47 Component.onCompleted: {

130 Component.onCompleted: {

48 widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});

131 widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});

49− widgetsModel.append({"type": "text", "widgetId": "table1", "properties": { "text": tableData }});

132+ widgetsModel.append({"type": "table", "widgetId": "table1", "properties": tableData });

50 widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});

133 widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});

51− widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText }});

134+ widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText2 }});

135+

136+ allWidgetsModel.append({"type": "actions", "widgetId": "actions1", "properties": actionsData });

137+ allWidgetsModel.append({"type": "audio", "widgetId": "audio1", "properties": audioData });

138+ allWidgetsModel.append({"type": "comment", "widgetId": "comment1", "properties": commentData });

139+ allWidgetsModel.append({"type": "comment-input", "widgetId": "comment-input1", "properties": commentInputData });

140+ // "expandable" For now we're not testing inception of expandables

141+ allWidgetsModel.append({"type": "gallery", "widgetId": "gallery1", "properties": galleryData });

142+ allWidgetsModel.append({"type": "header", "widgetId": "header1", "properties": headerData });

143+ allWidgetsModel.append({"type": "icon-actions", "widgetId": "icon-actions1", "properties": iconActionsData } );

144+ allWidgetsModel.append({"type": "image", "widgetId": "image1", "properties": imageData });

145+ allWidgetsModel.append({"type": "payments", "widgetId": "payments1", "properties": paymentsData });

146+ allWidgetsModel.append({"type": "progress", "widgetId": "progress1", "properties": progressData });

147+ allWidgetsModel.append({"type": "rating-input", "widgetId": "rating-input1", "properties": ratingInputData });

148+ allWidgetsModel.append({"type": "rating-edit", "widgetId": "rating-edit1", "properties": ratingEditData });

149+ allWidgetsModel.append({"type": "reviews", "widgetId": "reviews1", "properties": reviewsData });

150+ allWidgetsModel.append({"type": "table", "widgetId": "table1", "properties": tableData });

151+ allWidgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});

152+ allWidgetsModel.append({"type": "video", "widgetId": "video1", "properties": videoData });

52 }

153 }

53

154

54 PreviewWidgetFactory {

155 PreviewWidgetFactory {

@@ -58,6 +159,12 @@ Rectangle {

58 widgetData: root.widgetData

159 widgetData: root.widgetData

59 }

160 }

60

161

162+ PreviewWidgetFactory {

163+ id: previewWidgetFactory

164+ anchors { left: parent.left; right: parent.right; top: previewExpandable.bottom }

165+ opacity: 0

166+ }

167+

61 UT.UnityTestCase {

168 UT.UnityTestCase {

62 name: "PreviewExpandableTest"

169 name: "PreviewExpandableTest"

63 when: windowShown

170 when: windowShown

@@ -78,13 +185,10 @@ Rectangle {

78 }

185 }

79

186

80 function init() {

187 function init() {

188+ previewExpandable.widgetData = widgetData;

81 checkInitialState();

189 checkInitialState();

82 }

190 }

83

191

84− function test_collapsed_by_default() {

85− // Nothing init does this already

86− }

87−

88 function test_expand_collapse() {

192 function test_expand_collapse() {

89 var expandButton = findChild(previewExpandable, "expandButton")

193 var expandButton = findChild(previewExpandable, "expandButton")

90 mouseClick(expandButton);

194 mouseClick(expandButton);

@@ -105,5 +209,42 @@ Rectangle {

105

209

106 checkInitialState();

210 checkInitialState();

107 }

211 }

212+

213+ function test_all_widgets_height() {

214+ previewExpandable.widgetData = allWidgetsData;

215+

216+ var repeater = findChild(previewExpandable, "repeater")

217+ for (var i = 0; i < repeater.count; ++i) {

218+ tryCompare(repeater.itemAt(i), "height", 0);

219+ }

220+

221+ var expandButton = findChild(previewExpandable, "expandButton")

222+ mouseClick(expandButton);

223+

224+ var repeater = findChild(previewExpandable, "repeater")

225+ for (var i = 0; i < repeater.count; ++i) {

226+ previewWidgetFactory.active = false;

227+ wait(0); // spin the event loop otherwise we get warnings because the previous item from the

228+ // widget factory has still not been deleted and we change the widgetData

229+ previewWidgetFactory.widgetData = allWidgetsModel.get(i).properties;

230+ previewWidgetFactory.widgetType = allWidgetsModel.get(i).type;

231+ previewWidgetFactory.active = true;

232+

233+ // Wait for the height ot settle by waiting twice the time of the

234+ // longest of the height behaviour animations

235+ wait(UbuntuAnimation.SnapDuration * 2);

236+

237+ // Check the item inside the expandable has the same height

238+ // as the one straight from the factory

239+ verify(repeater.itemAt(i).height > 0);

240+ tryCompare(repeater.itemAt(i), "height", previewWidgetFactory.height);

241+ }

242+

243+ mouseClick(expandButton);

244+ compare(previewExpandable.expanded, false);

245+ for (var i = 0; i < repeater.count; ++i) {

246+ tryCompare(repeater.itemAt(i), "height", 0);

247+ }

248+ }

108 }

249 }

109}

250}

tests/qmltests/Dash/tst_PageHeader.qml+16−12

@@ -33,13 +33,18 @@ Item {

33

34 property alias searchEnabled : pageHeader.searchEntryEnabled

35 property alias searchQuery : pageHeader.searchQuery

36+ property var headerContainer: findChild(pageHeader, "headerContainer")

36

37

37 function doTypeString(text) {

38 function doTypeString(text) {

38− var headerContainer = findChild(pageHeader, "headerContainer");

39 tryCompare(headerContainer, "contentY", 0);

40 typeString(text);

41 }

42

43+ function doResetSearch() {

44+ pageHeader.resetSearch();

45+ tryCompare(headerContainer, "contentY", headerContainer.height);

46+ }

47+

43 function init() {

48 function init() {

44 searchEnabled = true;

49 searchEnabled = true;

45

50

@@ -49,14 +54,13 @@ Item {

49 pageHeader.searchHistory.clear();

54 pageHeader.searchHistory.clear();

50

55

51 // Check initial state

56 // Check initial state

52− var headerContainer = findChild(pageHeader, "headerContainer");

53 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

57 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

54 compare(pageHeader.searchHistory.count, 0);

58 compare(pageHeader.searchHistory.count, 0);

55 }

59 }

56

60

57 function test_search_disabled() {

61 function test_search_disabled() {

58 searchEnabled = false

62 searchEnabled = false

59− pageHeader.resetSearch()

63+ doResetSearch();

60

64

61 pageHeader.triggerSearch()

65 pageHeader.triggerSearch()

62 keyClick(Qt.Key_S)

66 keyClick(Qt.Key_S)

@@ -66,7 +70,7 @@ Item {

66

70

67 function test_search_enable() {

71 function test_search_enable() {

68 searchEnabled = true

72 searchEnabled = true

69− pageHeader.resetSearch()

73+ doResetSearch();

70

74

71 pageHeader.triggerSearch()

75 pageHeader.triggerSearch()

72 doTypeString("test")

76 doTypeString("test")

@@ -84,42 +88,42 @@ Item {

84

88

85 function test_reset_search() {

89 function test_reset_search() {

86 searchEnabled = true

90 searchEnabled = true

87− pageHeader.resetSearch()

91+ doResetSearch();

88

92

89 pageHeader.triggerSearch()

93 pageHeader.triggerSearch()

90 keyClick(Qt.Key_S)

94 keyClick(Qt.Key_S)

91

95

92 compare(searchQuery, "s", "Could not type in TextField.")

96 compare(searchQuery, "s", "Could not type in TextField.")

93

97

94− pageHeader.resetSearch()

98+ doResetSearch();

95 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")

99 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")

96 }

100 }

97

101

98 function test_history() {

102 function test_history() {

99 pageHeader.triggerSearch()

103 pageHeader.triggerSearch()

100 doTypeString("humppa1")

104 doTypeString("humppa1")

101− pageHeader.resetSearch()

105+ doResetSearch();

102

106

103 tryCompare(pageHeader.searchHistory, "count", 1)

107 tryCompare(pageHeader.searchHistory, "count", 1)

104 compare(pageHeader.searchHistory.get(0).query, "humppa1")

108 compare(pageHeader.searchHistory.get(0).query, "humppa1")

105

109

106 pageHeader.triggerSearch()

110 pageHeader.triggerSearch()

107 doTypeString("humppa2")

111 doTypeString("humppa2")

108− pageHeader.resetSearch()

112+ doResetSearch();

109

113

110 compare(pageHeader.searchHistory.count, 2)

114 compare(pageHeader.searchHistory.count, 2)

111 compare(pageHeader.searchHistory.get(0).query, "humppa2")

115 compare(pageHeader.searchHistory.get(0).query, "humppa2")

112

116

113 pageHeader.triggerSearch()

117 pageHeader.triggerSearch()

114 doTypeString("humppa3")

118 doTypeString("humppa3")

115− pageHeader.resetSearch()

119+ doResetSearch();

116

120

117 compare(pageHeader.searchHistory.count, 3)

121 compare(pageHeader.searchHistory.count, 3)

118 compare(pageHeader.searchHistory.get(0).query, "humppa3")

122 compare(pageHeader.searchHistory.get(0).query, "humppa3")

119

123

120 pageHeader.triggerSearch()

124 pageHeader.triggerSearch()

121 doTypeString("humppa4")

125 doTypeString("humppa4")

122− pageHeader.resetSearch()

126+ doResetSearch();

123

127

124 compare(pageHeader.searchHistory.count, 3)

128 compare(pageHeader.searchHistory.count, 3)

125 compare(pageHeader.searchHistory.get(0).query, "humppa4")

129 compare(pageHeader.searchHistory.get(0).query, "humppa4")

@@ -139,7 +143,7 @@ Item {

139 }

143 }

140

144

141 function cleanup() {

145 function cleanup() {

142− pageHeader.resetSearch();

146+ doResetSearch();

143 }

147 }

144

148

145 function test_popover() {

149 function test_popover() {

@@ -223,7 +227,7 @@ Item {

223 tryCompare(headerContainer, "showSearch", !data.hideSearch);

227 tryCompare(headerContainer, "showSearch", !data.hideSearch);

224 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

228 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

225

229

226− pageHeader.resetSearch();

230+ doResetSearch();

227 }

231 }

228

232

229 function test_search_change_shows_search() {

233 function test_search_change_shows_search() {

tests/qmltests/Launcher/tst_Launcher.qml+36−5

@@ -382,6 +382,15 @@ Item {

382 }

383 }

384

385+ function test_runningHighlight() {

386+ dragLauncherIntoView();

387+ var launcherListView = findChild(launcher, "launcherListView");

388+ for (var i = 0; i < launcherListView.count; ++i) {

389+ var delegate = findChild(launcherListView, "launcherDelegate" + i)

390+ compare(findChild(delegate, "runningHighlight").visible, LauncherModel.get(i).running)

391+ }

392+ }

393+

385 function test_focusedHighlight() {

394 function test_focusedHighlight() {

386 dragLauncherIntoView();

395 dragLauncherIntoView();

387 var launcherListView = findChild(launcher, "launcherListView");

396 var launcherListView = findChild(launcher, "launcherListView");

@@ -520,7 +529,14 @@ Item {

520 waitUntilLauncherDisappears();

529 waitUntilLauncherDisappears();

521 }

530 }

522

531

532+ function test_dragndrop_cancel_data() {

533+ return [

534+ {tag: "by mouse", mouse: true},

535+ {tag: "by touch", mouse: false}

536+ ]

537+ }

538+

523− function test_dragndrop_cancel() {

539+ function test_dragndrop_cancel(data) {

524 dragLauncherIntoView();

540 dragLauncherIntoView();

525 var draggedItem = findChild(launcher, "launcherDelegate4")

541 var draggedItem = findChild(launcher, "launcherDelegate4")

526 var item0 = findChild(launcher, "launcherDelegate0")

542 var item0 = findChild(launcher, "launcherDelegate0")

@@ -529,22 +545,37 @@ Item {

529 // Doing longpress

545 // Doing longpress

530 var currentMouseX = draggedItem.width / 2

546 var currentMouseX = draggedItem.width / 2

531 var currentMouseY = draggedItem.height / 2

547 var currentMouseY = draggedItem.height / 2

548+

549+ if(data.mouse) {

532− mousePress(draggedItem, currentMouseX, currentMouseY)

550+ mousePress(draggedItem, currentMouseX, currentMouseY)

551+ } else {

552+ touchPress(draggedItem, currentMouseX, currentMouseY)

553+ }

554+

533 // DraggedItem needs to hide and fakeDragItem become visible

555 // DraggedItem needs to hide and fakeDragItem become visible

534 tryCompare(draggedItem, "itemOpacity", 0)

556 tryCompare(draggedItem, "itemOpacity", 0)

535 tryCompare(fakeDragItem, "visible", true)

557 tryCompare(fakeDragItem, "visible", true)

536

558

537 // Dragging

559 // Dragging

538 currentMouseX -= units.gu(20)

560 currentMouseX -= units.gu(20)

561+

562+ if(data.mouse) {

539− mouseMove(draggedItem, currentMouseX, currentMouseY)

563+ mouseMove(draggedItem, currentMouseX, currentMouseY)

564+ } else {

565+ touchMove(draggedItem, currentMouseX, currentMouseY)

566+ }

540

567

541 // Make sure we're in the dragging state

568 // Make sure we're in the dragging state

542 var dndArea = findChild(launcher, "dndArea");

569 var dndArea = findChild(launcher, "dndArea");

543 tryCompare(draggedItem, "dragging", true)

570 tryCompare(draggedItem, "dragging", true)

544 tryCompare(dndArea, "draggedIndex", 4)

571 tryCompare(dndArea, "draggedIndex", 4)

545

572

546− // Tap somewhere in the middle of the screen to close/hide the launcher

573+ // Click/Tap somewhere in the middle of the screen to close/hide the launcher

574+ if(data.mouse) {

575+ mouseClick(root)

576+ } else {

547− tap(root)

577+ tap(root)

578+ }

548

579

549 // Make sure the dnd operation has been stopped

580 // Make sure the dnd operation has been stopped

550 tryCompare(draggedItem, "dragging", false)

581 tryCompare(draggedItem, "dragging", false)

tests/qmltests/Panel/tst_IndicatorItem.qml+12−12

@@ -181,25 +181,25 @@ Rectangle {

181 }

182

183 function test_select() {

184− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");

184+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

185 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

186− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");

186+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

187− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");

187+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

188− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");

188+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

189

190 indicatorItem.expanded = true;

191− tryCompare(findChild(indicatorItem, "icon0"), "color", "#4c4c4c");

191+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");

192 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);

193− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#4c4c4c");

193+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");

194− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#4c4c4c");

194+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");

195− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#4c4c4c");

195+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");

196

197 indicatorItem.selected = true;

198− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");

198+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

199 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

200− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");

200+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

201− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");

201+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

202− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");

202+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

203 }

204 }

205}

tests/qmltests/Stages/tst_PhoneStage.qml+1

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

295 tryCompare(ApplicationManager, "count", oldCount - 1)

296 }

297 phoneStage.shellOrientationAngle = 0;

298+ phoneStage.select(ApplicationManager.get(0).appId);

298 }

299 }

299

300

300 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {

301 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {

tests/qmltests/tst_Shell.qml+3−3

@@ -1505,7 +1505,7 @@ Rectangle {

1505 while (appRepeater.highlightedIndex != i && x <= 4000) {

1506 x+=10;

1507 mouseMove(shell, x, y)

1508− waitForRendering(shell)

1508+ wait(0); // spin the loop so bindings get evaluated

1509 }

1510 }

1511

@@ -1536,7 +1536,7 @@ Rectangle {

1536 while (appRepeater.highlightedIndex !== 2 && x <= 4000) {

1537 x+=10;

1538 mouseMove(shell, x, y)

1539− waitForRendering(shell)

1539+ wait(0); // spin the loop so bindings get evaluated

1540 }

1541 tryCompare(closeMouseArea, "enabled", true)

1542

@@ -1582,7 +1582,7 @@ Rectangle {

1582 while (appRepeater.highlightedIndex !== 2 && x <= 4000) {

1583 x+=10;

1584 mouseMove(shell, x, y)

1585− waitForRendering(shell)

1585+ wait(0); // spin the loop so bindings get evaluated

1586 }

1587 tryCompare(decoratedWindow, "highlightShown", true);

1588

tests/qmltests/tst_ShellWithPin.qml+5−4

@@ -498,12 +498,13 @@ Item {

498

499 function test_suspend() {

500 var greeter = findChild(shell, "greeter");

501+ var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")

501

502

502 // Put it to sleep

503 // Put it to sleep

503 Powerd.status = Powerd.Off;

504 Powerd.status = Powerd.Off;

504

505

505− // If locked, ApplicationManager.suspended should be true

506+ // If locked, applicationsDisplayLoader.item.suspended should be true

506− tryCompare(ApplicationManager, "suspended", true);

507+ tryCompare(applicationsDisplayLoader.item, "suspended", true);

507

508

508 // And wake up

509 // And wake up

509 Powerd.status = Powerd.On;

510 Powerd.status = Powerd.On;

@@ -513,12 +514,12 @@ Item {

513 swipeAwayGreeter(true);

514 swipeAwayGreeter(true);

514

515

515 // We have a lockscreen, make sure we're still suspended

516 // We have a lockscreen, make sure we're still suspended

516− tryCompare(ApplicationManager, "suspended", true);

517+ tryCompare(applicationsDisplayLoader.item, "suspended", true);

517

518

518 enterPin("1234")

519 enterPin("1234")

519

520

520 // Now that the lockscreen has gone too, make sure we're waking up

521 // Now that the lockscreen has gone too, make sure we're waking up

521− tryCompare(ApplicationManager, "suspended", false);

522+ tryCompare(applicationsDisplayLoader.item, "suspended", false);

522

523

523 }

524 }

524

525

tests/utils/modules/Unity/Test/UnityTestCase.qml+9

@@ -351,6 +351,15 @@ TestCase {

351 event.commit()

352 }

353

354+ function touchMove(item, tox, toy) {

355+ var root = fetchRootItem(item)

356+ var rootPoint = item.mapToItem(root, tox, toy)

357+

358+ var event = touchEvent(item);

359+ event.move(0 /* touchId */, rootPoint.x, rootPoint.y);

360+ event.commit();

361+ }

362+

354 function touchPinch(item, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End) {

363 function touchPinch(item, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End) {

355 // Make sure the item is rendered

364 // Make sure the item is rendered

356 waitForRendering(item);

365 waitForRendering(item);