09cb68b · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

[ Albert Astals Cid ]

09cb68bJosh Arenson11 years ago

debian/changelog+17

compare with xenial

unifiedsplit

@@ -1,3 +1,20 @@

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

3+ [ Albert Astals Cid ]

4+ * Revert Session Screenshotter (LP: #1473476)

6+ [ Daniel d'Andrada ]

7+ * Dismiss the apps spread if greeter gets shown (LP: #1471609)

9+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 13 Jul 2015 14:17:20 +0000

10+

11+unity8 (8.10+15.10.20150708.2-0ubuntu1) wily; urgency=medium

12+

13+ [ Albert Astals Cid ]

14+ * Make the card sizes a bit dependant on the total of gu of the dash

15+

16+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 08 Jul 2015 15:01:41 +0000

17+

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

18unity8 (8.10+15.10.20150702.2-0ubuntu1) wily; urgency=medium

3 [ Albert Astals Cid ]

20 [ Albert Astals Cid ]

debian/unity8-private.install−1

@@ -9,7 +9,6 @@ usr/lib/*/unity8/qml/Lights

9usr/lib/*/unity8/qml/Powerd

10usr/lib/*/unity8/qml/ScreenGrabber

11usr/lib/*/unity8/qml/SessionBroadcast

12−usr/lib/*/unity8/qml/SessionGrabber

13usr/lib/*/unity8/qml/Ubuntu

12usr/lib/*/unity8/qml/Ubuntu

14usr/lib/*/unity8/qml/Unity

13usr/lib/*/unity8/qml/Unity

15usr/lib/*/unity8/qml/Utils

14usr/lib/*/unity8/qml/Utils

plugins/CMakeLists.txt−1

@@ -19,7 +19,6 @@ add_subdirectory(Lights)

19add_subdirectory(Dash)

20add_subdirectory(Powerd)

21add_subdirectory(SessionBroadcast)

22−add_subdirectory(SessionGrabber)

23add_subdirectory(ScreenGrabber)

22add_subdirectory(ScreenGrabber)

24add_subdirectory(Ubuntu)

23add_subdirectory(Ubuntu)

25add_subdirectory(Unity)

24add_subdirectory(Unity)

plugins/SessionGrabber/CMakeLists.txtdeleted−8

@@ -1,8 +0,0 @@

1−include_directories(

2− ${CMAKE_CURRENT_BINARY_DIR}

3−)

4−

5−add_library(SessionGrabber-qml MODULE sessiongrabber.cpp plugin.cpp)

6−qt5_use_modules(SessionGrabber-qml Qml Gui Quick Concurrent)

7−

8−add_unity8_plugin(SessionGrabber 0.1 SessionGrabber TARGETS SessionGrabber-qml)

plugins/SessionGrabber/SessionGrabber.qmltypesdeleted−23

@@ -1,23 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable SessionGrabber 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SessionGrabber"

12− prototype: "QObject"

13− exports: ["SessionGrabber/SessionGrabber 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "appId"; type: "string" }

16− Property { name: "path"; type: "string"; isReadonly: true }

17− Property { name: "target"; type: "QQuickItem"; isPointer: true }

18− Signal { name: "appIdChanged" }

19− Signal { name: "screenshotTaken" }

20− Method { name: "take" }

21− Method { name: "removeScreenshot" }

22− }

23−}

plugins/SessionGrabber/plugin.cppdeleted−27

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

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#include "plugin.h"

19−#include "sessiongrabber.h"

20−

21−#include <QtQml/qqml.h>

22−

23−void SessionGrabberPlugin::registerTypes(const char *uri)

24−{

25− Q_ASSERT(uri == QLatin1String("SessionGrabber"));

26− qmlRegisterType<SessionGrabber>(uri, 0, 1, "SessionGrabber");

27−}

plugins/SessionGrabber/plugin.hdeleted−32

@@ -1,32 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#ifndef SESSIONGRABBER_PLUGIN_H

19−#define SESSIONGRABBER_PLUGIN_H

20−

21−#include <QtQml/QQmlExtensionPlugin>

22−

23−class SessionGrabberPlugin : public QQmlExtensionPlugin

24−{

25− Q_OBJECT

26− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

27−

28−public:

29− void registerTypes(const char *uri);

30−};

31−

32−#endif

plugins/SessionGrabber/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module SessionGrabber

2−plugin SessionGrabber-qml

3−typeinfo SessionGrabber.qmltypes

plugins/SessionGrabber/sessiongrabber.cppdeleted−135

@@ -1,135 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#include "sessiongrabber.h"

19−

20−#include <QDebug>

21−#include <QQuickItem>

22−#include <QQuickItemGrabResult>

23−#include <QtConcurrent>

24−

25−static QString cacheFolder()

26−{

27− return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/app_shots/";

28−}

29−

30−static QString cachePath(const QString &appId)

31−{

32− return cacheFolder() + appId + ".png";

33−}

34−

35−SessionGrabber::SessionGrabber(QObject *parent)

36− : QObject(parent)

37− , m_target(nullptr)

38− , m_watcher(nullptr)

39−{

40−}

41−

42−QString SessionGrabber::appId() const

43−{

44− return m_appId;

45−}

46−

47−void SessionGrabber::setAppId(const QString &appId)

48−{

49− if (appId != m_appId) {

50− m_appId = appId;

51− const QString path = cachePath(appId);

52− if (QFile::exists(path)) {

53− setPath(path);

54− }

55− }

56−}

57−

58−QQuickItem *SessionGrabber::target() const

59−{

60− return m_target;

61−}

62−

63−void SessionGrabber::setTarget(QQuickItem *target)

64−{

65− if (target != m_target) {

66− m_target = target;

67− Q_EMIT targetChanged();

68− }

69−}

70−

71−QString SessionGrabber::path() const

72−{

73− return m_path;

74−}

75−

76−void SessionGrabber::setPath(const QString &path)

77−{

78− if (path != m_path) {

79− m_path = path;

80− Q_EMIT pathChanged();

81− }

82−}

83−

84−static QString saveScreenshot(const QString &appId, const QSharedPointer<QQuickItemGrabResult> grabResult)

85−{

86− const QImage image = grabResult->image();

87− const QString cPath = cacheFolder();

88− QDir d;

89− d.mkpath(cPath);

90− const QString path = cachePath(appId);

91− if (image.save(path)) {

92− return path;

93− } else {

94− return QString();

95− }

96−}

97−

98−void SessionGrabber::grab()

99−{

100− if (!m_grabResult.isNull()) {

101− qWarning() << "Asked to grab a screenshot when there's one already being grabbed, ignoring";

102− return;

103− }

104−

105− if (m_target && !m_appId.isEmpty()) {

106− // grabToImage runs in a separate thread

107− m_grabResult = m_target->grabToImage();

108− connect(m_grabResult.data(), &QQuickItemGrabResult::ready, this, &SessionGrabber::grabReady);

109− } else {

110− qWarning() << "Can't grab screnshot: appId:" << m_appId << " target:" << m_target;

111− }

112−}

113−

114−void SessionGrabber::removeScreenshot()

115−{

116− const QString path = cachePath(m_appId);

117− QFile::remove(path);

118−}

119−

120−void SessionGrabber::grabReady()

121−{

122− QFuture<QString> f = QtConcurrent::run(saveScreenshot, m_appId, m_grabResult);

123− m_watcher = new QFutureWatcher<QString>(this);

124− m_watcher->setFuture(f);

125− connect(m_watcher, &QFutureWatcher<QString>::finished, this, &SessionGrabber::saveFinished);

126−}

127−

128−void SessionGrabber::saveFinished()

129−{

130− setPath(m_watcher->future().result());

131− delete m_watcher;

132− m_watcher = nullptr;

133− m_grabResult.clear();

134− Q_EMIT screenshotGrabbed();

135−}

plugins/SessionGrabber/sessiongrabber.hdeleted−85

@@ -1,85 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#ifndef SESSIONGRABBER_H

19−#define SESSIONGRABBER_H

20−

21−#include <QObject>

22−#include <QSharedPointer>

23−#include <QFutureWatcher>

24−

25−class QQuickItem;

26−class QQuickItemGrabResult;

27−

28−/**

29− * SessionGrabber saves to disk screenshots of the given item.

30− * Images are saved into $HOME/.cache/app_shots/appId.png

31− * It also handles giving back the screenshot path if it already exists (e.g. because a reboot)

32− */

33−class SessionGrabber : public QObject

34−{

35− Q_OBJECT

36−

37− /// appId is the key of the screenshot name.

38− Q_PROPERTY(QString appId READ appId WRITE setAppId NOTIFY appIdChanged)

39−

40− /// path where the screenshot is saved, can be empty if no screenshot has been grabbed yet.

41− Q_PROPERTY(QString path READ path NOTIFY pathChanged)

42−

43− /// target item for the screenshot grabbing.

44− Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)

45−

46−public:

47− explicit SessionGrabber(QObject *parent = 0);

48−

49− QString appId() const;

50− void setAppId(const QString &appId);

51−

52− QQuickItem *target() const;

53− void setTarget(QQuickItem *target);

54−

55− QString path() const;

56−

57− /// Starts grabbing a screenshot. Emits screenshotGrabbed when ready.

58− Q_INVOKABLE void grab();

59−

60− /// Removes the existing screenshot

61− Q_INVOKABLE void removeScreenshot();

62−

63−Q_SIGNALS:

64− void appIdChanged();

65− void targetChanged();

66− void pathChanged();

67−

68− /// Signals screenshot grabbing has finished.

69− void screenshotGrabbed();

70−

71−private Q_SLOTS:

72− void grabReady();

73− void saveFinished();

74−

75−private:

76− void setPath(const QString &path);

77−

78− QString m_appId;

79− QString m_path;

80− QQuickItem *m_target;

81− QFutureWatcher<QString> *m_watcher;

82− QSharedPointer<QQuickItemGrabResult> m_grabResult;

83−};

84−

85−#endif

po/cs.po+25−22

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2015-05-11 20:42+0000\n"

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"

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

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

20"Language: cs\n"

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

@@ -38,14 +38,14 @@ msgstr "Odpíchnout zkratku"

38#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"

39#: plugins/Utils/relativetimeformatter.cpp:157

40msgid "Yesterday %l:%M %p"

41−msgstr ""

41+msgstr "Včera %l:%M %p"

43#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

44#. This format string is used for showing, on a 12-hour clock, times that happened today.

45#. en_US example: "%l:%M %p" --> "1:00 PM"

46#: plugins/Utils/relativetimeformatter.cpp:164

47msgid "%l:%M %p"

48−msgstr ""

48+msgstr "%l:%M %p"

50#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

51#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

@@ -53,7 +53,7 @@ msgstr ""

53#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"

54#: plugins/Utils/relativetimeformatter.cpp:172

55msgid "Tomorrow %l:%M %p"

56−msgstr ""

56+msgstr "Zítra %l:%M %p"

58#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

59#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.

@@ -61,7 +61,7 @@ msgstr ""

61#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"

62#: plugins/Utils/relativetimeformatter.cpp:181

63msgid "%a %l:%M %p"

64−msgstr ""

64+msgstr "%a %l:%M %p"

66#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

67#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.

@@ -70,7 +70,7 @@ msgstr ""

70#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

71#: plugins/Utils/relativetimeformatter.cpp:190

72msgid "%a %d %b %l:%M %p"

73−msgstr ""

73+msgstr "%a %b. %d %l:%M %p"

75#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

76#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -78,14 +78,14 @@ msgstr ""

78#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"

79#: plugins/Utils/relativetimeformatter.cpp:201

80msgid "Yesterday %H:%M"

81−msgstr ""

81+msgstr "Včera %H:%M"

83#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

84#. This format string is used for showing, on a 24-hour clock, times that happened today.

85#. en_US example: "%H:%M" --> "13:00"

86#: plugins/Utils/relativetimeformatter.cpp:208

87msgid "%H:%M"

88−msgstr ""

88+msgstr "%H:%M"

90#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

91#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

@@ -93,7 +93,7 @@ msgstr ""

93#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"

94#: plugins/Utils/relativetimeformatter.cpp:216

95msgid "Tomorrow %H:%M"

96−msgstr ""

96+msgstr "Zítra %H:%M"

98#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

99#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.

@@ -101,7 +101,7 @@ msgstr ""

101#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"

102#: plugins/Utils/relativetimeformatter.cpp:225

103msgid "%a %H:%M"

104−msgstr ""

104+msgstr "%a %H:%M"

105

106#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

107#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.

@@ -110,7 +110,7 @@ msgstr ""

110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

111#: plugins/Utils/relativetimeformatter.cpp:234

112msgid "%a %d %b %H:%M"

113−msgstr ""

113+msgstr "%a %b. %d %H:%M"

114

115#: qml/Components/DelayedLockscreen.qml:49

116msgid "Device Locked"

@@ -399,32 +399,35 @@ msgstr "Nic se nepřehrává"

399#, qt-format

400msgid "%1 hour"

401msgid_plural "%1 hours"

402−msgstr[0] ""

402+msgstr[0] "%1 hodina"

403−msgstr[1] ""

403+msgstr[1] "%1 hodiny"

404+msgstr[2] "%1 hodin"

404

405

405#: qml/Panel/Indicators/MenuItemFactory.qml:772

406#: qml/Panel/Indicators/MenuItemFactory.qml:772

406#, qt-format

407#, qt-format

407msgid "%1 minute"

408msgid "%1 minute"

408msgid_plural "%1 minutes"

409msgid_plural "%1 minutes"

409−msgstr[0] ""

410+msgstr[0] "%1 minuta"

410−msgstr[1] ""

411+msgstr[1] "%1 minuty"

412+msgstr[2] "%1 minut"

411

413

412#: qml/Panel/Indicators/MenuItemFactory.qml:777

414#: qml/Panel/Indicators/MenuItemFactory.qml:777

413#, qt-format

415#, qt-format

414msgid "%1 second"

416msgid "%1 second"

415msgid_plural "%1 seconds"

417msgid_plural "%1 seconds"

416−msgstr[0] ""

418+msgstr[0] "%1 sekunda"

417−msgstr[1] ""

419+msgstr[1] "%1 sekundy"

420+msgstr[2] "%1 sekund"

418

421

419#: qml/Panel/Indicators/MenuItemFactory.qml:780

422#: qml/Panel/Indicators/MenuItemFactory.qml:780

420msgid "0 seconds"

423msgid "0 seconds"

421−msgstr ""

424+msgstr "0 sekund"

422

425

423#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

426#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

424#: qml/Panel/Indicators/MenuItemFactory.qml:782

427#: qml/Panel/Indicators/MenuItemFactory.qml:782

425#, qt-format

428#, qt-format

426msgid "%1 remaining"

429msgid "%1 remaining"

427−msgstr ""

430+msgstr "Zbývá %1"

428

431

429#: qml/Panel/Indicators/MenuItemFactory.qml:788

432#: qml/Panel/Indicators/MenuItemFactory.qml:788

430msgid "In queue…"

433msgid "In queue…"

po/en_AU.po+22−22

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"

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

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

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

22msgid "Password: "

@@ -37,14 +37,14 @@ msgstr "Unpin shortcut"

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 "Yesterday %l:%M %p"

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"

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 "Tomorrow %l:%M %p"

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 "%a %l:%M %p"

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 %b %d %l:%M %p"

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 "Yesterday %H:%M"

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"

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 "Tomorrow %H:%M"

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 "%a %H:%M"

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 %H:%M"

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

@@ -395,32 +395,32 @@ msgstr "Nothing is playing"

395#, qt-format

396msgid "%1 hour"

397msgid_plural "%1 hours"

398−msgstr[0] ""

398+msgstr[0] "%1 hour"

399−msgstr[1] ""

399+msgstr[1] "%1 hours"

400

401#: qml/Panel/Indicators/MenuItemFactory.qml:772

402#, qt-format

403msgid "%1 minute"

404msgid_plural "%1 minutes"

405−msgstr[0] ""

405+msgstr[0] "%1 minute"

406−msgstr[1] ""

406+msgstr[1] "%1 minutes"

407

408#: qml/Panel/Indicators/MenuItemFactory.qml:777

409#, qt-format

410msgid "%1 second"

411msgid_plural "%1 seconds"

412−msgstr[0] ""

412+msgstr[0] "%1 second"

413−msgstr[1] ""

413+msgstr[1] "%1 seconds"

414

415#: qml/Panel/Indicators/MenuItemFactory.qml:780

416msgid "0 seconds"

417−msgstr ""

417+msgstr "0 seconds"

418

419#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

420#: qml/Panel/Indicators/MenuItemFactory.qml:782

421#, qt-format

422msgid "%1 remaining"

423−msgstr ""

423+msgstr "%1 remaining"

424

425#: qml/Panel/Indicators/MenuItemFactory.qml:788

426msgid "In queue…"

@@ -482,7 +482,7 @@ msgstr "Tap here to continue."

482

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

484msgid "Click here to finish."

485−msgstr ""

485+msgstr "Click here to finish."

486

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

488msgid "These are the shortcuts to favorite apps"

po/fa.po+19−22

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

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

11+"PO-Revision-Date: 2015-07-11 15:43+0000\n"

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-12 04:55+0000\n"

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

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

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

22msgid "Password: "

@@ -37,14 +37,14 @@ msgstr "برداشتن سنجاق میانبر"

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 "دیروز %Ol:%OM %p"

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 "%Ol:%OM %p"

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 "فردا %Ol:%OM %p"

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 "%a %Ol:%OM %p"

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 %Ol:%OM %p"

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 "دیروز %OH:%OM"

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 "%OH:%OM"

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 "فردا %OH:%OM"

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 "%a %OH:%OM"

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 %d %b %OH:%OM"

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

@@ -395,32 +395,29 @@ msgstr "هیچ چیزی در حال پخش نیست"

395#, qt-format

396msgid "%1 hour"

397msgid_plural "%1 hours"

398−msgstr[0] ""

398+msgstr[0] "%1 ساعت"

399−msgstr[1] ""

400

399

401#: qml/Panel/Indicators/MenuItemFactory.qml:772

400#: qml/Panel/Indicators/MenuItemFactory.qml:772

402#, qt-format

401#, qt-format

403msgid "%1 minute"

402msgid "%1 minute"

404msgid_plural "%1 minutes"

403msgid_plural "%1 minutes"

405−msgstr[0] ""

404+msgstr[0] "%1 دقیقه"

406−msgstr[1] ""

407

405

408#: qml/Panel/Indicators/MenuItemFactory.qml:777

406#: qml/Panel/Indicators/MenuItemFactory.qml:777

409#, qt-format

407#, qt-format

410msgid "%1 second"

408msgid "%1 second"

411msgid_plural "%1 seconds"

409msgid_plural "%1 seconds"

412−msgstr[0] ""

410+msgstr[0] "%1 ثانیه"

413−msgstr[1] ""

414

411

415#: qml/Panel/Indicators/MenuItemFactory.qml:780

412#: qml/Panel/Indicators/MenuItemFactory.qml:780

416msgid "0 seconds"

413msgid "0 seconds"

417−msgstr ""

414+msgstr "۰ ثانیه"

418

415

419#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

416#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

420#: qml/Panel/Indicators/MenuItemFactory.qml:782

417#: qml/Panel/Indicators/MenuItemFactory.qml:782

421#, qt-format

418#, qt-format

422msgid "%1 remaining"

419msgid "%1 remaining"

423−msgstr ""

420+msgstr "%1 مانده"

424

421

425#: qml/Panel/Indicators/MenuItemFactory.qml:788

422#: qml/Panel/Indicators/MenuItemFactory.qml:788

426msgid "In queue…"

423msgid "In queue…"

@@ -482,7 +479,7 @@ msgstr "برای ادامه این‌جا را بزنید"

482

479

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

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

484msgid "Click here to finish."

481msgid "Click here to finish."

485−msgstr ""

482+msgstr "برای پایان اینجا کلیک کنید."

486

483

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

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

488msgid "These are the shortcuts to favorite apps"

485msgid "These are the shortcuts to favorite apps"

po/he.po+76−76

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2014-08-23 14:19+0000\n"

11+"PO-Revision-Date: 2015-07-12 08:47+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"

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

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

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

22msgid "Password: "

@@ -113,11 +113,11 @@ msgstr ""

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

116−msgstr ""

116+msgstr "ההתקן נעול"

117

118#: qml/Components/DelayedLockscreen.qml:64

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

120−msgstr ""

120+msgstr "ננעלת מחוץ למערכת עקב ריבוי ניסיונות הזנת מילת צופן."

121

122#: qml/Components/DelayedLockscreen.qml:65

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

@@ -133,21 +133,21 @@ 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?"

140−msgstr ""

140+msgstr "האם אכן לצאת מהמערכת?"

141

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,63 +157,63 @@ 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?"

164−msgstr ""

164+msgstr "האם לכבות?"

165

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

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"

195msgid "Power"

196−msgstr ""

196+msgstr "צריכת חשמל"

197

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

199msgid ""

200"Are you sure you would like\n"

201"to power off?"

202−msgstr ""

202+msgstr "האם לכבות?"

203

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

205msgctxt "Button: Power off the system"

206msgid "Power off"

207−msgstr ""

207+msgstr "כיבוי"

208

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

210msgctxt "Button: Restart the system"

211msgid "Restart"

212−msgstr ""

212+msgstr "הפעלה מחדש"

213

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

215msgid "Return to Call"

216−msgstr ""

216+msgstr "חזרה לשיחה"

217

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

219msgid "Emergency Call"

@@ -234,30 +234,30 @@ msgstr "להציג הכול"

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

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"

241msgid "Store"

242−msgstr ""

242+msgstr "חנות"

243

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"

251msgid "Settings"

252−msgstr ""

252+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..."

@@ -281,23 +281,23 @@ msgstr "שליחה"

281

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

283msgid "Pull to refresh…"

284−msgstr ""

284+msgstr "יש למשוך כדי לרענן…"

285

286#: qml/Dash/PullToRefreshScopeStyle.qml:60

287msgid "Release to refresh…"

288−msgstr ""

288+msgstr "יש לעזוב כדי לרענן…"

289

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

291msgid "Enable location data"

292−msgstr ""

292+msgstr "הפעלת נתוני מיקום"

293

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

295msgid "Manage"

296−msgstr ""

296+msgstr "ניהול"

297

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

299msgid "Home"

300−msgstr ""

300+msgstr "בית"

301

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

303msgid "Also installed"

@@ -305,15 +305,15 @@ msgstr ""

305

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

307msgid "Unlock"

308−msgstr ""

308+msgstr "שחרור נעילה"

309

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

311msgid "Retry"

312−msgstr ""

312+msgstr "ניסיון חוזר"

313

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

315msgid "Tap to unlock"

316−msgstr ""

316+msgstr "יש לגעת כדי לשחרר נעילה"

317

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

319msgid "Sorry, incorrect passphrase."

@@ -346,7 +346,7 @@ msgstr ""

346

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

348msgid "Enter passphrase"

349−msgstr ""

349+msgstr "נא להזין מילת צופן"

350

351#: qml/Greeter/NarrowView.qml:117

352msgid "Enter passcode"

@@ -443,11 +443,11 @@ msgstr "נכשל, יש לגעת כדי לנסות שוב"

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

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

445msgid "Reply"

446−msgstr ""

446+msgstr "להשיב"

447

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

449msgid "Unlock SIM"

450−msgstr ""

450+msgstr "שחרור נעילת ה־SIM"

451

452#: qml/Panel/Indicators/RoamingIndication.qml:27

453msgid "Roaming"

@@ -455,28 +455,28 @@ msgstr "נדידה"

455

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

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

458−msgstr ""

458+msgstr "פעולה זו עושה דברים שונים ליישומים שונים"

459

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

461msgid "Tap here to finish."

462−msgstr ""

462+msgstr "יש לגעת כאן כדי לסיים."

463

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

465msgid "Open special menus"

466−msgstr ""

466+msgstr "פתיחת תפריטים מיוחדים"

467

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

469msgid "Swipe up from the bottom edge."

470−msgstr ""

470+msgstr "גרירה למעלה מהקצה התחתון."

471

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

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

474msgid "Tap here to continue."

475−msgstr ""

475+msgstr "יש לגעת כאן כדי להמשיך."

476

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

478msgid "Click here to finish."

479−msgstr ""

479+msgstr "יש ללחוץ כאן כדי לסיים."

480

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

482msgid "These are the shortcuts to favorite apps"

@@ -484,7 +484,7 @@ msgstr ""

484

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

486msgid "Open the launcher"

487−msgstr ""

487+msgstr "פתיחת המשגר"

488

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

490msgid "Short swipe from the left edge."

@@ -496,11 +496,11 @@ msgstr ""

496

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

498msgid "Try again."

499−msgstr ""

499+msgstr "נא לנסות שוב."

500

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

502msgid "To view open apps"

503−msgstr ""

503+msgstr "לצפייה ביישומים הפתוחים"

504

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

506msgid "Long swipe from the right edge."

@@ -508,7 +508,7 @@ msgstr ""

508

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

510msgid "View all your running tasks."

511−msgstr ""

511+msgstr "צפייה בכל המשימות הפעילות שלך."

512

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

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

@@ -517,31 +517,31 @@ msgstr ""

517

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

519msgid "Terms & Conditions"

520−msgstr ""

520+msgstr "תנאי שימוש"

521

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

523msgid "Confirm passphrase"

524−msgstr ""

524+msgstr "אישור מילת הצופן"

525

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

527msgid "Confirm passcode"

528−msgstr ""

528+msgstr "אישור קוד הצופן"

529

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

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

532msgid "Please try again."

533−msgstr ""

533+msgstr "נא לנסות שוב."

534

535#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90

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

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

538#: qml/Wizard/Pages/60-reporting.qml:50

539msgid "Continue"

540−msgstr ""

540+msgstr "להמשיך"

541

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

543msgid "Choose your passcode"

544−msgstr ""

544+msgstr "בחירת קוד הצופן שלך"

545

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

547msgid "Passphrase must be 4 characters long"

@@ -549,19 +549,19 @@ msgstr ""

549

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

551msgid "Hi!"

552−msgstr ""

552+msgstr "שלום!"

553

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

555msgid "Welcome to your Ubuntu phone."

556−msgstr ""

556+msgstr "ברוך בואך לטלפון האובונטו שלך."

557

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

559msgid "Let’s get started."

560−msgstr ""

560+msgstr "קדימה, מתחילים."

561

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

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

564−msgstr ""

564+msgstr "יש להוסיף כרטיס SIM ולהפעיל את ההתקן מחדש"

565

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

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

@@ -569,7 +569,7 @@ msgstr ""

569

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

571msgid "Skip"

572−msgstr ""

572+msgstr "דילוג"

573

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

575msgid "Lock security"

@@ -582,48 +582,48 @@ msgstr ""

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

583msgctxt "Label: Type of security method"

584msgid "Swipe"

585−msgstr ""

585+msgstr "החלקה"

586

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

588msgctxt "Label: Description of security method"

589msgid "No security"

590−msgstr ""

590+msgstr "אין אבטחה"

591

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

593msgctxt "Label: Type of security method"

594msgid "Passcode"

595−msgstr ""

595+msgstr "קוד צופן"

596

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

598msgctxt "Label: Description of security method"

599msgid "4 digits only"

600−msgstr ""

600+msgstr "4 ספרות בלבד"

601

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

603msgctxt "Label: Type of security method"

604msgid "Passphrase"

605−msgstr ""

605+msgstr "מילת צופן"

606

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

608msgctxt "Label: Description of security method"

609msgid "Numbers and letters"

610−msgstr ""

610+msgstr "מספרים ואותיות"

611

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

613msgid "Connect to Wi‑Fi"

614−msgstr ""

614+msgstr "התחברות לרשת אלחוטית"

615

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

617msgid "Available networks…"

618−msgstr ""

618+msgstr "רשתות זמינות…"

619

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

621msgid "No available networks."

622−msgstr ""

622+msgstr "אין רשתות זמינות."

623

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

625msgid "Location"

626−msgstr ""

626+msgstr "מיקום"

627

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

629msgid "Let the phone detect your location:"

@@ -650,11 +650,11 @@ msgstr ""

650

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

652msgid "You can change your mind later in <b>System Settings</b>."

653−msgstr ""

653+msgstr "ניתן לשנות את העדפותיך מאוחר יותר ב<b>הגדרות המערכת</b>."

654

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

656msgid "Improving your experience"

657−msgstr ""

657+msgstr "שיפור החוויה שלך"

658

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

660msgid ""

@@ -670,19 +670,19 @@ msgstr ""

670

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

672msgid "All done"

673−msgstr ""

673+msgstr "הכול בוצע"

674

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

676msgid "Nice work!"

677−msgstr ""

677+msgstr "כל הכבוד!"

678

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

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

681−msgstr ""

681+msgstr "הטלפון שלך מוכן לשימוש."

682

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

684msgid "Finish"

685−msgstr ""

685+msgstr "סיום"

686

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

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

po/nl.po+22−22

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2015-04-25 13:27+0000\n"

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

12−"Last-Translator: rob <linuxned@gmail.com>\n"

12+"Last-Translator: Hannie Dumoleyn <Unknown>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"

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

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

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

22msgid "Password: "

@@ -37,14 +37,14 @@ msgstr "Snelkoppeling losmaken"

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 "Gisteren %l:%M %p"

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"

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 "Morgen %l:%M %p"

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 "%a %l:%M %p"

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"

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 "Gisteren %H:%M"

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"

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 "Morgen %H:%M"

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 "%a %H:%M"

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 %d %b %H:%M"

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

@@ -399,32 +399,32 @@ msgstr "Er wordt niets afgespeeld"

399#, qt-format

400msgid "%1 hour"

401msgid_plural "%1 hours"

402−msgstr[0] ""

402+msgstr[0] "%1 uur"

403−msgstr[1] ""

403+msgstr[1] "%1 uren"

404

405#: qml/Panel/Indicators/MenuItemFactory.qml:772

406#, qt-format

407msgid "%1 minute"

408msgid_plural "%1 minutes"

409−msgstr[0] ""

409+msgstr[0] "%1 minuut"

410−msgstr[1] ""

410+msgstr[1] "%1 minuten"

411

412#: qml/Panel/Indicators/MenuItemFactory.qml:777

413#, qt-format

414msgid "%1 second"

415msgid_plural "%1 seconds"

416−msgstr[0] ""

416+msgstr[0] "%1 seconde"

417−msgstr[1] ""

417+msgstr[1] "%1 seconden"

418

419#: qml/Panel/Indicators/MenuItemFactory.qml:780

420msgid "0 seconds"

421−msgstr ""

421+msgstr "0 seconden"

422

423#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

424#: qml/Panel/Indicators/MenuItemFactory.qml:782

425#, qt-format

426msgid "%1 remaining"

427−msgstr ""

427+msgstr "%1 resterend"

428

429#: qml/Panel/Indicators/MenuItemFactory.qml:788

430msgid "In queue…"

po/pl.po+9−11

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2015-07-04 21:24+0000\n"

11+"PO-Revision-Date: 2015-07-12 09:46+0000\n"

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

12+"Last-Translator: Seweryn Opyd <Unknown>\n"

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

14"MIME-Version: 1.0\n"

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

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

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

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

19−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"

19+"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"

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

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

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

23msgid "Password: "

@@ -53,7 +53,7 @@ msgstr "%k:%M"

53#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"

54#: plugins/Utils/relativetimeformatter.cpp:172

55msgid "Tomorrow %l:%M %p"

56−msgstr "Jutro %k:%M"

56+msgstr "Jutro %k:%M"

58#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

59#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.

@@ -70,7 +70,7 @@ msgstr "%a %k:%M"

70#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

71#: plugins/Utils/relativetimeformatter.cpp:190

72msgid "%a %d %b %l:%M %p"

73−msgstr "%a %d %b %k:%M"

73+msgstr "%a, %b %d %k:%M"

75#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

76#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -78,7 +78,7 @@ msgstr "%a %d %b %k:%M"

78#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"

79#: plugins/Utils/relativetimeformatter.cpp:201

80msgid "Yesterday %H:%M"

81−msgstr "Wczoraj %H:%M"

81+msgstr "Wczoraj %H:%M"

83#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

84#. This format string is used for showing, on a 24-hour clock, times that happened today.

@@ -110,7 +110,7 @@ msgstr "%a %H:%M"

110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

111#: plugins/Utils/relativetimeformatter.cpp:234

112msgid "%a %d %b %H:%M"

113−msgstr "%a %d %b %H:%M"

113+msgstr "%a, %b %d %H:%M"

114

115#: qml/Components/DelayedLockscreen.qml:49

116msgid "Device Locked"

@@ -202,9 +202,7 @@ msgstr "Zasilanie"

202msgid ""

203"Are you sure you would like\n"

204"to power off?"

205−msgstr ""

206−"Czy na pewno\n"

207−"wyłączyć?"

205+msgstr "Czy na pewno wyłączyć?"

208

206

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

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

210msgctxt "Button: Power off the system"

208msgctxt "Button: Power off the system"

po/sv.po+22−22

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

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2015-04-03 05:36+0000\n"

11+"PO-Revision-Date: 2015-07-12 22:17+0000\n"

12"Last-Translator: Josef Andersson <Unknown>\n"

13"Language-Team: Swedish\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"

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

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

20"Language: sv\n"

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

@@ -38,14 +38,14 @@ msgstr "Släpp genväg"

38#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"

39#: plugins/Utils/relativetimeformatter.cpp:157

40msgid "Yesterday %l:%M %p"

41−msgstr ""

41+msgstr "Igår %l:%M %p"

43#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

44#. This format string is used for showing, on a 12-hour clock, times that happened today.

45#. en_US example: "%l:%M %p" --> "1:00 PM"

46#: plugins/Utils/relativetimeformatter.cpp:164

47msgid "%l:%M %p"

48−msgstr ""

48+msgstr "%l:%M %p"

50#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

51#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

@@ -53,7 +53,7 @@ msgstr ""

53#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"

54#: plugins/Utils/relativetimeformatter.cpp:172

55msgid "Tomorrow %l:%M %p"

56−msgstr ""

56+msgstr "Imorgon %l:%M %p"

58#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

59#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.

@@ -61,7 +61,7 @@ msgstr ""

61#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"

62#: plugins/Utils/relativetimeformatter.cpp:181

63msgid "%a %l:%M %p"

64−msgstr ""

64+msgstr "%a %l:%M %p"

66#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

67#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.

@@ -70,7 +70,7 @@ msgstr ""

70#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

71#: plugins/Utils/relativetimeformatter.cpp:190

72msgid "%a %d %b %l:%M %p"

73−msgstr ""

73+msgstr "%a %d %b %l:%M %p"

75#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

76#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -78,14 +78,14 @@ msgstr ""

78#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"

79#: plugins/Utils/relativetimeformatter.cpp:201

80msgid "Yesterday %H:%M"

81−msgstr ""

81+msgstr "Igår %H:%M"

83#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

84#. This format string is used for showing, on a 24-hour clock, times that happened today.

85#. en_US example: "%H:%M" --> "13:00"

86#: plugins/Utils/relativetimeformatter.cpp:208

87msgid "%H:%M"

88−msgstr ""

88+msgstr "%H:%M"

90#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

91#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

@@ -93,7 +93,7 @@ msgstr ""

93#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"

94#: plugins/Utils/relativetimeformatter.cpp:216

95msgid "Tomorrow %H:%M"

96−msgstr ""

96+msgstr "Imorgon %H:%M"

98#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

99#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.

@@ -101,7 +101,7 @@ msgstr ""

101#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"

102#: plugins/Utils/relativetimeformatter.cpp:225

103msgid "%a %H:%M"

104−msgstr ""

104+msgstr "%a %H:%M"

105

106#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

107#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.

@@ -110,7 +110,7 @@ msgstr ""

110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

111#: plugins/Utils/relativetimeformatter.cpp:234

112msgid "%a %d %b %H:%M"

113−msgstr ""

113+msgstr "%a %d %b %H:%M"

114

115#: qml/Components/DelayedLockscreen.qml:49

116msgid "Device Locked"

@@ -396,32 +396,32 @@ msgstr "Inget spelas"

396#, qt-format

397msgid "%1 hour"

398msgid_plural "%1 hours"

399−msgstr[0] ""

399+msgstr[0] "%1 timme"

400−msgstr[1] ""

400+msgstr[1] "%1 timmar"

401

402#: qml/Panel/Indicators/MenuItemFactory.qml:772

403#, qt-format

404msgid "%1 minute"

405msgid_plural "%1 minutes"

406−msgstr[0] ""

406+msgstr[0] "%1 minut"

407−msgstr[1] ""

407+msgstr[1] "%1 minuter"

408

409#: qml/Panel/Indicators/MenuItemFactory.qml:777

410#, qt-format

411msgid "%1 second"

412msgid_plural "%1 seconds"

413−msgstr[0] ""

413+msgstr[0] "%1 sekund"

414−msgstr[1] ""

414+msgstr[1] "%1 sekunder"

415

416#: qml/Panel/Indicators/MenuItemFactory.qml:780

417msgid "0 seconds"

418−msgstr ""

418+msgstr "0 sekunder"

419

420#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

421#: qml/Panel/Indicators/MenuItemFactory.qml:782

422#, qt-format

423msgid "%1 remaining"

424−msgstr ""

424+msgstr "%1 återstår"

425

426#: qml/Panel/Indicators/MenuItemFactory.qml:788

427msgid "In queue…"

@@ -483,7 +483,7 @@ msgstr "Tryck här för att fortsätta."

483

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

485msgid "Click here to finish."

486−msgstr ""

486+msgstr "Klicka här för att slutföra."

487

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

489msgid "These are the shortcuts to favorite apps"

po/sw.po+53−53

@@ -8,19 +8,19 @@ msgstr ""

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

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

10"POT-Creation-Date: 2015-06-22 12:00+0200\n"

11−"PO-Revision-Date: 2014-01-14 19:28+0000\n"

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

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

12+"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"

13"Language-Team: Swahili <sw@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2015-07-11 05:33+0000\n"

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

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

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

22msgid "Password: "

23−msgstr ""

23+msgstr "Neno siri "

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

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

@@ -37,14 +37,14 @@ msgstr ""

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 "Jana %l:%M %p"

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"

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 "Kesho %l:%M %p"

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.

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

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 "Jana %H:%M"

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"

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 "Kesho %H:%M"

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 "%a %H:%M"

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,11 +109,11 @@ 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 %d %b %H:%M"

113

114#: qml/Components/DelayedLockscreen.qml:49

115msgid "Device Locked"

116−msgstr ""

116+msgstr "kifaa kimefungwa"

117

118#: qml/Components/DelayedLockscreen.qml:64

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

@@ -127,68 +127,68 @@ msgstr ""

127#, qt-format

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

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

130−msgstr[0] ""

130+msgstr[0] "Subiri dakika %1 halafu jaribu tena..."

131−msgstr[1] ""

131+msgstr[1] "Subiri dakika %1 halafu jaribu tena"

132

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

134msgctxt "Title: Lock/Log out dialog"

135msgid "Log out"

136−msgstr ""

136+msgstr "Logi nje"

137

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

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

140−msgstr ""

140+msgstr "Una uhakika unataka kulogi nje?"

141

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

143msgctxt "Button: Lock the system"

144msgid "Lock"

145−msgstr ""

145+msgstr "Funga"

146

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

148msgctxt "Button: Log out from the system"

149msgid "Log Out"

150−msgstr ""

150+msgstr "Logi nje"

151

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

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

154msgid "Cancel"

155−msgstr ""

155+msgstr "Ghairi"

156

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

158msgctxt "Title: Reboot/Shut down dialog"

159msgid "Shut down"

160−msgstr ""

160+msgstr "Zima"

161

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

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

164−msgstr ""

164+msgstr "Una uhakika unataka kuzima?"

165

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

167msgctxt "Button: Reboot the system"

168msgid "Reboot"

169−msgstr ""

169+msgstr "Washa tena"

170

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

172msgctxt "Button: Shut down the system"

173msgid "Shut down"

174−msgstr ""

174+msgstr "Zima"

175

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

177msgctxt "Title: Reboot dialog"

178msgid "Reboot"

179−msgstr ""

179+msgstr "Washa tena"

180

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

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

183−msgstr ""

183+msgstr "Una uhakika unataka kuzima halafu uwashe tena?"

184

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

186msgid "No"

187−msgstr ""

187+msgstr "La"

188

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

190msgid "Yes"

191−msgstr ""

191+msgstr "Ndio"

192

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

194msgctxt "Title: Power off/Restart dialog"

@@ -199,17 +199,17 @@ msgstr ""

199msgid ""

200"Are you sure you would like\n"

201"to power off?"

202−msgstr ""

202+msgstr "Una uhakika unataka kuzima?"

203

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

205msgctxt "Button: Power off the system"

206msgid "Power off"

207−msgstr ""

207+msgstr "Zima"

208

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

210msgctxt "Button: Restart the system"

211msgid "Restart"

212−msgstr ""

212+msgstr "Zima na uwashe"

213

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

215msgid "Return to Call"

@@ -217,55 +217,55 @@ msgstr ""

217

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

219msgid "Emergency Call"

220−msgstr ""

220+msgstr "Simu ya dharura"

221

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

223msgid "OK"

224−msgstr ""

224+msgstr "Sawa"

225

226#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690

227msgid "See less"

228−msgstr ""

228+msgstr "Onyesha kidogo"

229

230#: qml/Dash/GenericScopeView.qml:532

231msgid "See all"

232−msgstr ""

232+msgstr "Onyesha zote"

233

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

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

236msgid "Search"

237−msgstr ""

237+msgstr "Tafuta"

238

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

240msgctxt "Button: Open the Ubuntu Store"

241msgid "Store"

242−msgstr ""

242+msgstr "Duka"

243

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

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

246msgid "Search"

247−msgstr ""

247+msgstr "Tafuta"

248

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

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

251msgid "Settings"

252−msgstr ""

252+msgstr "Mipangilio"

253

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

255msgid "Remove from Favorites"

256−msgstr ""

256+msgstr "Toa kutoka nilizopenda"

257

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

259msgid "Add to Favorites"

260−msgstr ""

260+msgstr "Ongeza kwenye nilizopenda"

261

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

263msgid "More..."

264−msgstr ""

264+msgstr "Zaidi..."

265

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

267msgid "Less..."

268−msgstr ""

268+msgstr "Kidogo..."

269

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

271msgid "Rate this"

@@ -289,15 +289,15 @@ msgstr ""

289

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

291msgid "Enable location data"

292−msgstr ""

292+msgstr "Eneza data ya eneo"

293

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

295msgid "Manage"

296−msgstr ""

296+msgstr "Amuru"

297

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

299msgid "Home"

300−msgstr ""

300+msgstr "Nyumbani"

301

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

303msgid "Also installed"

@@ -305,15 +305,15 @@ msgstr ""

305

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

307msgid "Unlock"

308−msgstr ""

308+msgstr "Fungua"

309

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

311msgid "Retry"

312−msgstr ""

312+msgstr "Jaribu tena"

313

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

315msgid "Tap to unlock"

316−msgstr ""

316+msgstr "Gusa ufungue"

317

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

319msgid "Sorry, incorrect passphrase."

@@ -342,11 +342,11 @@ msgstr ""

342#: qml/Greeter/NarrowView.qml:115

343#, qt-format

344msgid "Enter %1"

345−msgstr ""

345+msgstr "Bonyeza %1"

346

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

348msgid "Enter passphrase"

349−msgstr ""

349+msgstr "Bonyeza neno siri"

350

351#: qml/Greeter/NarrowView.qml:117

352msgid "Enter passcode"

qml/Dash/CardTool.qml+15−6

@@ -80,16 +80,25 @@ Item {

81 If undefined, should use implicit width of the actual card.

82 */

83− readonly property var cardWidth: {

83+ property var cardWidth: {

84 switch (categoryLayout) {

85 case "grid":

86 case "vertical-journal":

87+ var size = template["card-size"];

87− if (template["card-layout"] === "horizontal") return units.gu(38);

88+ if (template["card-layout"] === "horizontal") size = "large";

88− switch (template["card-size"]) {

89+ switch (size) {

89− case "small": return units.gu(12);

90+ case "small": {

91+ if (viewWidth <= units.gu(45)) return units.gu(12);

92+ else return units.gu(14);

93+ }

90− case "large": return units.gu(38);

94+ case "large": {

95+ if (viewWidth >= units.gu(70)) return units.gu(42);

96+ else return viewWidth - units.gu(2);

97+ }

91 }

98 }

92− return units.gu(18.5);

99+ if (viewWidth <= units.gu(45)) return units.gu(18);

100+ else if (viewWidth >= units.gu(70)) return units.gu(20);

101+ else return units.gu(23);

93 case "carousel":

102 case "carousel":

94 case "horizontal-list":

103 case "horizontal-list":

95 return carouselTool.minimumTileWidth;

104 return carouselTool.minimumTileWidth;

qml/Dash/GenericScopeView.qml+7

@@ -332,6 +332,13 @@ FocusScope {

332 updateRanges();

333 if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {

334 // Yeah, hackish :/

335+ if (scopeView.width > units.gu(45)) {

336+ if (scopeView.width >= units.gu(70)) {

337+ cardTool.cardWidth = units.gu(9);

338+ } else {

339+ cardTool.cardWidth = units.gu(10);

340+ }

341+ }

335 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

342 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

336 }

343 }

337 item.cardTool = cardTool;

344 item.cardTool = cardTool;

qml/Shell.qml+1−1

@@ -305,7 +305,7 @@ Item {

305 Binding {

306 target: applicationsDisplayLoader.item

307 property: "spreadEnabled"

308− value: tutorial.spreadEnabled && (!greeter || !greeter.hasLockedApp)

308+ value: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))

309 }

310 Binding {

311 target: applicationsDisplayLoader.item

qml/Stages/ApplicationWindow.qml+22−46

@@ -17,7 +17,6 @@

17import QtQuick 2.0

18import Ubuntu.Components 1.1

19import Unity.Application 0.1

20−import SessionGrabber 0.1

22FocusScope {

21FocusScope {

23 id: root

22 id: root

@@ -31,16 +30,11 @@ FocusScope {

31 property QtObject application

30 property QtObject application

32 property int surfaceOrientationAngle

31 property int surfaceOrientationAngle

34− function removeScreenshot() {

35− sessionGrabber.removeScreenshot();

36− }

37−

38 QtObject {

33 QtObject {

39 id: d

34 id: d

41 // helpers so that we don't have to check for the existence of an application everywhere

36 // helpers so that we don't have to check for the existence of an application everywhere

42 // (in order to avoid breaking qml binding due to a javascript exception)

37 // (in order to avoid breaking qml binding due to a javascript exception)

43− readonly property string appId: root.application ? root.application.appId : ""

44 readonly property string name: root.application ? root.application.name : ""

38 readonly property string name: root.application ? root.application.name : ""

45 readonly property url icon: root.application ? root.application.icon : ""

39 readonly property url icon: root.application ? root.application.icon : ""

46 readonly property int applicationState: root.application ? root.application.state : -1

40 readonly property int applicationState: root.application ? root.application.state : -1

@@ -56,11 +50,11 @@ FocusScope {

56 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface

50 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface

58 property bool needToTakeScreenshot:

52 property bool needToTakeScreenshot:

59− sessionContainer.surface && d.surfaceInitialized

53+ sessionContainer.surface && d.surfaceInitialized && screenshotImage.status === Image.Null

60− && (d.applicationState === ApplicationInfoInterface.Stopped || d.applicationState === ApplicationInfoInterface.Suspended)

54+ && d.applicationState === ApplicationInfoInterface.Stopped

61 onNeedToTakeScreenshotChanged: {

55 onNeedToTakeScreenshotChanged: {

62 if (needToTakeScreenshot) {

56 if (needToTakeScreenshot) {

63− sessionGrabber.grab();

57+ screenshotImage.take();

64 }

58 }

65 }

59 }

@@ -92,9 +86,27 @@ FocusScope {

92 onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }

86 onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }

93 }

87 }

89+ Image {

90+ id: screenshotImage

91+ objectName: "screenshotImage"

92+ source: d.defaultScreenshot

93+ anchors.fill: parent

94+ antialiasing: !root.interactive

95+

96+ function take() {

97+ // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"

98+ // eg: "image://application/calculator-app/123456"

99+ var timeMs = new Date().getTime();

100+ source = "image://application/" + root.application.appId + "/" + timeMs;

101+ }

102+

103+ // Save memory by using a half-resolution (thus quarter size) screenshot

104+ sourceSize.width: root.width / 2

105+ sourceSize.height: root.height / 2

106+ }

107+

95 Loader {

108 Loader {

96 id: splashLoader

109 id: splashLoader

97− objectName: "splashLoader"

98 visible: active

110 visible: active

99 active: false

111 active: false

100 anchors.fill: parent

112 anchors.fill: parent

@@ -108,46 +120,10 @@ FocusScope {

108 backgroundColor: d.splashColor

120 backgroundColor: d.splashColor

109 headerColor: d.splashColorHeader

121 headerColor: d.splashColorHeader

110 footerColor: d.splashColorFooter

122 footerColor: d.splashColorFooter

111− activeSpinner: d.applicationState === ApplicationInfoInterface.Starting ||

112− d.applicationState === ApplicationInfoInterface.Running

113 }

123 }

114 }

124 }

115 }

125 }

116

126

117− Image {

118− id: screenshotImage

119− objectName: "screenshotImage"

120− source: sessionGrabber.path || d.defaultScreenshot

121− anchors.fill: parent

122− antialiasing: !root.interactive

123− cache: false

124− asynchronous: true

125−

126− // Save memory by using a half-resolution (thus quarter size) screenshot

127− sourceSize.width: root.width / 2

128− sourceSize.height: root.height / 2

129−

130− ActivityIndicator {

131− id: activityIndicator

132− anchors.centerIn: parent

133− visible: running

134− running: stateGroup.state == "screenshot" &&

135− (d.applicationState === ApplicationInfoInterface.Starting || d.applicationState === ApplicationInfoInterface.Running)

136− }

137− }

138−

139− SessionGrabber {

140− id: sessionGrabber

141− appId: d.appId

142− target: root

143−

144− onScreenshotGrabbed: {

145− // Need to reset to "" and back since it may be the same path with new content

146− screenshotImage.source = "";

147− screenshotImage.source = sessionGrabber.path;

148− }

149− }

150−

151 SessionContainer {

127 SessionContainer {

152 id: sessionContainer

128 id: sessionContainer

153 // A fake application might not even have a session property.

129 // A fake application might not even have a session property.

qml/Stages/PhoneStage.qml+16−1

@@ -51,6 +51,14 @@ Rectangle {

51 spreadView.contentX = -spreadView.shift;

52 }

53 }

54+ onSpreadEnabledChanged: {

55+ if (!spreadEnabled) {

56+ // reset. go back to display the focused app

57+ spreadView.selectedIndex = -1;

58+ spreadView.phase = 0;

59+ spreadView.contentX = -spreadView.shift;

60+ }

61+ }

54 function updateFocusedAppOrientation() {

62 function updateFocusedAppOrientation() {

55 if (spreadRepeater.count > 0) {

63 if (spreadRepeater.count > 0) {

56 spreadRepeater.itemAt(0).matchShellOrientation();

64 spreadRepeater.itemAt(0).matchShellOrientation();

@@ -281,7 +289,13 @@ Rectangle {

281

289

282 switch (phase) {

290 switch (phase) {

283 case 0:

291 case 0:

292+ // the "spreadEnabled" part is because when code does "phase = 0; contentX = -shift" to

293+ // dismiss the spread because spreadEnabled went to false, for some reason, during tests,

294+ // Flickable might jump in and change contentX value back, causing the code below to do

295+ // "phase = 1" which will make the spread stay.

296+ // It sucks that we have no control whatsoever over whether or when Flickable animates its

297+ // contentX.

284− if (shiftedContentX > width * positionMarker2) {

298+ if (root.spreadEnabled && shiftedContentX > width * positionMarker2) {

285 phase = 1;

299 phase = 1;

286 }

300 }

287 break;

301 break;

@@ -456,6 +470,7 @@ Rectangle {

456 enabled: root.spreadEnabled &&

470 enabled: root.spreadEnabled &&

457 !spreadView.active &&

471 !spreadView.active &&

458 !snapAnimation.running &&

472 !snapAnimation.running &&

473+ !spreadDragArea.pressed &&

459 priv.animateX &&

474 priv.animateX &&

460 !root.beingResized

475 !root.beingResized

461 UbuntuNumberAnimation {

476 UbuntuNumberAnimation {

qml/Stages/Splash.qml−2

@@ -31,7 +31,6 @@ Item {

31 property url icon

32 property alias title: header.title

33 property alias showHeader: header.visible

34− property alias activeSpinner: activityIndicator.running

36 Ambiance.Palette {

35 Ambiance.Palette {

37 id: ambiancePalette

36 id: ambiancePalette

@@ -145,7 +144,6 @@ Item {

145 }

144 }

146

145

147 ActivityIndicator {

146 ActivityIndicator {

148− id: activityIndicator

149 anchors.centerIn: header.visible ? parent : undefined

147 anchors.centerIn: header.visible ? parent : undefined

150 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0

148 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0

151

149

qml/Stages/SpreadDelegate.qml−1

@@ -397,7 +397,6 @@ FocusScope {

397 if (!running) {

398 dragArea.moving = false;

399 if (requestClose) {

400− appWindow.removeScreenshot();

401 root.closed();

400 root.closed();

402 } else {

401 } else {

403 dragArea.distance = 0;

402 dragArea.distance = 0;

tests/plugins/CMakeLists.txt−1

@@ -2,7 +2,6 @@ add_subdirectory(AccountsService)

2add_subdirectory(Greeter)

3add_subdirectory(IntegratedLightDM)

4add_subdirectory(Dash)

5−add_subdirectory(SessionGrabber)

6add_subdirectory(Ubuntu)

5add_subdirectory(Ubuntu)

7add_subdirectory(Unity)

6add_subdirectory(Unity)

8add_subdirectory(Utils)

7add_subdirectory(Utils)

tests/plugins/SessionGrabber/CMakeLists.txtdeleted−14

@@ -1,14 +0,0 @@

1−add_executable(SessionGrabberTestExec

2− sessiongrabbertest.cpp

3− ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber/sessiongrabber.cpp

4− )

5−qt5_use_modules(SessionGrabberTestExec Core Quick Test Concurrent)

6−

7−add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

8−

9−include_directories(

10− ${CMAKE_CURRENT_BINARY_DIR}

11− ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber

12− )

13−

14−add_unity8_uitest(SessionGrabber SessionGrabberTestExec)

tests/plugins/SessionGrabber/sessiongrabbertest.cppdeleted−79

@@ -1,79 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include <QtTestGui>

18−#include <QQuickItem>

19−#include <QQuickView>

20−#include <QSignalSpy>

21−

22−#include "sessiongrabber.h"

23−

24−class SessionGrabberTest : public QObject

25−{

26− Q_OBJECT

27−

28−private Q_SLOTS:

29−

30− void init()

31− {

32− view = new QQuickView();

33− view->setSource(QUrl::fromLocalFile(CURRENT_SOURCE_DIR "/sessiongrabbertest.qml"));

34− view->show();

35− QTest::qWaitForWindowExposed(view);

36− }

37−

38− void testSessionGrabber()

39− {

40− SessionGrabber s;

41− s.setAppId("test-app-id");

42− s.setTarget(view->rootObject());

43− QSignalSpy spy(&s, &SessionGrabber::screenshotGrabbed);

44−

45− QVERIFY(!QFile::exists(s.path()));

46−

47− view->rootObject()->setProperty("color", "red");

48− s.grab();

49− spy.wait();

50−

51− QVERIFY(QFile::exists(s.path()));

52− QImage image(s.path());

53− QCOMPARE(image.pixel(0, 0), qRgb(255, 0, 0));

54−

55− view->rootObject()->setProperty("color", "blue");

56− s.grab();

57− spy.wait();

58−

59− QVERIFY(QFile::exists(s.path()));

60− image = QImage(s.path());

61− QCOMPARE(image.pixel(0, 0), qRgb(0, 0, 255));

62−

63− s.removeScreenshot();

64−

65− QVERIFY(!QFile::exists(s.path()));

66− }

67−

68− void cleanup()

69− {

70− delete view;

71− }

72−

73−private:

74− QQuickView *view;

75−};

76−

77−QTEST_MAIN(SessionGrabberTest)

78−

79−#include "sessiongrabbertest.moc"

tests/plugins/SessionGrabber/sessiongrabbertest.qmldeleted−22

@@ -1,22 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−import QtQuick 2.4

18−

19−Rectangle {

20− width: 100

21− height: 100

22−}

tests/qmltests/Dash/tst_Card.qml+4−4

@@ -112,7 +112,7 @@ Rectangle {

112 id: cardTool

113 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];

114 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];

115− viewWidth: units.gu(48)

115+ viewWidth: units.gu(40)

116 }

117

118 readonly property var card: loader.item

@@ -261,10 +261,10 @@ Rectangle {

261

262 function test_card_size_data() {

263 return [

264− { tag: "Medium", width: units.gu(18.5), index: 0 },

264+ { tag: "Medium", width: units.gu(18), index: 0 },

265 { tag: "Small", width: units.gu(12), index: 1 },

266 { tag: "Large", width: units.gu(38), index: 2 },

267− { tag: "Wide", width: units.gu(18.5), index: 0 },

267+ { tag: "Wide", width: units.gu(18), index: 0 },

268 { tag: "Horizontal", width: units.gu(38), index: 5 },

269 // Make sure card ends with header when there's no summary

270 { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");

@@ -296,7 +296,7 @@ Rectangle {

296

297 function test_art_size_data() {

298 return [

299− { tag: "Medium", width: units.gu(18.5), fill: Image.PreserveAspectCrop, index: 0 },

299+ { tag: "Medium", width: units.gu(18), fill: Image.PreserveAspectCrop, index: 0 },

300 { tag: "Small", width: units.gu(12), index: 1 },

301 { tag: "Large", width: units.gu(38), index: 2 },

302 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },

tests/qmltests/Dash/tst_CardTool.qml+8−8

@@ -255,20 +255,20 @@ Rectangle {

255

256 function test_card_size_data() {

257 return [

258− { tag: "Medium", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 0 },

258+ { tag: "Medium", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 0 },

259− { tag: "No art", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 1 },

259+ { tag: "No art", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 1 },

260− { tag: "No summary", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 2 },

260+ { tag: "No summary", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 2 },

261− { tag: "Just header", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 3 },

261+ { tag: "Just header", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 3 },

262− { tag: "Just title", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 4 },

262+ { tag: "Just title", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 4 },

263− { tag: "Title and subtitle", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 5 },

263+ { tag: "Title and subtitle", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 5 },

264− { tag: "Title and mascot", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 6 },

264+ { tag: "Title and mascot", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 6 },

265 { tag: "Small", width: units.gu(12), height: function() { return internalCard ? internalCard.height : 0 }, index: 7 },

266 { tag: "Large", width: units.gu(38), height: function() { return internalCard ? internalCard.height : 0 }, index: 8 },

267 { tag: "Horizontal", width: units.gu(38), height: function() { return internalCard ? internalCard.height : 0 }, index: 9 },

268 { tag: "OrganicGrid", width: undefined, height: undefined, index: 0, layout_index: 1},

269 { tag: "Journal", width: undefined, height: units.gu(20), size: 20, index: 0, layout_index: 2 },

270 { tag: "OversizedJournal", width: undefined, height: units.gu(18.5), size: 40, index: 0, layout_index: 2 },

271− { tag: "VerticalJournal", width: units.gu(18.5), height: undefined, index: 0, layout_index: 3 },

271+ { tag: "VerticalJournal", width: units.gu(18), height: undefined, index: 0, layout_index: 3 },

272 { tag: "SmallCarousel", width: units.gu(18), height: units.gu(18), viewWidth: 30, index: 0, layout_index: 4},

273 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},

274 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},

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

@@ -88,7 +88,7 @@ Item {

88 tryCompareFunction(function() {

89 var category = findChild(genericScopeView, categoryName);

90 if (category && category.y > 0 && category.y < genericScopeView.height) return true;

91− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

91+ touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),

92 genericScopeView.width/2, genericScopeView.y)

93 tryCompare(categoryListView, "moving", false);

94 return false;

tests/qmltests/Stages/tst_ApplicationWindow.qml−44

@@ -35,9 +35,6 @@ Rectangle {

35 root.fakeApplication.manualSurfaceCreation = true;

36 root.fakeApplication.setState(ApplicationInfoInterface.Starting);

37 }

38− Component.onDestruction: {

39− applicationWindowLoader.item.removeScreenshot();

40− }

41 property QtObject fakeApplication: null

38 property QtObject fakeApplication: null

42 readonly property var fakeSession: fakeApplication ? fakeApplication.session : null

39 readonly property var fakeSession: fakeApplication ? fakeApplication.session : null

@@ -334,40 +331,6 @@ Rectangle {

334 tryCompare(screenshotImage, "status", Image.Null);

331 tryCompare(screenshotImage, "status", Image.Null);

335 }

332 }

336

333

337− function test_suspendrestartApp() {

338− var screenshotImage = findChild(applicationWindowLoader.item, "screenshotImage");

339−

340− initSession();

341− setApplicationState(appRunning);

342− tryCompare(stateGroup, "state", "surface");

343− waitUntilTransitionsEnd();

344−

345− setApplicationState(appSuspended);

346−

347− cleanupSession();

348−

349− tryCompare(stateGroup, "state", "screenshot");

350− waitUntilTransitionsEnd();

351− tryCompare(fakeApplication, "session", null);

352−

353− // and restart it

354− setApplicationState(appStarting);

355−

356− waitUntilTransitionsEnd();

357− verify(stateGroup.state === "screenshot");

358− verify(fakeSession === null);

359−

360− setApplicationState(appRunning);

361−

362− waitUntilTransitionsEnd();

363− verify(stateGroup.state === "screenshot");

364−

365− initSession();

366−

367− tryCompare(stateGroup, "state", "surface");

368− tryCompare(screenshotImage, "status", Image.Null);

369− }

370−

371 function test_appCrashed() {

334 function test_appCrashed() {

372 initSession();

335 initSession();

373 setApplicationState(appRunning);

336 setApplicationState(appRunning);

@@ -445,12 +408,5 @@ Rectangle {

445 applicationWindowLoader.item.interactive = true;

408 applicationWindowLoader.item.interactive = true;

446 compare(fakeSession.surface.activeFocus, true);

409 compare(fakeSession.surface.activeFocus, true);

447 }

410 }

448−

449− function test_no_spinner_if_stopped() {

450− setApplicationState(appStopped);

451− tryCompare(stateGroup, "state", "splashScreen");

452− var splashLoader = findChild(applicationWindowLoader.item, "splashLoader");

453− verify(!splashLoader.item.activeSpinner);

454− }

455 }

411 }

456}

412}

tests/qmltests/tst_OrientedShell.qml+45

@@ -951,6 +951,51 @@ Rectangle {

951 tryCompare(mockOskSettings, "stayHidden", false);

952 }

953

954+ /*

955+ Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1471609

956+

957+ Steps:

958+ - Open an app which can rotate

959+ - Rotate the phone to landscape

960+ - Open the app spread

961+ - Press the power button while the app spread is open

962+ - Wait a bit and press power button again

963+

964+ Expected outcome:

965+ You see greeter in portrat (ie, primary orientation)

966+

967+ Actual outcome:

968+ You see greeter in landscape

969+

970+ Comments:

971+ Greeter supports only the primary orientation (portrait in phones) but

972+ the stage doesn't allow orientation changes while the apps spread is open,

973+ hence the bug.

974+ */

975+ function test_phoneWithSpreadInLandscapeWhenGreeterShowsUp() {

976+ loadShell("mako");

977+

978+ var gmailApp = ApplicationManager.startApplication("gmail-webapp");

979+ verify(gmailApp);

980+

981+ // ensure the mock gmail-webapp is as we expect

982+ compare(gmailApp.rotatesWindowContents, false);

983+ compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation

984+ | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);

985+

986+ // wait until it's able to rotate

987+ tryCompare(shell, "orientationChangesEnabled", true);

988+

989+ rotateTo(90);

990+ tryCompare(shell, "transformRotationAngle", root.primaryOrientationAngle + 90);

991+

992+ performEdgeSwipeToShowAppSpread();

993+

994+ showGreeter();

995+

996+ tryCompare(shell, "transformRotationAngle", root.primaryOrientationAngle);

997+ }

998+

954 // angle - rotation angle in degrees clockwise, relative to the primary orientation.

999 // angle - rotation angle in degrees clockwise, relative to the primary orientation.

955 function rotateTo(angle) {

1000 function rotateTo(angle) {

956 switch (angle) {

1001 switch (angle) {