6b6d265 · unity8 · git.iko.soy

build.sh+1

compare with xenial

unifiedsplit

@@ -44,6 +44,7 @@ install_dependencies() {

44 gsettings-ubuntu-schemas \

45 pay-service \

46 qmenumodel-qml \

47+ qml-module-qtquick-layouts \

47 qml-module-qtquick-xmllistmodel \

48 qml-module-qtquick-xmllistmodel \

48 qtdeclarative5-gsettings1.0 \

49 qtdeclarative5-gsettings1.0 \

49 qtdeclarative5-ubuntu-ui-toolkit-plugin \

50 qtdeclarative5-ubuntu-ui-toolkit-plugin \

debian/changelog+56

@@ -1,3 +1,59 @@

1+unity8 (8.00+14.10.20140820-0ubuntu1) utopic; urgency=low

2+

3+ [ CI bot ]

4+ * Resync trunk

5+

6+ [ Nick Dedekind ]

7+ * Fixed CachedUnityMenuModel destruction unhinging indicators. (LP:

8+ #1328646)

9+

10+ [ Mirco Müller ]

11+ * Temporarily disable any opacity-animation for notifications to

12+ unblock the train due to LP: 1354406. (LP: #1354406)

13+

14+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 20 Aug 2014 20:03:55 +0000

15+

16+unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low

17+

18+ [ CI bot ]

19+ * Resync trunk

20+

21+ [ Michał Sawicz ]

22+ * Fix dash overview test and prevent crash in mock ApplicationInfo's

23+ d'tor. tryCompareFunction didn't work because .item threw.

24+

25+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Sun, 17 Aug 2014 00:37:35 +0000

26+

27+unity8 (8.00+14.10.20140815.1-0ubuntu1) utopic; urgency=low

28+

29+ [ Michael Terry ]

30+ * Bring dialer to front on incoming call even when device is locked

31+ (LP: #1354532)

32+

33+ [ CI bot ]

34+ * Resync trunk

35+

36+ [ Michał Sawicz ]

37+ * Use palette's baseText for text colour in dash.

38+ * Update qmltypes definitions

39+ * Move PageHeader out of qml/Components into qml/Dash

40+ * Reshuffle and update dependencies

41+ * Fix cardtool test and make card creator output debugging info on

42+ errors.

43+ * Support previews for scopes in overview and hook up preview

44+ processing to activity indicator.

45+ * Fix notifications indicator title

46+ * Fix horizontal list activation and add test for it.

47+

48+ [ Ying-Chun Liu ]

49+ * Add button colors and i18n for power off dialog. (LP: #1354506)

50+

51+ [ Mirco Müller ]

52+ * Force plain-text rendering for summary- and body-text. (LP:

53+ #1335787)

54+

55+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 15 Aug 2014 17:38:07 +0000

56+

1unity8 (8.00+14.10.20140814.1-0ubuntu1) utopic; urgency=low

57unity8 (8.00+14.10.20140814.1-0ubuntu1) utopic; urgency=low

2

58

3 [ Michael Terry ]

59 [ Michael Terry ]

debian/control+4−2

@@ -32,6 +32,7 @@ Build-Depends: cmake,

32 python3-all:any,

33 python3-setuptools,

34 python:any (>= 2.7),

35+ qml-module-qtquick-layouts,

35 qml-module-qtquick-xmllistmodel,

36 qml-module-qtquick-xmllistmodel,

36 qml-module-qtquick2,

37 qml-module-qtquick2,

37 qml-module-qttest,

38 qml-module-qttest,

@@ -84,7 +85,6 @@ Depends: gsettings-desktop-schemas,

84 qml-module-qtquick-xmllistmodel,

85 qml-module-qtquick-xmllistmodel,

85 qtdeclarative5-gsettings1.0,

86 qtdeclarative5-gsettings1.0,

86 qtdeclarative5-qtmir-plugin (>= 0.4.1),

87 qtdeclarative5-qtmir-plugin (>= 0.4.1),

87− qtdeclarative5-ubuntu-settings-components (>= 0.3),

88 qtdeclarative5-ubuntu-telephony0.1,

89 unity-launcher-impl-3,

90 unity8-common (= ${source:Version}),

@@ -105,7 +105,9 @@ Description: Unity 8 shell

105

106Package: unity8-common

107Architecture: all

108+Depends: qml-module-qtquick-layouts,

109+ qtdeclarative5-ubuntu-settings-components (>= 0.3),

108−Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

110+ qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

109 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

111 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

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

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

111 ubuntu-thumbnailer-impl-0,

113 ubuntu-thumbnailer-impl-0,

plugins/AccountsService/AccountsService.qmltypes+8

@@ -14,9 +14,17 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Enum {

18+ name: "PasswordDisplayHint"

19+ values: {

20+ "Keyboard": 0,

21+ "Numeric": 1

22+ }

23+ }

17 Property { name: "user"; type: "string" }

24 Property { name: "user"; type: "string" }

18 Property { name: "demoEdges"; type: "bool" }

25 Property { name: "demoEdges"; type: "bool" }

19 Property { name: "backgroundFile"; type: "string"; isReadonly: true }

26 Property { name: "backgroundFile"; type: "string"; isReadonly: true }

20 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

27 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

21 }

29 }

22}

30}

plugins/Dash/CardCreator.js+19−5

@@ -439,20 +439,20 @@ function cardString(template, components) {

439 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

440 }

441

442− var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';

442+ var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText)';

443

444 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

445 var titleSubtitleCode = '';

446 if (hasTitle) {

447 var titleColor;

448 if (headerAsOverlay) {

449− titleColor = 'overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';

449+ titleColor = 'overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText)';

450 } else if (hasSummary) {

451 titleColor = 'summary.color';

452 } else if (hasBackground) {

453 titleColor = summaryColorWithBackground;

454 } else {

455− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';

455+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

456 }

457

458 var titleAnchors;

@@ -604,7 +604,7 @@ function cardString(template, components) {

604 if (hasBackground) {

605 summaryColor = summaryColorWithBackground;

606 } else {

607− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';

607+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

608 }

609

610 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');

@@ -639,7 +639,10 @@ function cardString(template, components) {

639 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';

640 } else if (hasArt) {

641 implicitHeight += 'artShapeHolder.height;\n';

642+ } else {

643+ implicitHeight = '';

642 }

644 }

645+

643 // Close the AbstractButton

646 // Close the AbstractButton

644 code += implicitHeight + '}\n';

647 code += implicitHeight + '}\n';

645

648

@@ -653,5 +656,16 @@ function createCardComponent(parent, template, components) {

653 var card = cardString(template, components);

656 var card = cardString(template, components);

654 var code = imports + 'Component {\n' + card + '}\n';

657 var code = imports + 'Component {\n' + card + '}\n';

655

658

659+ try {

656− return Qt.createQmlObject(code, parent, "createCardComponent");

660+ return Qt.createQmlObject(code, parent, "createCardComponent");

661+ } catch (e) {

662+ console.error("ERROR: Invalid component created.");

663+ console.error("Template:");

664+ console.error(JSON.stringify(template));

665+ console.error("Components:");

666+ console.error(JSON.stringify(components));

667+ console.error("Code:");

668+ console.error(code);

669+ throw e;

670+ }

657}

671}

plugins/Dash/Dash.qmltypes+1

@@ -39,6 +39,7 @@ Module {

39 Property { name: "sectionProperty"; type: "string" }

40 Property { name: "forceNoClip"; type: "bool" }

41 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

42+ Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

42 Signal { name: "headerChanged" }

43 Signal { name: "headerChanged" }

43 Method { name: "positionAtBeginning" }

44 Method { name: "positionAtBeginning" }

44 Method { name: "showHeader" }

45 Method { name: "showHeader" }

plugins/Dash/ScopeStyle.qml+1−1

@@ -87,7 +87,7 @@ QtObject {

87 property var d: QtObject {

88 // FIXME: should be taken from the theme

89 readonly property color defaultLight: "white"

90− readonly property color defaultDark: "grey"

90+ readonly property color defaultDark: Theme.palette.normal.baseText

91 readonly property real defaultLightLuminance: luminance(defaultLight)

92 readonly property real defaultDarkLuminance: luminance(defaultDark)

93

plugins/LightDM/LightDM.qmltypes+7

@@ -14,6 +14,7 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Property { name: "active"; type: "bool" }

17 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "promptless"; type: "bool"; isReadonly: true }

20 Property { name: "promptless"; type: "bool"; isReadonly: true }

@@ -32,6 +33,8 @@ Module {

32 name: "authenticationUserChanged"

33 name: "authenticationUserChanged"

33 Parameter { name: "user"; type: "string" }

34 Parameter { name: "user"; type: "string" }

34 }

35 }

36+ Signal { name: "isActiveChanged" }

37+ Signal { name: "showGreeter" }

35 Signal {

38 Signal {

36 name: "requestAuthenticationUser"

39 name: "requestAuthenticationUser"

37 Parameter { name: "user"; type: "string" }

40 Parameter { name: "user"; type: "string" }

@@ -51,6 +54,10 @@ Module {

51 Parameter { name: "session"; type: "string" }

54 Parameter { name: "session"; type: "string" }

52 }

55 }

53 Method { name: "startSessionSync"; type: "bool" }

56 Method { name: "startSessionSync"; type: "bool" }

57+ Method {

58+ name: "setIsActive"

59+ Parameter { name: "isActive"; type: "bool" }

60+ }

54 }

61 }

55 Component {

62 Component {

56 name: "QAbstractProxyModel"

63 name: "QAbstractProxyModel"

plugins/Unity/DashCommunicator/DashCommunicator.qmltypesnew file+34

@@ -0,0 +1,34 @@

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 Unity.DashCommunicator 0.1 plugins'

8+

9+Module {

10+ Component {

11+ name: "DashCommunicator"

12+ prototype: "QObject"

13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Method {

16+ name: "setCurrentScope"

17+ Parameter { name: "scopeId"; type: "string" }

18+ Parameter { name: "animate"; type: "bool" }

19+ Parameter { name: "reset"; type: "bool" }

20+ }

21+ }

22+ Component {

23+ name: "DashCommunicatorService"

24+ prototype: "QObject"

25+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

26+ exportMetaObjectRevisions: [0]

27+ Signal {

28+ name: "setCurrentScopeRequested"

29+ Parameter { name: "scopeId"; type: "string" }

30+ Parameter { name: "animate"; type: "bool" }

31+ Parameter { name: "reset"; type: "bool" }

32+ }

33+ }

34+}

plugins/Unity/Indicators/CachedUnityMenuModel.qmldeleted−60

@@ -1,60 +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 Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

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

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

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

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

12− *

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

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18− */

19−

20−import QtQuick 2.0

21−import QMenuModel 0.1 as QMenuModel

22−import Unity.Indicators 0.1 as Indicators

23−

24−// Make sure we don't duplicate models.

25−Item {

26− id: cachedModel

27− property string busName: ""

28− property string actionsObjectPath: ""

29− property string menuObjectPath: ""

30−

31− readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""

32−

33− property QtObject model: {

34− if (!ready) {

35− return null;

36− }

37−

38− var component = Indicators.UnityMenuModelCache.model(menuObjectPath);

39− if (!component) {

40− component = modelComponent.createObject(cachedModel);

41− return component;

42− }

43− return component;

44− }

45−

46− Component {

47− id: modelComponent

48−

49− QMenuModel.UnityMenuModel {

50− id: unityModel

51− busName: cachedModel.busName

52− actions: { "indicator": cachedModel.actionsObjectPath }

53− menuObjectPath: cachedModel.menuObjectPath

54−

55− Component.onCompleted: {

56− Indicators.UnityMenuModelCache.registerModel(cachedModel.menuObjectPath, unityModel);

57− }

58− }

59− }

60−}

plugins/Unity/Indicators/qmldir−3

@@ -1,6 +1,3 @@

1module Unity.Indicators

2plugin IndicatorsQml

3typeinfo Indicators.qmltypes

4−

5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml

6−IndicatorBase 0.1 IndicatorBase.qml

plugins/Unity/Indicators/unitymenumodelcache.cpp+22−7

@@ -29,14 +29,29 @@ UnityMenuModelCache::~UnityMenuModelCache()

29{

30}

31

32−

33−UnityMenuModel* UnityMenuModelCache::model(const QString& path) const

32+UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,

33+ const QByteArray& path,

34+ const QVariantMap& actions)

34{

35{

35− return m_menuModels.value(path, NULL);

36+ if (m_registry.contains(path))

37+ return m_registry[path];

38+

39+ UnityMenuModel* menuModel = new UnityMenuModel;

40+ connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {

41+ QList<QByteArray> keys = m_registry.keys(menuModel);

42+ Q_FOREACH(const QByteArray& key, keys) {

43+ m_registry.remove(key);

44+ }

45+ });

46+ m_registry[path] = menuModel;

47+

48+ menuModel->setBusName(bus);

49+ menuModel->setMenuObjectPath(path);

50+ menuModel->setActions(actions);

51+ return menuModel;

36}

52}

37

53

38−void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)

54+bool UnityMenuModelCache::contains(const QByteArray& path)

39{

55{

40− menuModel->setParent(this);

56+ return m_registry.contains(path);

41− m_menuModels[path] = menuModel;

42−}

57+}

plugins/Unity/Indicators/unitymenumodelcache.h+5−3

@@ -34,11 +34,13 @@ public:

34 UnityMenuModelCache(QObject*parent=NULL);

35 ~UnityMenuModelCache();

36

37− Q_INVOKABLE UnityMenuModel* model(const QString& path) const;

37+ Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,

38− Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);

38+ const QByteArray& path,

39+ const QVariantMap& actions);

40+ Q_INVOKABLE bool contains(const QByteArray& path);

39

41

40private:

42private:

41− QHash<QString, UnityMenuModel*> m_menuModels;

43+ QHash<QByteArray, UnityMenuModel*> m_registry;

42};

44};

43

45

44#endif // UNITYMENUMODELCACHE_H

46#endif // UNITYMENUMODELCACHE_H

plugins/Unity/Session/Session.qmltypes+12

@@ -18,8 +18,20 @@ Module {

18 name: "logoutRequested"

19 Parameter { name: "have_inhibitors"; type: "bool" }

20 }

21+ Signal {

22+ name: "rebootRequested"

23+ Parameter { name: "have_inhibitors"; type: "bool" }

24+ }

25+ Signal {

26+ name: "shutdownRequested"

27+ Parameter { name: "have_inhibitors"; type: "bool" }

28+ }

21 Signal { name: "logoutReady" }

29 Signal { name: "logoutReady" }

22 Method { name: "Logout" }

30 Method { name: "Logout" }

31+ Method { name: "Reboot" }

32+ Method { name: "Shutdown" }

23 Method { name: "RequestLogout" }

33 Method { name: "RequestLogout" }

34+ Method { name: "RequestReboot" }

35+ Method { name: "RequestShutdown" }

24 }

36 }

25}

37}

plugins/Utils/Utils.qmltypes+7

@@ -140,4 +140,11 @@ Module {

140 Property { name: "actionsHint"; type: "QByteArray" }

141 Property { name: "menuObjectPathHint"; type: "QByteArray" }

142 }

143+ Component {

144+ name: "WindowKeysFilter"

145+ defaultProperty: "data"

146+ prototype: "QQuickItem"

147+ exports: ["Utils/WindowKeysFilter 0.1"]

148+ exportMetaObjectRevisions: [0]

149+ }

143}

150}

po/am.po+9−9

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 20:52+0000\n"

11+"PO-Revision-Date: 2014-08-16 20:11+0000\n"

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

13"Language-Team: Amharic <am@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "የ መግቢያ ቃል: "

23

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

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

@@ -94,11 +94,11 @@ msgstr ""

94

95#: qml/Components/Lockscreen.qml:161

96msgid "Too many incorrect attempts"

97−msgstr ""

97+msgstr "በርካታ የተሳሳቱ ሙከራዎች"

98

99#: qml/Components/Lockscreen.qml:163

100msgid "Please wait"

101−msgstr ""

101+msgstr "እባክዎን ይቆዩ"

102

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

104msgid "Emergency Call"

@@ -260,16 +260,16 @@ msgstr ""

260#: qml/Shell.qml:269

261#, qt-format

262msgid "Enter your %1"

263−msgstr ""

263+msgstr "ያስገቡ የ እርስዎን %1"

264

265#: qml/Shell.qml:270

266#, qt-format

267msgid "Incorrect %1"

268−msgstr ""

268+msgstr "የተሳሳተ %1"

269

270#: qml/Shell.qml:272

271msgid "Please re-enter"

272−msgstr ""

272+msgstr "እባክዎን እንደ ገና-ያስገቡ"

273

274#: qml/Shell.qml:306

275msgid "Sorry, incorrect passphrase."

@@ -281,7 +281,7 @@ msgstr ""

281

282#: qml/Shell.qml:308

283msgid "This will be your last attempt."

284−msgstr ""

284+msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

285

286#: qml/Shell.qml:310

287msgid ""

po/ca.po+20−15

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 09:17+0000\n"

11+"PO-Revision-Date: 2014-08-17 03:42+0000\n"

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

13"Language-Team: Catalan <ca@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Contrasenya: "

23

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

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

@@ -102,11 +102,11 @@ msgstr ""

102

103#: qml/Components/Lockscreen.qml:161

104msgid "Too many incorrect attempts"

105−msgstr ""

105+msgstr "Massa intents incorrectes"

106

107#: qml/Components/Lockscreen.qml:163

108msgid "Please wait"

109−msgstr ""

109+msgstr "Espereu"

110

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

112msgid "Emergency Call"

@@ -179,11 +179,11 @@ msgstr "Botiga"

179

180#: qml/Dash/ScopesOverviewTab.qml:36

181msgid "Favorites"

182−msgstr "Preferits"

182+msgstr "Preferides"

183

184#: qml/Dash/ScopesOverviewTab.qml:54

185msgid "All"

186−msgstr "Tots"

186+msgstr "Totes"

187

188#: qml/Greeter/Greeter.qml:157

189msgid "Swipe to unlock"

@@ -259,46 +259,51 @@ msgstr "Itinerància"

259

260#: qml/Shell.qml:267

261msgid "passphrase"

262−msgstr ""

262+msgstr "contrasenya"

263

264#: qml/Shell.qml:267

265msgid "passcode"

266−msgstr ""

266+msgstr "clau"

267

268#: qml/Shell.qml:269

269#, qt-format

270msgid "Enter your %1"

271−msgstr ""

271+msgstr "Introduïu la %1"

272

273#: qml/Shell.qml:270

274#, qt-format

275msgid "Incorrect %1"

276−msgstr ""

276+msgstr "La %1 és incorrecta"

277

278#: qml/Shell.qml:272

279msgid "Please re-enter"

280−msgstr ""

280+msgstr "Torneu-la a introduir"

281

282#: qml/Shell.qml:306

283msgid "Sorry, incorrect passphrase."

284−msgstr ""

284+msgstr "La contrasenya és incorrecta"

285

286#: qml/Shell.qml:307

287msgid "Sorry, incorrect passcode."

288−msgstr ""

288+msgstr "La clau és incorrecta"

289

290#: qml/Shell.qml:308

291msgid "This will be your last attempt."

292−msgstr ""

292+msgstr "Aquest serà el darrer intent."

293

294#: qml/Shell.qml:310

295msgid ""

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

297"reset and all personal data will be deleted."

298msgstr ""

299+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

300+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

301+"personals."

299

302

300#: qml/Shell.qml:311

303#: qml/Shell.qml:311

301msgid ""

304msgid ""

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

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

303"and all personal data will be deleted."

306"and all personal data will be deleted."

304msgstr ""

307msgstr ""

308+"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "

309+"a l'estat de fàbrica i se suprimiran totes les dades personals."

po/de.po+15−15

@@ -8,27 +8,27 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-08 08:58+0000\n"

11+"PO-Revision-Date: 2014-08-17 21:46+0000\n"

12−"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"

12+"Last-Translator: Phillip Sz <Unknown>\n"

13"Language-Team: German <de@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Passwort: "

23

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

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

26msgid "Pin shortcut"

27−msgstr ""

27+msgstr "Verknüpfung anheften"

28

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

30msgid "Unpin shortcut"

31−msgstr ""

31+msgstr "Verknüpfung entfernen"

32

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

34msgid "Are you sure you would like to turn power off?"

@@ -36,15 +36,15 @@ msgstr ""

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Ausschalten"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Neustart"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Abbrechen"

48

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

50msgid "Skip intro"

@@ -103,7 +103,7 @@ msgstr ""

103

104#: qml/Components/Lockscreen.qml:163

105msgid "Please wait"

106−msgstr ""

106+msgstr "Bitte warten"

107

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

109msgid "Emergency Call"

@@ -168,7 +168,7 @@ msgstr ""

168

169#: qml/Dash/ScopesOverview.qml:408

170msgid "Done"

171−msgstr ""

171+msgstr "Erledigt"

172

173#: qml/Dash/ScopesOverview.qml:434

174msgid "Store"

@@ -176,11 +176,11 @@ msgstr ""

176

177#: qml/Dash/ScopesOverviewTab.qml:36

178msgid "Favorites"

179−msgstr ""

179+msgstr "Favoriten"

180

181#: qml/Dash/ScopesOverviewTab.qml:54

182msgid "All"

183−msgstr ""

183+msgstr "Alle"

184

185#: qml/Greeter/Greeter.qml:157

186msgid "Swipe to unlock"

@@ -252,11 +252,11 @@ msgstr ""

252

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

254msgid "Roaming"

255−msgstr ""

255+msgstr "Roaming"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "Passwort"

260

261#: qml/Shell.qml:267

262msgid "passcode"

po/en_AU.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 02:04+0000\n"

11+"PO-Revision-Date: 2014-08-17 09:06+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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Password: "

23

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

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

@@ -96,11 +96,11 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "Too many incorrect attempts"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "Please wait"

104

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

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ msgstr "Roaming"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "passphrase"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "passcode"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "Enter your %1"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "Incorrect %1"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "Please re-enter"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "Sorry, incorrect passphrase."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "Sorry, incorrect passcode."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "This will be your last attempt."

287

288#: qml/Shell.qml:310

289msgid ""

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

291"reset and all personal data will be deleted."

292msgstr ""

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

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

293

295

294#: qml/Shell.qml:311

296#: qml/Shell.qml:311

295msgid ""

297msgid ""

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

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

297"and all personal data will be deleted."

299"and all personal data will be deleted."

298msgstr ""

300msgstr ""

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

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

po/en_GB.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 12:46+0000\n"

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

12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"

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

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Password: "

23

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

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

@@ -96,11 +96,11 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "Too many incorrect attempts"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "Please wait"

104

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

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ msgstr "Roaming"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "passphrase"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "passcode"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "Enter your %1"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "Incorrect %1"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "Please re-enter"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "Sorry, incorrect passphrase."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "Sorry, incorrect passcode."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "This will be your last attempt."

287

288#: qml/Shell.qml:310

289msgid ""

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

291"reset and all personal data will be deleted."

292msgstr ""

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

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

293

295

294#: qml/Shell.qml:311

296#: qml/Shell.qml:311

295msgid ""

297msgid ""

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

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

297"and all personal data will be deleted."

299"and all personal data will be deleted."

298msgstr ""

300msgstr ""

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

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

po/es.po+30−26

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-06 15:24+0000\n"

11+"PO-Revision-Date: 2014-08-17 04:37+0000\n"

12−"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"

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

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

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Contraseña: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "Desanclar"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "¿Está seguro de que quiere apagarlo?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Apagar"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Reiniciar"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Cancelar"

48

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

50msgid "Skip intro"

@@ -99,11 +99,11 @@ msgstr ""

99

100#: qml/Components/Lockscreen.qml:161

101msgid "Too many incorrect attempts"

102−msgstr ""

102+msgstr "Demasiados intentos incorrectos"

103

104#: qml/Components/Lockscreen.qml:163

105msgid "Please wait"

106−msgstr ""

106+msgstr "Espere un momento"

107

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

109msgid "Emergency Call"

@@ -136,7 +136,7 @@ msgstr "Ver menos"

136

137#: qml/Dash/GenericScopeView.qml:360

138msgid "See all"

139−msgstr "Ver todas"

139+msgstr "Ver todo"

140

141#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

142msgid "Search"

@@ -164,23 +164,23 @@ msgstr "Enviar"

164

165#: qml/Dash/ScopesOverview.qml:201

166msgid "Manage Dash"

167−msgstr ""

167+msgstr "Gestionar tablero"

168

169#: qml/Dash/ScopesOverview.qml:408

170msgid "Done"

171−msgstr ""

171+msgstr "Hecho"

172

173#: qml/Dash/ScopesOverview.qml:434

174msgid "Store"

175−msgstr ""

175+msgstr "Tienda"

176

177#: qml/Dash/ScopesOverviewTab.qml:36

178msgid "Favorites"

179−msgstr ""

179+msgstr "Favoritos"

180

181#: qml/Dash/ScopesOverviewTab.qml:54

182msgid "All"

183−msgstr ""

183+msgstr "Todo"

184

185#: qml/Greeter/Greeter.qml:157

186msgid "Swipe to unlock"

@@ -248,54 +248,58 @@ msgstr "Falló, toque para reintentar"

248

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

250msgid "Unlock SIM"

251−msgstr ""

251+msgstr "Desbloquear SIM"

252

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

254msgid "Roaming"

255−msgstr ""

255+msgstr "Itinerancia"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "frase de paso"

260

261#: qml/Shell.qml:267

262msgid "passcode"

263−msgstr ""

263+msgstr "Código de paso"

264

265#: qml/Shell.qml:269

266#, qt-format

267msgid "Enter your %1"

268−msgstr ""

268+msgstr "Introduzca su %1"

269

270#: qml/Shell.qml:270

271#, qt-format

272msgid "Incorrect %1"

273−msgstr ""

273+msgstr "%1 incorrecta"

274

275#: qml/Shell.qml:272

276msgid "Please re-enter"

277−msgstr ""

277+msgstr "Vuelva a introducirla"

278

279#: qml/Shell.qml:306

280msgid "Sorry, incorrect passphrase."

281−msgstr ""

281+msgstr "Frase de paso incorrecta"

282

283#: qml/Shell.qml:307

284msgid "Sorry, incorrect passcode."

285−msgstr ""

285+msgstr "Código de paso incorrecto"

286

287#: qml/Shell.qml:308

288msgid "This will be your last attempt."

289−msgstr ""

289+msgstr "Este será su último intento."

290

291#: qml/Shell.qml:310

292msgid ""

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

294"reset and all personal data will be deleted."

295msgstr ""

296+"Si se introduce la frase incorrectamente, el teléfono volverá a la "

297+"configuración de fábrica y se perderán todos los datos personales."

296

298

297#: qml/Shell.qml:311

299#: qml/Shell.qml:311

298msgid ""

300msgid ""

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

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

300"and all personal data will be deleted."

302"and all personal data will be deleted."

301msgstr ""

303msgstr ""

304+"Si se introduce el código incorrectamente, el teléfono volverá a la "

305+"configuración de fábrica y se perderán todos los datos personales."

po/fa.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 13:40+0000\n"

11+"PO-Revision-Date: 2014-08-15 14:00+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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "گذرواژه: "

23

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

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

@@ -96,11 +96,11 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "تلاش‌های ناموفّق زیاد"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "لطفاً صبر کنید"

104

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

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ msgstr "رومینگ"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

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

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

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

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "%1 خود را وارد کنید"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "%1 نادرست"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "لطفاً دوباره وارد کنید"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "متأسّفیم، عبارت‌عبور نادرست است."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "متأسّفیم، رمزعبور نادرست است."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "این آخرین تلاش شما خواهد بود."

287

288#: qml/Shell.qml:310

289msgid ""

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

291"reset and all personal data will be deleted."

292msgstr ""

293+"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

294+"اطّلاعات شخصی حذف خواهند شد."

293

295

294#: qml/Shell.qml:311

296#: qml/Shell.qml:311

295msgid ""

297msgid ""

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

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

297"and all personal data will be deleted."

299"and all personal data will be deleted."

298msgstr ""

300msgstr ""

301+"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

302+"اطّلاعات شخصی حذف خواهند شد."

po/fi.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 06:38+0000\n"

11+"PO-Revision-Date: 2014-08-17 16:53+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Salasana: "

23

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

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

@@ -96,11 +96,11 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "Liian monta virheellistä yritystä"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "Odota hetki"

104

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

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ msgstr "Verkkovierailu"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "tunnuslause"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "tunnuskoodi"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "Anna %1"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "Virheellinen %1"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "Anna uudelleen"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "Virheellinen tunnuslause."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "Virheellinen tunnuskoodi."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "Tämä on viimeinen yritys."

287

288#: qml/Shell.qml:310

289msgid ""

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

291"reset and all personal data will be deleted."

292msgstr ""

293+"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

294+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

293

295

294#: qml/Shell.qml:311

296#: qml/Shell.qml:311

295msgid ""

297msgid ""

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

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

297"and all personal data will be deleted."

299"and all personal data will be deleted."

298msgstr ""

300msgstr ""

301+"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "

302+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

po/fr.po+25−19

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 18:47+0000\n"

11+"PO-Revision-Date: 2014-08-16 12:13+0000\n"

12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"

12+"Last-Translator: Jean Marc <Unknown>\n"

13"Language-Team: French <fr@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Mot de passe : "

23

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

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

@@ -103,11 +103,11 @@ msgstr ""

103

104#: qml/Components/Lockscreen.qml:161

105msgid "Too many incorrect attempts"

106−msgstr ""

106+msgstr "Trop de tentatives incorrectes"

107

108#: qml/Components/Lockscreen.qml:163

109msgid "Please wait"

110−msgstr ""

110+msgstr "Veuillez patienter"

111

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

113msgid "Emergency Call"

@@ -156,7 +156,7 @@ msgstr "Moins..."

156

157#: qml/Dash/Previews/PreviewRatingInput.qml:81

158msgid "Rate this"

159−msgstr "Evaluez ceci"

159+msgstr "Évaluez ceci"

160

161#: qml/Dash/Previews/PreviewRatingInput.qml:126

162msgid "Add a review"

@@ -172,7 +172,7 @@ msgstr "Gérer le tableau de bord"

172

173#: qml/Dash/ScopesOverview.qml:408

174msgid "Done"

175−msgstr ""

175+msgstr "Terminé"

176

177#: qml/Dash/ScopesOverview.qml:434

178msgid "Store"

@@ -180,11 +180,11 @@ msgstr ""

180

181#: qml/Dash/ScopesOverviewTab.qml:36

182msgid "Favorites"

183−msgstr ""

183+msgstr "Favorites"

184

185#: qml/Dash/ScopesOverviewTab.qml:54

186msgid "All"

187−msgstr ""

187+msgstr "Toutes"

188

189#: qml/Greeter/Greeter.qml:157

190msgid "Swipe to unlock"

@@ -256,50 +256,56 @@ msgstr "Déverrouiller la carte SIM"

256

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

258msgid "Roaming"

259−msgstr ""

259+msgstr "Roaming"

260

261#: qml/Shell.qml:267

262msgid "passphrase"

263−msgstr ""

263+msgstr "phrase secrète"

264

265#: qml/Shell.qml:267

266msgid "passcode"

267−msgstr ""

267+msgstr "code"

268

269#: qml/Shell.qml:269

270#, qt-format

271msgid "Enter your %1"

272−msgstr ""

272+msgstr "Saisissez votre %1"

273

274#: qml/Shell.qml:270

275#, qt-format

276msgid "Incorrect %1"

277−msgstr ""

277+msgstr "%1 non valide"

278

279#: qml/Shell.qml:272

280msgid "Please re-enter"

281−msgstr ""

281+msgstr "Veuillez recommencer"

282

283#: qml/Shell.qml:306

284msgid "Sorry, incorrect passphrase."

285−msgstr ""

285+msgstr "Désolé, phrase secrète incorrecte."

286

287#: qml/Shell.qml:307

288msgid "Sorry, incorrect passcode."

289−msgstr ""

289+msgstr "Désolé, code incorrect."

290

291#: qml/Shell.qml:308

292msgid "This will be your last attempt."

293−msgstr ""

293+msgstr "Ceci sera votre dernière tentative."

294

295#: qml/Shell.qml:310

296msgid ""

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

298"reset and all personal data will be deleted."

299msgstr ""

300+"Si la phrase secrète est saisie de manière incorrecte, votre téléphone "

301+"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

302+"personnelles seront supprimées."

300

303

301#: qml/Shell.qml:311

304#: qml/Shell.qml:311

302msgid ""

305msgid ""

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

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

304"and all personal data will be deleted."

307"and all personal data will be deleted."

305msgstr ""

308msgstr ""

309+"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "

310+"réinitialisation aux paramètres d'usine et toutes les données personnelles "

311+"seront supprimées."

po/hu.po+41−37

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-06 07:41+0000\n"

11+"PO-Revision-Date: 2014-08-19 07:08+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Jelszó: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "Indító feloldása"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Biztos benne, hogy ki szeretné kapcsolni?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Kikapcsolás"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Újraindítás"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Mégse"

48

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

50msgid "Skip intro"

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Túl sok sikertelen kísérlet"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Kérem várjon"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Vészhívás"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "Ok"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Üdv %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Üdvözöljük"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "MÉGSE"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "KÉSZ"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Kevesebb"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Összes megtekintése"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Keresés"

143

@@ -161,25 +161,25 @@ msgstr "Értékelés hozzáadása"

161msgid "Send"

162msgstr "Küldés"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Dash kezelése"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Kész"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174−msgstr ""

174+msgstr "Áruház"

175

176#: qml/Dash/ScopesOverviewTab.qml:36

177msgid "Favorites"

178−msgstr ""

178+msgstr "Kedvencek"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Összes"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -247,54 +247,58 @@ msgstr "Sikertelen, koppintson az újrapróbáláshoz"

247

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

249msgid "Unlock SIM"

250−msgstr ""

250+msgstr "SIM feloldása"

251

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

253msgid "Roaming"

254−msgstr ""

254+msgstr "Barangolás"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "jelmondat"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "jelkód"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Adja meg a következőt: %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "Helytelen %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Kérjük adja meg újra"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Sajnáljuk, helytelen jelmondat."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Sajnáljuk, helytelen jelkód."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "Ez az utolsó próbálkozási lehetősége."

289

290#: qml/Shell.qml:310

291msgid ""

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

293"reset and all personal data will be deleted."

294msgstr ""

295+"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

296+"beállításokat és törli minden személyes adatát."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

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

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

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

303+"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

304+"beállításokat és törli minden személyes adatát."

po/ja.po+53−52

@@ -8,43 +8,43 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 07:14+0000\n"

11+"PO-Revision-Date: 2014-08-18 15:03+0000\n"

12−"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"

12+"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"

13"Language-Team: Japanese <ja@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "パスワード： "

23

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

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

26msgid "Pin shortcut"

27−msgstr ""

27+msgstr "ショートカットを追加する"

28

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

30msgid "Unpin shortcut"

31−msgstr ""

31+msgstr "ショートカットを削除する"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "本当に電源を切りますか？"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "電源を切る"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "再起動"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "キャンセル"

48

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

50msgid "Skip intro"

@@ -56,7 +56,7 @@ msgstr "右端"

56

57#: qml/Components/EdgeDemo.qml:113

58msgid "Try swiping from the right edge to unlock the phone"

59−msgstr ""

59+msgstr "アンロックするには右端からスワイプしてみてください"

60

61#: qml/Components/EdgeDemo.qml:144

62msgid "Top edge"

@@ -91,63 +91,64 @@ msgid ""

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

92"phone<br><br>Tap on the screen to start"

93msgstr ""

94+"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"

94

95

95#: qml/Components/Lockscreen.qml:161

96#: qml/Components/Lockscreen.qml:161

96msgid "Too many incorrect attempts"

97msgid "Too many incorrect attempts"

97−msgstr ""

98+msgstr "失敗回数が上限に達しました"

98

99

99#: qml/Components/Lockscreen.qml:163

100#: qml/Components/Lockscreen.qml:163

100msgid "Please wait"

101msgid "Please wait"

101−msgstr ""

102+msgstr "お待ちください"

102

103

103−#: qml/Components/Lockscreen.qml:245

104+#: qml/Components/Lockscreen.qml:220

104msgid "Emergency Call"

105msgid "Emergency Call"

105msgstr "緊急通報"

106msgstr "緊急通報"

106

107

107−#: qml/Components/Lockscreen.qml:268

108+#: qml/Components/Lockscreen.qml:243

108msgid "OK"

109msgid "OK"

109msgstr "OK"

110msgstr "OK"

110

111

111−#: qml/Components/PassphraseLockscreen.qml:61

112+#: qml/Components/PassphraseLockscreen.qml:62

112#, qt-format

113#, qt-format

113msgid "Hello %1"

114msgid "Hello %1"

114msgstr "こんにちは %1 さん"

115msgstr "こんにちは %1 さん"

115

116

116−#: qml/Components/PassphraseLockscreen.qml:61

117+#: qml/Components/PassphraseLockscreen.qml:62

117msgid "Hello"

118msgid "Hello"

118msgstr "こんにちは"

119msgstr "こんにちは"

119

120

120−#: qml/Components/PinLockscreen.qml:197

121+#: qml/Components/PinLockscreen.qml:198

121msgid "CANCEL"

122msgid "CANCEL"

122−msgstr ""

123+msgstr "キャンセル"

123

124

124−#: qml/Components/PinLockscreen.qml:215

125+#: qml/Components/PinLockscreen.qml:216

125msgid "DONE"

126msgid "DONE"

126−msgstr ""

127+msgstr "完了"

127

128

128−#: qml/Dash/GenericScopeView.qml:360

129+#: qml/Dash/GenericScopeView.qml:358

129msgid "See less"

130msgid "See less"

130msgstr ""

131msgstr ""

131

132

132−#: qml/Dash/GenericScopeView.qml:360

133+#: qml/Dash/GenericScopeView.qml:358

133msgid "See all"

134msgid "See all"

134−msgstr ""

135+msgstr "すべて表示する"

135

136

136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

137+#: qml/Panel/SearchIndicator.qml:27

137msgid "Search"

138msgid "Search"

138msgstr "検索"

139msgstr "検索"

139

140

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

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

141msgid "More..."

142msgid "More..."

142−msgstr ""

143+msgstr "さらに ..."

143

144

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

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

145msgid "Less..."

146msgid "Less..."

146−msgstr ""

147+msgstr "隠す..."

147

148

148#: qml/Dash/Previews/PreviewRatingInput.qml:81

149#: qml/Dash/Previews/PreviewRatingInput.qml:81

149msgid "Rate this"

150msgid "Rate this"

150−msgstr ""

151+msgstr "評価する"

151

152

152#: qml/Dash/Previews/PreviewRatingInput.qml:126

153#: qml/Dash/Previews/PreviewRatingInput.qml:126

153msgid "Add a review"

154msgid "Add a review"

@@ -157,21 +158,21 @@ msgstr "レビューを追加"

157msgid "Send"

158msgid "Send"

158msgstr "送信"

159msgstr "送信"

159

160

160−#: qml/Dash/ScopesOverview.qml:201

161+#: qml/Dash/ScopesOverview.qml:200

161msgid "Manage Dash"

162msgid "Manage Dash"

162−msgstr ""

163+msgstr "Dashの管理"

163

164

164−#: qml/Dash/ScopesOverview.qml:408

165+#: qml/Dash/ScopesOverview.qml:405

165msgid "Done"

166msgid "Done"

166−msgstr ""

167+msgstr "完了"

167

168

168−#: qml/Dash/ScopesOverview.qml:434

169+#: qml/Dash/ScopesOverview.qml:431

169msgid "Store"

170msgid "Store"

170−msgstr ""

171+msgstr "保存"

171

172

172#: qml/Dash/ScopesOverviewTab.qml:36

173#: qml/Dash/ScopesOverviewTab.qml:36

173msgid "Favorites"

174msgid "Favorites"

174−msgstr ""

175+msgstr "お気に入り"

175

176

176#: qml/Dash/ScopesOverviewTab.qml:54

177#: qml/Dash/ScopesOverviewTab.qml:54

177msgid "All"

178msgid "All"

@@ -179,7 +180,7 @@ msgstr "すべて"

179

180

180#: qml/Greeter/Greeter.qml:157

181#: qml/Greeter/Greeter.qml:157

181msgid "Swipe to unlock"

182msgid "Swipe to unlock"

182−msgstr ""

183+msgstr "スワイプしてロック解除"

183

184

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

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

185msgid "Confirm"

186msgid "Confirm"

@@ -187,7 +188,7 @@ msgstr "確認"

187

188

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

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

189msgid "Type or say a command"

190msgid "Type or say a command"

190−msgstr ""

191+msgstr "コマンドを音声かキーボードから入力"

191

192

192#: qml/Hud/Hud.qml:84

193#: qml/Hud/Hud.qml:84

193msgid "Loading. Please Wait..."

194msgid "Loading. Please Wait..."

@@ -207,11 +208,11 @@ msgstr "パスワードを表示"

207

208

208#: qml/Notifications/NotificationMenuItemFactory.qml:115

209#: qml/Notifications/NotificationMenuItemFactory.qml:115

209msgid "Please enter SIM PIN"

210msgid "Please enter SIM PIN"

210−msgstr ""

211+msgstr "SIM PINを入力してください"

211

212

212#: qml/Panel/ActiveCallHint.qml:77

213#: qml/Panel/ActiveCallHint.qml:77

213msgid "Tap to return to call..."

214msgid "Tap to return to call..."

214−msgstr ""

215+msgstr "タップすると通話に戻ります..."

215

216

216#: qml/Panel/ActiveCallHint.qml:90

217#: qml/Panel/ActiveCallHint.qml:90

217msgid "Conference"

218msgid "Conference"

@@ -223,11 +224,11 @@ msgstr ""

223

224

224#: qml/Panel/Indicators/MenuItemFactory.qml:655

225#: qml/Panel/Indicators/MenuItemFactory.qml:655

225msgid "Downloading"

226msgid "Downloading"

226−msgstr ""

227+msgstr "ダウンロード中"

227

228

228#: qml/Panel/Indicators/MenuItemFactory.qml:657

229#: qml/Panel/Indicators/MenuItemFactory.qml:657

229msgid "Paused, tap to resume"

230msgid "Paused, tap to resume"

230−msgstr ""

231+msgstr "停止中、再開するにはタップしてください"

231

232

232#: qml/Panel/Indicators/MenuItemFactory.qml:659

233#: qml/Panel/Indicators/MenuItemFactory.qml:659

233msgid "Canceled"

234msgid "Canceled"

@@ -239,49 +240,49 @@ msgstr ""

239

240

240#: qml/Panel/Indicators/MenuItemFactory.qml:663

241#: qml/Panel/Indicators/MenuItemFactory.qml:663

241msgid "Failed, tap to retry"

242msgid "Failed, tap to retry"

242−msgstr ""

243+msgstr "失敗しました、再試行するにはタップしてください"

243

244

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

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

245msgid "Unlock SIM"

246msgid "Unlock SIM"

246−msgstr ""

247+msgstr "SIMのアンロック"

247

248

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

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

249msgid "Roaming"

250msgid "Roaming"

250−msgstr ""

251+msgstr "ローミング"

251

252

252#: qml/Shell.qml:267

253#: qml/Shell.qml:267

253msgid "passphrase"

254msgid "passphrase"

254−msgstr ""

255+msgstr "パスフレーズ"

255

256

256#: qml/Shell.qml:267

257#: qml/Shell.qml:267

257msgid "passcode"

258msgid "passcode"

258−msgstr ""

259+msgstr "パスコード"

259

260

260#: qml/Shell.qml:269

261#: qml/Shell.qml:269

261#, qt-format

262#, qt-format

262msgid "Enter your %1"

263msgid "Enter your %1"

263−msgstr ""

264+msgstr "%1を入力してください"

264

265

265#: qml/Shell.qml:270

266#: qml/Shell.qml:270

266#, qt-format

267#, qt-format

267msgid "Incorrect %1"

268msgid "Incorrect %1"

268−msgstr ""

269+msgstr "%1が間違っています"

269

270

270#: qml/Shell.qml:272

271#: qml/Shell.qml:272

271msgid "Please re-enter"

272msgid "Please re-enter"

272−msgstr ""

273+msgstr "再入力してください"

273

274

274#: qml/Shell.qml:306

275#: qml/Shell.qml:306

275msgid "Sorry, incorrect passphrase."

276msgid "Sorry, incorrect passphrase."

276−msgstr ""

277+msgstr "パスフレーズが間違っています。"

277

278

278#: qml/Shell.qml:307

279#: qml/Shell.qml:307

279msgid "Sorry, incorrect passcode."

280msgid "Sorry, incorrect passcode."

280−msgstr ""

281+msgstr "パスコードが間違っています。"

281

282

282#: qml/Shell.qml:308

283#: qml/Shell.qml:308

283msgid "This will be your last attempt."

284msgid "This will be your last attempt."

284−msgstr ""

285+msgstr "これが最後のチャンスです。"

285

286

286#: qml/Shell.qml:310

287#: qml/Shell.qml:310

287msgid ""

288msgid ""

po/km.po+32−26

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 04:57+0000\n"

11+"PO-Revision-Date: 2014-08-20 02:48+0000\n"

12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"

13"Language-Team: Khmer <km@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "ពាក្យសម្ងាត់៖ "

23

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

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

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "បានព្យាយាមខុសច្រើនដងពេក"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "សូមរង់ចាំ"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "ការហៅពេលអាសន្ន"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "យល់ព្រម"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "សួស្ដី %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "សួស្តី"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "បោះបង់"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "រួចរាល់"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "មើលតិចជាង"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "មើលទាំងអស់"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "ស្វែងរក"

143

@@ -161,15 +161,15 @@ msgstr "បន្ថែមការពិនិត្យ"

161msgid "Send"

162msgstr "ផ្ញើ"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166msgstr "គ្រប់គ្រងផ្ទាំង"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170msgstr "ធ្វើរួច"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr "រក្សាទុក"

175

@@ -255,46 +255,52 @@ msgstr "រ៉ូមីង"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

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

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "កូដសម្ងាត់"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "បញ្ចូល %1 របស់អ្នក"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "មិនត្រឹមត្រូវ %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "សូមបញ្ចូលឡើងវិញ"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ។"

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ។"

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "នេះគឺការព្យាយាមលើកចុងក្រោយ។"

289

290#: qml/Shell.qml:310

291msgid ""

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

293"reset and all personal data will be deleted."

294msgstr ""

295+"បើបញ្ចូលឃ្លាសម្ងាត់មិនត្រឹមត្រូវ "

296+"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

297+"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

295

298

296#: qml/Shell.qml:311

299#: qml/Shell.qml:311

297msgid ""

300msgid ""

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

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

299"and all personal data will be deleted."

302"and all personal data will be deleted."

300msgstr ""

303msgstr ""

304+"បើបញ្ចូលកូដសម្ងាត់មិនត្រឹមត្រូវ "

305+"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

306+"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

po/ko.po+42−40

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-07-17 03:56+0000\n"

11+"PO-Revision-Date: 2014-08-19 13:02+0000\n"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "열쇠글: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "바로가기를 고정 해제하기"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "정말로 전원을 끌까요?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "전원 끄기"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "재시작"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "취소"

48

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

50msgid "Skip intro"

@@ -96,46 +96,46 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "너무 많이 틀리셨습니다"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "기다려주십시오"

104

105−#: qml/Components/Lockscreen.qml:245

105+#: qml/Components/Lockscreen.qml:220

106msgid "Emergency Call"

107msgstr "긴급 통화"

108

109−#: qml/Components/Lockscreen.qml:268

109+#: qml/Components/Lockscreen.qml:243

110msgid "OK"

111msgstr "확인"

112

113−#: qml/Components/PassphraseLockscreen.qml:61

113+#: qml/Components/PassphraseLockscreen.qml:62

114#, qt-format

115msgid "Hello %1"

116msgstr "안녕하세요 %1"

117

118−#: qml/Components/PassphraseLockscreen.qml:61

118+#: qml/Components/PassphraseLockscreen.qml:62

119msgid "Hello"

120msgstr "안녕하세요"

121

122−#: qml/Components/PinLockscreen.qml:197

122+#: qml/Components/PinLockscreen.qml:198

123msgid "CANCEL"

124msgstr "취소"

125

126−#: qml/Components/PinLockscreen.qml:215

126+#: qml/Components/PinLockscreen.qml:216

127msgid "DONE"

128msgstr "완료"

129

130−#: qml/Dash/GenericScopeView.qml:360

130+#: qml/Dash/GenericScopeView.qml:358

131msgid "See less"

132msgstr "간단히 표시하기"

133

134−#: qml/Dash/GenericScopeView.qml:360

134+#: qml/Dash/GenericScopeView.qml:358

135msgid "See all"

136−msgstr ""

136+msgstr "모두 보기"

137

138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

138+#: qml/Panel/SearchIndicator.qml:27

139msgid "Search"

140msgstr "검색"

141

@@ -159,25 +159,25 @@ msgstr "평가 제출하기"

159msgid "Send"

160msgstr "보내기"

161

162−#: qml/Dash/ScopesOverview.qml:201

162+#: qml/Dash/ScopesOverview.qml:200

163msgid "Manage Dash"

164−msgstr ""

164+msgstr "대시 관리"

165

166−#: qml/Dash/ScopesOverview.qml:408

166+#: qml/Dash/ScopesOverview.qml:405

167msgid "Done"

168−msgstr ""

168+msgstr "완료"

169

170−#: qml/Dash/ScopesOverview.qml:434

170+#: qml/Dash/ScopesOverview.qml:431

171msgid "Store"

172−msgstr ""

172+msgstr "장터"

173

174#: qml/Dash/ScopesOverviewTab.qml:36

175msgid "Favorites"

176−msgstr ""

176+msgstr "즐겨찾기"

177

178#: qml/Dash/ScopesOverviewTab.qml:54

179msgid "All"

180−msgstr ""

180+msgstr "모두"

181

182#: qml/Greeter/Greeter.qml:157

183msgid "Swipe to unlock"

@@ -213,11 +213,11 @@ msgstr "심카드의 PIN 번호를 입력하세요."

213

214#: qml/Panel/ActiveCallHint.qml:77

215msgid "Tap to return to call..."

216−msgstr ""

216+msgstr "통화로 돌아가려면 터치하세요..."

217

218#: qml/Panel/ActiveCallHint.qml:90

219msgid "Conference"

220−msgstr ""

220+msgstr "회의"

221

222#: qml/Panel/Indicators/MenuItemFactory.qml:651

223msgid "In queue…"

@@ -245,54 +245,56 @@ msgstr "실패하였습니다. 재시도하려면 누르세요."

245

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

247msgid "Unlock SIM"

248−msgstr ""

248+msgstr "SIM 카드 보안 해제"

249

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

251msgid "Roaming"

252−msgstr ""

252+msgstr "로밍"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "비밀번호"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "비밀번호"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "%1를 입력하세요"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "잘못된 %1입니다"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "다시 입력하세요"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "잘못된 비밀번호입니다."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "잘못된 비밀번호입니다."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "마지막 시도입니다."

287

288#: qml/Shell.qml:310

289msgid ""

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

291"reset and all personal data will be deleted."

292msgstr ""

293+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."

293

294

294#: qml/Shell.qml:311

295#: qml/Shell.qml:311

295msgid ""

296msgid ""

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

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

297"and all personal data will be deleted."

298"and all personal data will be deleted."

298msgstr ""

299msgstr ""

300+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."

po/pl.po+20−20

@@ -8,13 +8,13 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-07-31 13:51+0000\n"

11+"PO-Revision-Date: 2014-08-18 20:25+0000\n"

12−"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"

12+"Last-Translator: Paweł Stroka <pawstr@gmail.com>\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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

@@ -104,40 +104,40 @@ msgstr ""

104msgid "Please wait"

105msgstr ""

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Telefon ratunkowy"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "OK"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Witaj %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Witaj"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "ANULUJ"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "ZROBIONE"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Zobacz mniej"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Zobacz wszystko"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Szukaj"

143

@@ -161,15 +161,15 @@ msgstr "Dodaj recenzję"

161msgid "Send"

162msgstr "Wyślij"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166msgstr ""

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170msgstr ""

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr ""

175

@@ -255,11 +255,11 @@ msgstr ""

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "hasło"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "kod"

263

264#: qml/Shell.qml:269

265#, qt-format

@@ -273,15 +273,15 @@ msgstr ""

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Proszę wprowadzić ponownie"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Niestety, błędne hasło"

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Niestety, błędny kod"

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

po/pt.po+13−11

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 23:56+0000\n"

11+"PO-Revision-Date: 2014-08-17 20:27+0000\n"

12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Senha: "

23

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

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

@@ -97,11 +97,11 @@ msgstr ""

97

98#: qml/Components/Lockscreen.qml:161

99msgid "Too many incorrect attempts"

100−msgstr ""

100+msgstr "Demasiadas tentativas incorrectas"

101

102#: qml/Components/Lockscreen.qml:163

103msgid "Please wait"

104−msgstr ""

104+msgstr "Por favor aguarde"

105

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

107msgid "Emergency Call"

@@ -254,7 +254,7 @@ msgstr "Roaming"

254

255#: qml/Shell.qml:267

256msgid "passphrase"

257−msgstr ""

257+msgstr "frase de acesso"

258

259#: qml/Shell.qml:267

260msgid "passcode"

@@ -263,20 +263,20 @@ msgstr ""

263#: qml/Shell.qml:269

264#, qt-format

265msgid "Enter your %1"

266−msgstr ""

266+msgstr "Introduza o seu %1"

267

268#: qml/Shell.qml:270

269#, qt-format

270msgid "Incorrect %1"

271−msgstr ""

271+msgstr "Incorreto %1"

272

273#: qml/Shell.qml:272

274msgid "Please re-enter"

275−msgstr ""

275+msgstr "Por favor, volte a reintroduzir"

276

277#: qml/Shell.qml:306

278msgid "Sorry, incorrect passphrase."

279−msgstr ""

279+msgstr "Desculpe, frase de acesso incorreta."

280

281#: qml/Shell.qml:307

282msgid "Sorry, incorrect passcode."

@@ -284,13 +284,15 @@ msgstr ""

284

285#: qml/Shell.qml:308

286msgid "This will be your last attempt."

287−msgstr ""

287+msgstr "Esta será a sua última tentativa."

288

289#: qml/Shell.qml:310

290msgid ""

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

292"reset and all personal data will be deleted."

293msgstr ""

294+"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "

295+"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."

294

296

295#: qml/Shell.qml:311

297#: qml/Shell.qml:311

296msgid ""

298msgid ""

po/pt_BR.po+33−29

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 04:53+0000\n"

11+"PO-Revision-Date: 2014-08-18 14:14+0000\n"

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

12+"Last-Translator: Rafael Neri <Unknown>\n"

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

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Senha: "

23

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

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

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Muitas tentativas incorretas"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Por favor, aguarde"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Chamada de emergência"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "OK"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Olá %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Olá"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "CANCELAR"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "FEITO"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Ver menos"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Ver todos"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Pesquisar"

143

@@ -161,15 +161,15 @@ msgstr "Adicionar uma análise"

161msgid "Send"

162msgstr "Enviar"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Gerencia painel"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Concluído"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr "Loja"

175

@@ -179,7 +179,7 @@ msgstr "Favoritos"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Tudo"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -255,46 +255,50 @@ msgstr "Roaming"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "senha"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "código de acesso"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Digite o seu %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "%1 incorreto"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Por favor, digite novamente"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Desculpe, senha incorreta."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Desculpe, código de acesso incorreto."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "Esta será a sua última tentativa."

289

290#: qml/Shell.qml:310

291msgid ""

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

293"reset and all personal data will be deleted."

294msgstr ""

295+"Se a senha for digitada incorretamente, o telefone será restaurado aos "

296+"padrões de fábrica e todos os dados pessoais serão apagados."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

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

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

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

303+"Se o código de acesso for digitado incorretamente, o telefone será "

304+"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."

po/ru.po+39−35

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-07-31 09:39+0000\n"

11+"PO-Revision-Date: 2014-08-20 12:41+0000\n"

12"Last-Translator: Jay ZDLin <Unknown>\n"

13"Language-Team: Russian <ru@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Пароль: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "Изъять ярлык"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Отключить питание?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Отключить"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Перезапустить"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Отменить"

48

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

50msgid "Skip intro"

@@ -101,46 +101,46 @@ msgstr ""

101

102#: qml/Components/Lockscreen.qml:161

103msgid "Too many incorrect attempts"

104−msgstr ""

104+msgstr "Слишком много ошибок ввода"

105

106#: qml/Components/Lockscreen.qml:163

107msgid "Please wait"

108−msgstr ""

108+msgstr "Подождите"

109

110−#: qml/Components/Lockscreen.qml:245

110+#: qml/Components/Lockscreen.qml:220

111msgid "Emergency Call"

112msgstr "Экстренный вызов"

113

114−#: qml/Components/Lockscreen.qml:268

114+#: qml/Components/Lockscreen.qml:243

115msgid "OK"

116msgstr "ОК"

117

118−#: qml/Components/PassphraseLockscreen.qml:61

118+#: qml/Components/PassphraseLockscreen.qml:62

119#, qt-format

120msgid "Hello %1"

121msgstr "Привет, %1"

122

123−#: qml/Components/PassphraseLockscreen.qml:61

123+#: qml/Components/PassphraseLockscreen.qml:62

124msgid "Hello"

125msgstr "Привет"

126

127−#: qml/Components/PinLockscreen.qml:197

127+#: qml/Components/PinLockscreen.qml:198

128msgid "CANCEL"

129msgstr "ОТМЕНИТЬ"

130

131−#: qml/Components/PinLockscreen.qml:215

131+#: qml/Components/PinLockscreen.qml:216

132msgid "DONE"

133msgstr "ГОТОВО"

134

135−#: qml/Dash/GenericScopeView.qml:360

135+#: qml/Dash/GenericScopeView.qml:358

136msgid "See less"

137msgstr "Вкратце"

138

139−#: qml/Dash/GenericScopeView.qml:360

139+#: qml/Dash/GenericScopeView.qml:358

140msgid "See all"

141msgstr "Показать всё"

142

143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

143+#: qml/Panel/SearchIndicator.qml:27

144msgid "Search"

145msgstr "Поиск"

146

@@ -164,25 +164,25 @@ msgstr "Добавьте отзыв"

164msgid "Send"

165msgstr "Отправить"

166

167−#: qml/Dash/ScopesOverview.qml:201

167+#: qml/Dash/ScopesOverview.qml:200

168msgid "Manage Dash"

169msgstr ""

170

171−#: qml/Dash/ScopesOverview.qml:408

171+#: qml/Dash/ScopesOverview.qml:405

172msgid "Done"

173−msgstr ""

173+msgstr "Готово"

174

175−#: qml/Dash/ScopesOverview.qml:434

175+#: qml/Dash/ScopesOverview.qml:431

176msgid "Store"

177msgstr ""

178

179#: qml/Dash/ScopesOverviewTab.qml:36

180msgid "Favorites"

181−msgstr ""

181+msgstr "Избранное"

182

183#: qml/Dash/ScopesOverviewTab.qml:54

184msgid "All"

185−msgstr ""

185+msgstr "Все"

186

187#: qml/Greeter/Greeter.qml:157

188msgid "Swipe to unlock"

@@ -250,54 +250,58 @@ msgstr "Сбой, коснитесь для повтора"

250

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

252msgid "Unlock SIM"

253−msgstr ""

253+msgstr "Разблокировать SIM-карту"

254

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

256msgid "Roaming"

257−msgstr ""

257+msgstr "Роуминг"

258

259#: qml/Shell.qml:267

260msgid "passphrase"

261−msgstr ""

261+msgstr "ключевая фраза"

262

263#: qml/Shell.qml:267

264msgid "passcode"

265−msgstr ""

265+msgstr "секретный код"

266

267#: qml/Shell.qml:269

268#, qt-format

269msgid "Enter your %1"

270−msgstr ""

270+msgstr "Введите %1"

271

272#: qml/Shell.qml:270

273#, qt-format

274msgid "Incorrect %1"

275−msgstr ""

275+msgstr "Некорректно введён %1"

276

277#: qml/Shell.qml:272

278msgid "Please re-enter"

279−msgstr ""

279+msgstr "Повторите ввод"

280

281#: qml/Shell.qml:306

282msgid "Sorry, incorrect passphrase."

283−msgstr ""

283+msgstr "Неверная ключевая фраза."

284

285#: qml/Shell.qml:307

286msgid "Sorry, incorrect passcode."

287−msgstr ""

287+msgstr "Неверный секретный код."

288

289#: qml/Shell.qml:308

290msgid "This will be your last attempt."

291−msgstr ""

291+msgstr "Осталась последняя попытка."

292

293#: qml/Shell.qml:310

294msgid ""

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

296"reset and all personal data will be deleted."

297msgstr ""

298+"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "

299+"настройкам, а все личные данные будут удалены."

298

300

299#: qml/Shell.qml:311

301#: qml/Shell.qml:311

300msgid ""

302msgid ""

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

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

302"and all personal data will be deleted."

304"and all personal data will be deleted."

303msgstr ""

305msgstr ""

306+"Если секретный код будет введен неверно, то телефон вернётся к заводским "

307+"настройкам, а все личные данные будут удалены."

po/sl.po+41−37

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-06 06:11+0000\n"

11+"PO-Revision-Date: 2014-08-19 12:54+0000\n"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Geslo: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "Odpni bližnjico"

32

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

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Ali ste prepričani, da želite izklopiti?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Izklopi"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Ponovno zaženi"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Prekliči"

48

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

50msgid "Skip intro"

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Preveč nepravilnih poskusov"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Počakajte"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Klic v sili"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "V REDU"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Pozdravljeni, %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Pozdravljeni"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "PREKLIČI"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "KONČANO"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Pokaži manj"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Ogled vsega"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Iskanje"

143

@@ -161,25 +161,25 @@ msgstr "Dodaj oceno"

161msgid "Send"

162msgstr "Pošlji"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Upravljaj s pregledno ploščo"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Končano"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174−msgstr ""

174+msgstr "Trgovina"

175

176#: qml/Dash/ScopesOverviewTab.qml:36

177msgid "Favorites"

178−msgstr ""

178+msgstr "Priljubljeni"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Vse"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -247,54 +247,58 @@ msgstr "Spodletelo, tapnite za ponovni poskus"

247

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

249msgid "Unlock SIM"

250−msgstr ""

250+msgstr "Odkleni SIM"

251

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

253msgid "Roaming"

254−msgstr ""

254+msgstr "Gostovanje"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "šifrirno reklo"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "geslo"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Vnesite vaš %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "Nepravilen %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Ponovno vnesite"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Nepravilno geslo."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Nepravilno geslo."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "To je vaš zadnji poskus"

289

290#: qml/Shell.qml:310

291msgid ""

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

293"reset and all personal data will be deleted."

294msgstr ""

295+"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "

296+"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

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

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

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

303+"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "

304+"nastavitve ter vsi osebni podatki bodo izbrisani."

po/uk.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 14:38+0000\n"

11+"PO-Revision-Date: 2014-08-17 14:49+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Пароль: "

23

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

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

@@ -99,11 +99,11 @@ msgstr ""

99

100#: qml/Components/Lockscreen.qml:161

101msgid "Too many incorrect attempts"

102−msgstr ""

102+msgstr "Забагато помилкових спроб"

103

104#: qml/Components/Lockscreen.qml:163

105msgid "Please wait"

106−msgstr ""

106+msgstr "Будь ласка, зачекайте"

107

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

109msgid "Emergency Call"

@@ -256,46 +256,50 @@ msgstr "Роумінг"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "пароль"

260

261#: qml/Shell.qml:267

262msgid "passcode"

263−msgstr ""

263+msgstr "код-пароль"

264

265#: qml/Shell.qml:269

266#, qt-format

267msgid "Enter your %1"

268−msgstr ""

268+msgstr "Вкажіть ваш %1"

269

270#: qml/Shell.qml:270

271#, qt-format

272msgid "Incorrect %1"

273−msgstr ""

273+msgstr "Помилковий %1"

274

275#: qml/Shell.qml:272

276msgid "Please re-enter"

277−msgstr ""

277+msgstr "Будь ласка, вкажіть ще раз"

278

279#: qml/Shell.qml:306

280msgid "Sorry, incorrect passphrase."

281−msgstr ""

281+msgstr "Вибачте, помилковий пароль."

282

283#: qml/Shell.qml:307

284msgid "Sorry, incorrect passcode."

285−msgstr ""

285+msgstr "Вибачте, помилковий код-пароль."

286

287#: qml/Shell.qml:308

288msgid "This will be your last attempt."

289−msgstr ""

289+msgstr "Ця спроба буде останньою."

290

291#: qml/Shell.qml:310

292msgid ""

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

294"reset and all personal data will be deleted."

295msgstr ""

296+"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "

297+"стану, усі особисті дані буде вилучено."

296

298

297#: qml/Shell.qml:311

299#: qml/Shell.qml:311

298msgid ""

300msgid ""

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

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

300"and all personal data will be deleted."

302"and all personal data will be deleted."

301msgstr ""

303msgstr ""

304+"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "

305+"стану, усі особисті дані буде вилучено."

qml/Components/Dialogs.qml+21−25

@@ -18,15 +18,18 @@ import QtQuick 2.0

18

19import Unity.Application 0.1

20import Unity.Session 0.1

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.1

22import Ubuntu.Components.Popups 0.1

23

24Item {

25 id: root

26

27 function onPowerKeyPressed() {

28+ // FIXME: event.isAutoRepeat is always false on Nexus 4.

29+ // So we use powerKeyTimer.running to avoid the PowerOff key repeat

30+ // https://launchpad.net/bugs/1349416

28 if (!powerKeyTimer.running) {

31 if (!powerKeyTimer.running) {

29− powerKeyTimer.start();

32+ powerKeyTimer.restart();

30 }

33 }

31 }

34 }

32

35

@@ -64,17 +67,17 @@ Item {

64 id: logoutDialog

67 id: logoutDialog

65 Dialog {

68 Dialog {

66 id: dialogueLogout

69 id: dialogueLogout

67− title: "Logout"

70+ title: i18n.tr("Log out")

68− text: "Are you sure that you want to logout?"

71+ text: i18n.tr("Are you sure you want to log out?")

69 Button {

72 Button {

70− text: "Cancel"

73+ text: i18n.tr("No")

71 onClicked: {

74 onClicked: {

72 PopupUtils.close(dialogueLogout);

75 PopupUtils.close(dialogueLogout);

73 d.dialogShown = false;

76 d.dialogShown = false;

74 }

77 }

75 }

78 }

76 Button {

79 Button {

77− text: "Yes"

80+ text: i18n.tr("Yes")

78 onClicked: {

81 onClicked: {

79 DBusUnitySessionService.Logout();

82 DBusUnitySessionService.Logout();

80 PopupUtils.close(dialogueLogout);

83 PopupUtils.close(dialogueLogout);

@@ -88,17 +91,17 @@ Item {

88 id: shutdownDialog

91 id: shutdownDialog

89 Dialog {

92 Dialog {

90 id: dialogueShutdown

93 id: dialogueShutdown

91− title: "Shutdown"

94+ title: i18n.tr("Shut down")

92− text: "Are you sure that you want to shutdown?"

95+ text: i18n.tr("Are you sure you want to shut down?")

93 Button {

96 Button {

94− text: "Cancel"

97+ text: i18n.tr("No")

95 onClicked: {

98 onClicked: {

96 PopupUtils.close(dialogueShutdown);

99 PopupUtils.close(dialogueShutdown);

97 d.dialogShown = false;

100 d.dialogShown = false;

98 }

101 }

99 }

102 }

100 Button {

103 Button {

101− text: "Yes"

104+ text: i18n.tr("Yes")

102 onClicked: {

105 onClicked: {

103 dBusUnitySessionServiceConnection.closeAllApps();

106 dBusUnitySessionServiceConnection.closeAllApps();

104 DBusUnitySessionService.Shutdown();

107 DBusUnitySessionService.Shutdown();

@@ -113,17 +116,17 @@ Item {

113 id: rebootDialog

116 id: rebootDialog

114 Dialog {

117 Dialog {

115 id: dialogueReboot

118 id: dialogueReboot

116− title: "Reboot"

119+ title: i18n.tr("Reboot")

117− text: "Are you sure that you want to reboot?"

120+ text: i18n.tr("Are you sure you want to reboot?")

118 Button {

121 Button {

119− text: "Cancel"

122+ text: i18n.tr("No")

120 onClicked: {

123 onClicked: {

121 PopupUtils.close(dialogueReboot)

124 PopupUtils.close(dialogueReboot)

122 d.dialogShown = false;

125 d.dialogShown = false;

123 }

126 }

124 }

127 }

125 Button {

128 Button {

126− text: "Yes"

129+ text: i18n.tr("Yes")

127 onClicked: {

130 onClicked: {

128 dBusUnitySessionServiceConnection.closeAllApps();

131 dBusUnitySessionServiceConnection.closeAllApps();

129 DBusUnitySessionService.Reboot();

132 DBusUnitySessionService.Reboot();

@@ -138,8 +141,8 @@ Item {

138 id: powerDialog

141 id: powerDialog

139 Dialog {

142 Dialog {

140 id: dialoguePower

143 id: dialoguePower

141− title: "Power"

144+ title: i18n.tr("Power")

142− text: i18n.tr("Are you sure you would like to turn power off?")

145+ text: i18n.tr("Are you sure you would like\nto power off?")

143 Button {

146 Button {

144 text: i18n.tr("Power off")

147 text: i18n.tr("Power off")

145 onClicked: {

148 onClicked: {

@@ -148,15 +151,7 @@ Item {

148 d.dialogShown = false;

151 d.dialogShown = false;

149 root.powerOffClicked();

152 root.powerOffClicked();

150 }

153 }

151− }

154+ color: UbuntuColors.red

152− Button {

153− text: i18n.tr("Restart")

154− onClicked: {

155− dBusUnitySessionServiceConnection.closeAllApps();

156− DBusUnitySessionService.Reboot();

157− PopupUtils.close(dialoguePower);

158− d.dialogShown = false;

159− }

160 }

155 }

161 Button {

156 Button {

162 text: i18n.tr("Cancel")

157 text: i18n.tr("Cancel")

@@ -164,6 +159,7 @@ Item {

164 PopupUtils.close(dialoguePower);

159 PopupUtils.close(dialoguePower);

165 d.dialogShown = false;

160 d.dialogShown = false;

166 }

161 }

162+ color: UbuntuColors.coolGrey

167 }

163 }

168 }

164 }

169 }

165 }

qml/Dash/CardHorizontalList.qml+2−2

@@ -54,8 +54,8 @@ DashRenderer {

54 }

55 Connections {

56 target: loader.item

57− onClicked: root.clicked(index, result)

57+ onClicked: root.clicked(index, result, loader.item, model)

58− onPressAndHold: root.pressAndHold(index)

58+ onPressAndHold: root.pressAndHold(index, model)

59 }

60 }

61 }

qml/Dash/DashNavigation.qml+2−2

@@ -80,7 +80,7 @@ AbstractButton {

80 anchors.margins: units.gu(2)

81 verticalAlignment: Text.AlignVCenter

82 text: root.currentNavigation ? root.currentNavigation.label : ""

83− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

83+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

84 }

85

86 Icon {

@@ -90,7 +90,7 @@ AbstractButton {

90 name: showList ? "up" : "down"

91 height: units.gu(2)

92 width: height

93− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

93+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

94 }

95

96 // navigationListView is outside root

qml/Dash/DashNavigationList.qml+1−1

@@ -27,7 +27,7 @@ Item {

27 signal allNavigationClicked()

28

29 readonly property int itemHeight: units.gu(5)

30− readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"

30+ readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

31 implicitHeight: flickable.contentHeight

32

33 Rectangle {

qml/Dash/GenericScopeView.qml+2−2

@@ -365,7 +365,7 @@ FocusScope {

365 }

366 fontSize: "small"

367 font.weight: Font.Bold

368− color: scopeStyle ? scopeStyle.foreground : "grey"

368+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

369 visible: baseItem.expandable && !baseItem.headerLink

370 }

371 }

@@ -403,7 +403,7 @@ FocusScope {

403 width: categoryView.width

404 height: section != "" ? units.gu(5) : 0

405 text: section

406− color: scopeStyle ? scopeStyle.foreground : "grey"

406+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

407 iconName: delegate && delegate.headerLink ? "go-next" : ""

408 onClicked: {

409 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);

qml/Components/PageHeader.qml → qml/Dash/PageHeader.qmlrenamed+4−3

@@ -19,7 +19,8 @@ import Ubuntu.Components 1.1

19import Ubuntu.Components.Themes.Ambiance 1.1

20import Ubuntu.Components.Popups 1.0

21import Ubuntu.Components.ListItems 1.0

22+import "../Components"

22−import "SearchHistoryModel"

23+import "../Components/SearchHistoryModel"

23

24

24Item {

25Item {

25 id: root

26 id: root

@@ -172,7 +173,7 @@ Item {

172 property var styledItem: searchHeader

173 property var styledItem: searchHeader

173 property string title

174 property string title

174 property var config: PageHeadConfiguration {

175 property var config: PageHeadConfiguration {

175− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"

176+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText

176 backAction: Action {

177 backAction: Action {

177 iconName: "back"

178 iconName: "back"

178 onTriggered: {

179 onTriggered: {

@@ -242,7 +243,7 @@ Item {

242 property var styledItem: header

243 property var styledItem: header

243 property string title: root.title

244 property string title: root.title

244 property var config: PageHeadConfiguration {

245 property var config: PageHeadConfiguration {

245− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"

246+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText

246 backAction: Action {

247 backAction: Action {

247 iconName: "back"

248 iconName: "back"

248 visible: root.showBackButton

249 visible: root.showBackButton

qml/Dash/Previews/PreviewAudioPlayback.qml+3−3

@@ -139,7 +139,7 @@ PreviewWidget {

139 objectName: "trackTitleLabel"

140 anchors { top: parent.top; left: parent.left; right: parent.right }

141 opacity: 0.9

142− color: scopeStyle ? scopeStyle.foreground : "grey"

142+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

143 fontSize: "small"

144 horizontalAlignment: Text.AlignLeft

145 text: modelData["title"]

@@ -152,7 +152,7 @@ PreviewWidget {

152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }

153 visible: text !== ""

154 opacity: 0.9

155− color: scopeStyle ? scopeStyle.foreground : "grey"

155+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

156 font.weight: Font.Light

157 fontSize: "small"

158 horizontalAlignment: Text.AlignLeft

@@ -193,7 +193,7 @@ PreviewWidget {

193 anchors.verticalCenter: parent.verticalCenter

194 width: parent.column3Width

195 opacity: 0.9

196− color: scopeStyle ? scopeStyle.foreground : "grey"

196+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

197 fontSize: "small"

198 horizontalAlignment: Text.AlignRight

199 text: audio.lengthToString(modelData["length"])

qml/Dash/Previews/PreviewExpandable.qml+1−1

@@ -41,7 +41,7 @@ PreviewWidget {

41 right: expandButton.left

42 }

43 fontSize: "large"

44− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

44+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

45 visible: text !== ""

46 opacity: .8

47 text: widgetData["title"] || ""

qml/Dash/Previews/PreviewHeader.qml+1−1

@@ -35,7 +35,7 @@ PreviewWidget {

35 readonly property url mascot: root.widgetData["mascot"] || ""

36 readonly property string title: root.widgetData["title"] || ""

37 readonly property string subtitle: root.widgetData["subtitle"] || ""

38− readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"

38+ readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

39

40 implicitHeight: row.height + row.margins * 2

41 width: parent.width

qml/Dash/Previews/PreviewRatingDisplay.qml+2−2

@@ -72,7 +72,7 @@ PreviewWidget {

72 id: authorLabel

73 objectName: "authorLabel"

74 anchors { left: parent.left; right: parent.right }

75− color: scopeStyle ? scopeStyle.foreground : "grey"

75+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

76 opacity: .8

77 text: modelData["author"] || ""

78 visible: text !== ""

@@ -83,7 +83,7 @@ PreviewWidget {

83 id: reviewLabel

84 objectName: "reviewLabel"

85 anchors { left: parent.left; right: parent.right }

86− color: scopeStyle ? scopeStyle.foreground : "grey"

86+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

87 opacity: .8

88 text: modelData["review"] || ""

89 visible: text !== ""

qml/Dash/Previews/PreviewRatingInput.qml+2−2

@@ -76,7 +76,7 @@ PreviewWidget {

76 verticalCenter: parent.verticalCenter

77 left: parent.left

78 }

79− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

79+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

80 opacity: .8

81 text: widgetData["rating-label"] || i18n.tr("Rate this")

82 }

@@ -121,7 +121,7 @@ PreviewWidget {

121 left: parent.left

122 right: parent.right

123 }

124− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

124+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

125 opacity: .8

126 text: widgetData["review-label"] || i18n.tr("Add a review")

127 }

qml/Dash/Previews/PreviewTextSummary.qml+2−2

@@ -39,7 +39,7 @@ PreviewWidget {

39 }

40 height: visible ? implicitHeight : 0

41 fontSize: "large"

42− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

42+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

43 visible: text !== ""

44 opacity: .8

45 text: widgetData["title"] || ""

@@ -61,7 +61,7 @@ PreviewWidget {

61 clip: true

62 fontSize: "small"

63 lineHeight: 1.2

64− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

64+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

65 opacity: .8

66 text: widgetData["text"]

67 wrapMode: Text.Wrap

qml/Dash/ScopesOverview.qml+12−5

@@ -32,7 +32,7 @@ Item {

32 property alias currentTab: tabBar.currentTab

33

34 // Properties used by parent

35− readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing

35+ readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing || previewListView.processing

36 property bool growingDashFromPos: false

37 readonly property bool searching: scope && scope.searchQuery == ""

38 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null

@@ -366,7 +366,16 @@ Item {

366 }

367

368 function itemPressedAndHeld(index, itemModel, resultsModel, limitedCategoryItemCount) {

369− // Do nothing

369+ if (itemModel.uri.indexOf("scope://") === 0) {

370+ // Preview can call openScope so make sure restorePosition and restoreSize are set

371+ scopesOverviewXYScaler.restorePosition = undefined;

372+ scopesOverviewXYScaler.restoreSize = allCardSize;

373+

374+ previewListView.model = resultsModel;

375+ previewListView.currentIndex = -1;

376+ previewListView.currentIndex = index;

377+ previewListView.open = true;

378+ }

370 }

379 }

371 }

380 }

372

381

@@ -400,7 +409,7 @@ Item {

400 border.color: "white"

409 border.color: "white"

401 border.width: units.dp(1)

410 border.width: units.dp(1)

402 radius: units.dp(10)

411 radius: units.dp(10)

403− color: parent.pressed ? "gray" : "transparent"

412+ color: parent.pressed ? Theme.palette.normal.baseText : "transparent"

404 }

413 }

405 Label {

414 Label {

406 id: label

415 id: label

@@ -455,8 +464,6 @@ Item {

455 anchors.left: scopesOverviewContent.right

464 anchors.left: scopesOverviewContent.right

456 }

465 }

457

466

458−

459−

460 Item {

467 Item {

461 id: scopesOverviewXYScaler

468 id: scopesOverviewXYScaler

462 width: parent.width

469 width: parent.width

qml/Components/graphics/PageHeaderBaseDivider@18.png → qml/Dash/graphics/PageHeaderBaseDivider@18.pngrenamed

Binary file not shown.

qml/Components/graphics/PageHeaderBaseDivider@18.sci → qml/Dash/graphics/PageHeaderBaseDivider@18.scirenamed

The content is the same.

qml/Components/graphics/pagination_dot_off@30.png → qml/Dash/graphics/pagination_dot_off@30.pngrenamed

Binary file not shown.

qml/Components/graphics/pagination_dot_on@30.png → qml/Dash/graphics/pagination_dot_on@30.pngrenamed

Binary file not shown.

qml/Greeter/Clock.qml+2−1

@@ -16,6 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19+import "../Panel/Indicators"

19import Unity.Indicators 0.1 as Indicators

20import Unity.Indicators 0.1 as Indicators

20

21

21Item {

22Item {

@@ -33,7 +34,7 @@ Item {

33 }

34 }

35 }

35

36

36− Indicators.CachedUnityMenuModel {

37+ CachedUnityMenuModel {

37 id: timeModel

38 id: timeModel

38 objectName: "timeModel"

39 objectName: "timeModel"

39

40

qml/Hud/HudParametrizedActionsPage.qml+9−2

@@ -15,7 +15,8 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

19+import Ubuntu.Components.Themes.Ambiance 1.1

19import "../Components"

20import "../Components"

20

21

21Item {

22Item {

@@ -89,12 +90,18 @@ Item {

89 anchors.left: parent.left

90 anchors.left: parent.left

90 anchors.right: parent.right

91 anchors.right: parent.right

91

92

92− PageHeader {

93+ PageHeadStyle {

93 id: header

94 id: header

94 anchors.top: parent.top

95 anchors.top: parent.top

95 anchors.left: parent.left

96 anchors.left: parent.left

96 anchors.right: parent.right

97 anchors.right: parent.right

97 anchors.topMargin: units.gu(1)

98 anchors.topMargin: units.gu(1)

99+ height: units.gu(6.5)

100+ contentHeight: height

101+ separatorSource: ""

102+ property var styledItem: header

103+ property string title

104+ property var config: PageHeadConfiguration { }

98 }

105 }

99 }

106 }

100 }

107 }

qml/Notifications/Notification.qml+3−1

@@ -52,7 +52,7 @@ Item {

52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0

53

54 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)

55− opacity: 0

55+ opacity: 1

56

57 state: {

58 var result = "";

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

257 font.bold: true

258 color: Theme.palette.selected.backgroundText

259 elide: Text.ElideRight

260+ textFormat: Text.PlainText

260 }

261 }

261

262

262 Label {

263 Label {

@@ -274,6 +275,7 @@ Item {

274 wrapMode: Text.WordWrap

275 wrapMode: Text.WordWrap

275 maximumLineCount: 10

276 maximumLineCount: 10

276 elide: Text.ElideRight

277 elide: Text.ElideRight

278+ textFormat: Text.PlainText

277 }

279 }

278 }

280 }

279 }

281 }

qml/Notifications/Notifications.qml+2−2

@@ -79,7 +79,7 @@ ListView {

79 }

80 }

81

82− populate: Transition {

82+ /*populate: Transition {

83 UbuntuNumberAnimation {

84 property: "opacity"

85 to: 1

@@ -107,5 +107,5 @@ ListView {

107 properties: "x,y"

108 duration: UbuntuAnimation.SnapDuration

109 }

110− }

110+ }*/

111}

tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml → qml/Panel/Indicators/CachedUnityMenuModel.qmlrenamed+14−5

@@ -18,13 +18,22 @@

18 */

19

20import QtQuick 2.0

21+import QMenuModel 0.1

22+import Unity.Indicators 0.1 as Indicators

21

23

24+// Make sure we don't duplicate models.

22Item {

25Item {

26+ id: cachedModel

23− property string busName: ""

27+ property string busName

24− property string actionsObjectPath: ""

28+ property string actionsObjectPath

25− property string menuObjectPath: ""

29+ property string menuObjectPath

30+ readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""

26

31

27− readonly property bool ready: false

32+ property var model: {

33+ if (!ready) return null;

28

34

29− property QtObject model: null

35+ return Indicators.UnityMenuModelCache.model(cachedModel.busName,

36+ cachedModel.menuObjectPath,

37+ { "indicator": cachedModel.actionsObjectPath });

38+ }

30}

39}

qml/Panel/Indicators/DefaultIndicatorWidget.qml+2−1

@@ -63,6 +63,7 @@ IndicatorBase {

63 }

64

65 Row {

66+ id: iconRow

66 anchors {

67 anchors {

67 top: parent.top

68 top: parent.top

68 bottom: parent.bottom

69 bottom: parent.bottom

@@ -73,7 +74,7 @@ IndicatorBase {

73

74

74 Item {

75 Item {

75 width: itemImage.width + units.gu(1)

76 width: itemImage.width + units.gu(1)

76− anchors { top: parent.top; bottom: parent.bottom }

77+ height: iconRow.height

77

78

78 StatusIcon {

79 StatusIcon {

79 id: itemImage

80 id: itemImage

qml/Panel/Indicators/IndicatorBase.qml+4−2

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

34 property string deviceMenuObjectPath: menuObjectPath

35

36 property alias menuModel: cachedModel.model

37+ property alias rootActionState: rootAction

37

38

38 CachedUnityMenuModel {

39 CachedUnityMenuModel {

39 id: cachedModel

40 id: cachedModel

@@ -42,8 +43,9 @@ Item {

42 menuObjectPath: indicatorItem.deviceMenuObjectPath

43 menuObjectPath: indicatorItem.deviceMenuObjectPath

43 }

44 }

44

45

45− property RootActionState rootActionState: RootActionState {

46+ RootActionState {

47+ id: rootAction

46− menu: menuModel

48+ menu: menuModel ? menuModel : null

47 onUpdated: indicatorItem.rootActionStateChanged()

49 onUpdated: indicatorItem.rootActionStateChanged()

48 }

50 }

49}

51}

qml/Shell.qml+18−6

@@ -68,6 +68,13 @@ Item {

68 }

69 }

70

71+ function setFakeActiveForApp(app) {

72+ if (shell.locked) {

73+ greeter.fakeActiveForApp = app

74+ lockscreen.hide()

75+ }

76+ }

77+

71 Binding {

78 Binding {

72 target: LauncherModel

79 target: LauncherModel

73 property: "applicationManager"

80 property: "applicationManager"

@@ -130,7 +137,11 @@ Item {

130 Connections {

137 Connections {

131 target: ApplicationManager

138 target: ApplicationManager

132 onFocusRequested: {

139 onFocusRequested: {

140+ if (appId === "dialer-app") {

141+ // Always let the dialer-app through. Either user asked

142+ // for an emergency call or accepted an incoming call.

143+ setFakeActiveForApp(appId)

133− if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {

144+ } else if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {

134 lockscreen.show();

145 lockscreen.show();

135 }

146 }

136 greeter.hide();

147 greeter.hide();

@@ -147,6 +158,11 @@ Item {

147 if (greeter.shown && appId != "unity8-dash") {

158 if (greeter.shown && appId != "unity8-dash") {

148 greeter.hide();

159 greeter.hide();

149 }

160 }

161+ if (appId === "dialer-app") {

162+ // Always let the dialer-app through. Either user asked

163+ // for an emergency call or accepted an incoming call.

164+ setFakeActiveForApp(appId)

165+ }

150 }

166 }

151 }

167 }

152

168

@@ -239,11 +255,7 @@ Item {

239

255

240 onEntered: LightDM.Greeter.respond(passphrase);

256 onEntered: LightDM.Greeter.respond(passphrase);

241 onCancel: greeter.show()

257 onCancel: greeter.show()

242− onEmergencyCall: {

243− greeter.fakeActiveForApp = "dialer-app"

244− shell.activateApplication("dialer-app")

258+ onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode

245− lockscreen.hide()

246− }

247

259

248 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

260 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

249

261

tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1

@@ -76,7 +76,7 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):

76 ('Location', dict(indicator_name='indicator-location',

77 title='Location')),

78 ('Messaging', dict(indicator_name='indicator-messages',

79− title='Incoming')),

79+ title='Notification center')),

80 ('Network', dict(indicator_name='indicator-network',

81 title='Network')),

82 ('Power', dict(indicator_name='indicator-power',

tests/mocks/AccountsService/AccountsService.qmltypes+8

@@ -14,9 +14,17 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Enum {

18+ name: "PasswordDisplayHint"

19+ values: {

20+ "Keyboard": 0,

21+ "Numeric": 1

22+ }

23+ }

17 Property { name: "user"; type: "string" }

24 Property { name: "user"; type: "string" }

18 Property { name: "demoEdges"; type: "bool" }

25 Property { name: "demoEdges"; type: "bool" }

19 Property { name: "backgroundFile"; type: "string" }

26 Property { name: "backgroundFile"; type: "string" }

20 Property { name: "statsWelcomeScreen"; type: "bool" }

27 Property { name: "statsWelcomeScreen"; type: "bool" }

28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

21 }

29 }

22}

30}

tests/mocks/LightDM/LightDM.qmltypes+7

@@ -14,6 +14,7 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Property { name: "active"; type: "bool" }

17 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "promptless"; type: "bool"; isReadonly: true }

20 Property { name: "promptless"; type: "bool"; isReadonly: true }

@@ -32,6 +33,8 @@ Module {

32 name: "authenticationUserChanged"

33 name: "authenticationUserChanged"

33 Parameter { name: "user"; type: "string" }

34 Parameter { name: "user"; type: "string" }

34 }

35 }

36+ Signal { name: "isActiveChanged" }

37+ Signal { name: "showGreeter" }

35 Signal {

38 Signal {

36 name: "requestAuthenticationUser"

39 name: "requestAuthenticationUser"

37 Parameter { name: "user"; type: "string" }

40 Parameter { name: "user"; type: "string" }

@@ -51,6 +54,10 @@ Module {

51 Parameter { name: "session"; type: "string" }

54 Parameter { name: "session"; type: "string" }

52 }

55 }

53 Method { name: "startSessionSync"; type: "bool" }

56 Method { name: "startSessionSync"; type: "bool" }

57+ Method {

58+ name: "setIsActive"

59+ Parameter { name: "isActive"; type: "bool" }

60+ }

54 }

61 }

55 Component {

62 Component {

56 name: "QAbstractProxyModel"

63 name: "QAbstractProxyModel"

tests/mocks/QMenuModel/QMenuModel.qmltypes+1

@@ -23,6 +23,7 @@ Module {

23 Property { name: "actions"; type: "QVariantMap" }

24 Property { name: "menuObjectPath"; type: "QByteArray" }

25 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }

26+ Property { name: "nameOwner"; type: "string"; isReadonly: true }

26 Method {

27 Method {

27 name: "insertRow"

28 name: "insertRow"

28 Parameter { name: "row"; type: "int" }

29 Parameter { name: "row"; type: "int" }

tests/mocks/QMenuModel/unitymenumodel.cpp+4−5

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

17 */

18

19#include "unitymenumodel.h"

20−#include <QDebug>

21

20

22enum MenuRoles {

21enum MenuRoles {

23 LabelRole = Qt::DisplayRole + 1,

22 LabelRole = Qt::DisplayRole + 1,

@@ -38,6 +37,10 @@ UnityMenuModel::UnityMenuModel(QObject *parent)

38{

37{

39}

38}

40

39

40+UnityMenuModel::~UnityMenuModel()

41+{

42+}

43+

41QVariant UnityMenuModel::modelData() const

44QVariant UnityMenuModel::modelData() const

42{

45{

43 return m_modelData;

46 return m_modelData;

@@ -83,10 +86,6 @@ void UnityMenuModel::removeRow(int row)

83 endRemoveRows();

86 endRemoveRows();

84}

87}

85

88

86−UnityMenuModel::~UnityMenuModel()

87−{

88−}

89−

90QByteArray UnityMenuModel::busName() const

89QByteArray UnityMenuModel::busName() const

91{

90{

92 return m_busName;

91 return m_busName;

tests/mocks/Ubuntu/Telephony/Telephony.qmltypesnew file+57

@@ -0,0 +1,57 @@

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 Ubuntu.Telephony 0.1 tests/mocks'

8+

9+Module {

10+ Component {

11+ name: "ContactWatcherData"

12+ prototype: "QObject"

13+ exports: ["Ubuntu.Telephony/ContactWatcherData 0.1"]

14+ isCreatable: false

15+ exportMetaObjectRevisions: [0]

16+ Property { name: "contactData"; type: "QVariant" }

17+ }

18+ Component {

19+ name: "MockCallEntry"

20+ prototype: "QObject"

21+ exports: ["Ubuntu.Telephony/CallEntry 0.1"]

22+ exportMetaObjectRevisions: [0]

23+ Property { name: "phoneNumber"; type: "string" }

24+ Property { name: "isConference"; type: "bool" }

25+ Property { name: "elapsedTime"; type: "int"; isReadonly: true }

26+ }

27+ Component {

28+ name: "MockCallManager"

29+ prototype: "QObject"

30+ exports: ["Ubuntu.Telephony/CallManager 0.1"]

31+ isCreatable: false

32+ exportMetaObjectRevisions: [0]

33+ Property { name: "foregroundCall"; type: "QObject"; isPointer: true }

34+ Property { name: "backgroundCall"; type: "QObject"; isPointer: true }

35+ Property { name: "hasCalls"; type: "bool"; isReadonly: true }

36+ Property { name: "callIndicatorVisible"; type: "bool" }

37+ }

38+ Component {

39+ name: "MockContactWatcher"

40+ prototype: "QObject"

41+ exports: ["Ubuntu.Telephony/ContactWatcher 0.1"]

42+ exportMetaObjectRevisions: [0]

43+ Property { name: "phoneNumber"; type: "string" }

44+ Property { name: "alias"; type: "string"; isReadonly: true }

45+ }

46+ Component {

47+ name: "MockTelepathyHelper"

48+ prototype: "QObject"

49+ exports: ["Ubuntu.Telephony/TelepathyHelper 0.1"]

50+ isCreatable: false

51+ exportMetaObjectRevisions: [0]

52+ Method {

53+ name: "registerChannelObserver"

54+ Parameter { name: "name"; type: "string" }

55+ }

56+ }

57+}

tests/mocks/Unity/Application/Application.qmltypes+133−8

@@ -33,15 +33,58 @@ Module {

33 exportMetaObjectRevisions: [0]

34 Property { name: "fullscreen"; type: "bool" }

35 Property { name: "stage"; type: "Stage" }

36+ Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

37+ Property { name: "promptSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

36 Property { name: "imageQml"; type: "string" }

38 Property { name: "imageQml"; type: "string" }

37 Property { name: "windowQml"; type: "string" }

39 Property { name: "windowQml"; type: "string" }

40+ Signal {

38− Signal { name: "appIdChanged" }

41+ name: "appIdChanged"

42+ Parameter { type: "string" }

43+ }

44+ Signal {

39− Signal { name: "nameChanged" }

45+ name: "nameChanged"

46+ Parameter { type: "string" }

47+ }

48+ Signal {

40− Signal { name: "commentChanged" }

49+ name: "commentChanged"

50+ Parameter { type: "string" }

51+ }

52+ Signal {

41− Signal { name: "iconChanged" }

53+ name: "iconChanged"

54+ Parameter { type: "QUrl" }

55+ }

56+ Signal {

57+ name: "stageChanged"

58+ Parameter { type: "Stage" }

59+ }

60+ Signal {

42− Signal { name: "stateChanged" }

61+ name: "stateChanged"

62+ Parameter { type: "State" }

63+ }

64+ Signal {

43− Signal { name: "focusedChanged" }

65+ name: "focusedChanged"

66+ Parameter { type: "bool" }

67+ }

68+ Signal {

69+ name: "fullscreenChanged"

70+ Parameter { type: "bool" }

71+ }

72+ Signal {

73+ name: "imageQmlChanged"

74+ Parameter { type: "string" }

75+ }

76+ Signal {

77+ name: "windowQmlChanged"

78+ Parameter { type: "string" }

79+ }

80+ Signal {

44− Signal { name: "screenshotChanged" }

81+ name: "screenshotChanged"

82+ Parameter { type: "QUrl" }

83+ }

84+ Signal {

85+ name: "surfaceChanged"

86+ Parameter { type: "MirSurfaceItem"; isPointer: true }

87+ }

45 }

88 }

46 Component {

89 Component {

47 name: "ApplicationManager"

90 name: "ApplicationManager"

@@ -102,11 +145,11 @@ Module {

102 "ForceMainStage": 1

145 "ForceMainStage": 1

103 }

146 }

104 }

147 }

148+ Property { name: "empty"; type: "bool"; isReadonly: true }

105 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }

149 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }

106 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }

150 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }

107 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }

151 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }

108 Property { name: "fake"; type: "bool"; isReadonly: true }

152 Property { name: "fake"; type: "bool"; isReadonly: true }

109− Property { name: "rightMargin"; type: "int" }

110 Signal {

153 Signal {

111 name: "focusRequested"

154 name: "focusRequested"

112 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }

155 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }

@@ -115,6 +158,10 @@ Module {

115 name: "focusRequested"

158 name: "focusRequested"

116 Parameter { name: "appId"; type: "string" }

159 Parameter { name: "appId"; type: "string" }

117 }

160 }

161+ Signal {

162+ name: "emptyChanged"

163+ Parameter { name: "empty"; type: "bool" }

164+ }

118 Method {

165 Method {

119 name: "get"

166 name: "get"

120 type: "ApplicationInfo*"

167 type: "ApplicationInfo*"

@@ -177,6 +224,84 @@ Module {

177 }

224 }

178 Method { name: "availableApplications"; type: "QStringList" }

225 Method { name: "availableApplications"; type: "QStringList" }

179 }

226 }

227+ Component {

228+ name: "MirSurfaceItem"

229+ defaultProperty: "data"

230+ prototype: "QQuickPaintedItem"

231+ exports: ["Unity.Application/MirSurfaceItem 0.1"]

232+ isCreatable: false

233+ exportMetaObjectRevisions: [0]

234+ Enum {

235+ name: "Type"

236+ values: {

237+ "Normal": 0,

238+ "Utility": 1,

239+ "Dialog": 2,

240+ "Overlay": 3,

241+ "Freestyle": 4,

242+ "Popover": 5,

243+ "InputMethod": 6

244+ }

245+ }

246+ Enum {

247+ name: "State"

248+ values: {

249+ "Unknown": 0,

250+ "Restored": 1,

251+ "Minimized": 2,

252+ "Maximized": 3,

253+ "VertMaximized": 4,

254+ "Fullscreen": 5

255+ }

256+ }

257+ Property { name: "type"; type: "Type"; isReadonly: true }

258+ Property { name: "state"; type: "State"; isReadonly: true }

259+ Property { name: "name"; type: "string"; isReadonly: true }

260+ Property { name: "parentSurface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

261+ Property { name: "childSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

262+ Signal {

263+ name: "typeChanged"

264+ Parameter { type: "Type" }

265+ }

266+ Signal {

267+ name: "stateChanged"

268+ Parameter { type: "State" }

269+ }

270+ Signal {

271+ name: "nameChanged"

272+ Parameter { type: "string" }

273+ }

274+ Signal {

275+ name: "parentSurfaceChanged"

276+ Parameter { type: "MirSurfaceItem"; isPointer: true }

277+ }

278+ Signal { name: "removed" }

279+ Signal { name: "inputMethodRequested" }

280+ Signal { name: "inputMethodDismissed" }

281+ Method {

282+ name: "setState"

283+ Parameter { name: "newState"; type: "State" }

284+ }

285+ Method { name: "release" }

286+ }

287+ Component {

288+ name: "SurfaceManager"

289+ prototype: "QObject"

290+ exports: ["Unity.Application/SurfaceManager 0.1"]

291+ isCreatable: false

292+ isSingleton: true

293+ exportMetaObjectRevisions: [0]

294+ Signal { name: "countChanged" }

295+ Signal {

296+ name: "surfaceCreated"

297+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }

298+ }

299+ Signal {

300+ name: "surfaceDestroyed"

301+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }

302+ }

303+ Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }

304+ }

180 Component {

305 Component {

181 name: "unity::shell::application::ApplicationInfoInterface"

306 name: "unity::shell::application::ApplicationInfoInterface"

182 prototype: "QObject"

307 prototype: "QObject"

tests/mocks/Unity/Application/ApplicationInfo.cpp+1

@@ -54,6 +54,7 @@ ApplicationInfo::~ApplicationInfo()

54 if (m_surface) {

55 Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);

56 m_surface->deleteLater();

57+ setSurface(nullptr);

57 }

58 }

58}

59}

59

60

tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypesnew file+46

@@ -0,0 +1,46 @@

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 Unity.DashCommunicator 0.1 tests/mocks'

8+

9+Module {

10+ Component {

11+ name: "DashCommunicator"

12+ prototype: "QObject"

13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Signal {

16+ name: "setCurrentScopeCalled"

17+ Parameter { name: "scopeId"; type: "string" }

18+ Parameter { name: "animate"; type: "bool" }

19+ Parameter { name: "reset"; type: "bool" }

20+ }

21+ Method {

22+ name: "setCurrentScope"

23+ Parameter { name: "scopeId"; type: "string" }

24+ Parameter { name: "animate"; type: "bool" }

25+ Parameter { name: "reset"; type: "bool" }

26+ }

27+ }

28+ Component {

29+ name: "DashCommunicatorService"

30+ prototype: "QObject"

31+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

32+ exportMetaObjectRevisions: [0]

33+ Signal {

34+ name: "setCurrentScopeRequested"

35+ Parameter { name: "scopeId"; type: "string" }

36+ Parameter { name: "animate"; type: "bool" }

37+ Parameter { name: "reset"; type: "bool" }

38+ }

39+ Method {

40+ name: "mockSetCurrentScope"

41+ Parameter { name: "scopeId"; type: "string" }

42+ Parameter { name: "animate"; type: "bool" }

43+ Parameter { name: "reset"; type: "bool" }

44+ }

45+ }

46+}

tests/mocks/Unity/Indicators/CMakeLists.txt+6−1

@@ -14,6 +14,7 @@ set(IndicatorsFakeQml_SOURCES

14 fakeplugin.cpp

15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19 fakeindicatorsmodel.cpp

20 fakeindicatorsmodel.cpp

@@ -33,7 +34,11 @@ add_library(IndicatorsFakeQml SHARED

33)

34)

34add_definitions(-DUNITYINDICATORS_LIBRARY)

35add_definitions(-DUNITYINDICATORS_LIBRARY)

35

36

37+add_dependencies(IndicatorsFakeQml QMenuModelQml)

36−target_link_libraries(IndicatorsFakeQml)

38+target_link_libraries(IndicatorsFakeQml

39+ -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel

40+ -lqmenumodel

41+)

37

42

38qt5_use_modules(IndicatorsFakeQml Core Qml Quick)

43qt5_use_modules(IndicatorsFakeQml Core Qml Quick)

39

44

tests/mocks/Unity/Indicators/fakeplugin.cpp+9

@@ -26,9 +26,16 @@

26#include "fakeindicatorsmodel.h"

27#include "indicators.h"

28#include "menucontentactivator.h"

29+#include "unitymenumodelcache.h"

29#include "unitymenumodelstack.h"

30#include "unitymenumodelstack.h"

30#include "visibleindicatorsmodel.h"

31#include "visibleindicatorsmodel.h"

31

32

33+static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

34+ Q_UNUSED(engine);

35+ Q_UNUSED(scriptEngine);

36+ return new UnityMenuModelCache;

37+}

38+

32void IndicatorsFakePlugin::registerTypes(const char * uri)

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

33{

40{

34 Q_INIT_RESOURCE(indicators_fake);

41 Q_INIT_RESOURCE(indicators_fake);

@@ -41,6 +48,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

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

48 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

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

49 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

43

50

51+ qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

52+

44 // external uncreatables

53 // external uncreatables

45 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

54 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

46 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

55 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

tests/mocks/Unity/Indicators/qmldir−1

@@ -2,7 +2,6 @@ module Unity.Indicators

2plugin IndicatorsFakeQml

3typeinfo Indicators.qmltypes

4

5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml

6IndicatorsModel 0.1 IndicatorsModel.qml

5IndicatorsModel 0.1 IndicatorsModel.qml

7FakeMenuPage 0.1 FakeMenuPage.qml

6FakeMenuPage 0.1 FakeMenuPage.qml

8RootActionState 0.1 RootActionState.qml

7RootActionState 0.1 RootActionState.qml

tests/mocks/Unity/fake_categories.cpp+3

@@ -149,6 +149,9 @@ Categories::data(const QModelIndex& index, int role) const

149 map["card-size"] = "medium";

150 map["overlay"] = true;

151 }

152+ if (index.row() == 18) {

153+ map["category-layout"] = "horizontal-list";

154+ }

152 if (index.row() == 19) {

155 if (index.row() == 19) {

153 map["category-layout"] = "grid";

156 map["category-layout"] = "grid";

154 map["collapsed-rows"] = 0;

157 map["collapsed-rows"] = 0;

tests/mocks/Unity/fake_scope.cpp+1−1

@@ -226,7 +226,7 @@ QVariantMap Scope::customizations() const

226 m["page-header"] = h;

227 } else if (m_id == "MockScope5") {

228 h["background"] = "gradient:///lightgrey/grey";

229− h["logo"] = QUrl("../../../tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg");

229+ h["logo"] = QUrl("../../../tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");

230 m["page-header"] = h;

231 }

232 return m;

tests/plugins/Dash/cardcreator/1.res+1−1

@@ -70,7 +70,7 @@ Label {

70 wrapMode: Text.Wrap;

71 maximumLineCount: 2;

72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 visible: showHeader ;

75 text: root.title;

76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

tests/plugins/Dash/cardcreator/2.res+2−2

@@ -94,7 +94,7 @@ Image {

94 wrapMode: Text.Wrap;

95 maximumLineCount: 2;

96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

97− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

97+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

98 visible: showHeader ;

99 text: root.title;

100 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -112,7 +112,7 @@ Image {

112 elide: Text.ElideRight;

113 fontSize: "small";

114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

115− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

115+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

116 visible: titleLabel.visible && titleLabel.text;

117 text: cardData && cardData["subtitle"] || "";

118 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/3.res+2−2

@@ -70,7 +70,7 @@ Label {

70 wrapMode: Text.Wrap;

71 maximumLineCount: 2;

72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 visible: showHeader ;

75 text: root.title;

76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -88,7 +88,7 @@ Label {

88 elide: Text.ElideRight;

89 fontSize: "small";

90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

91+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

92 visible: titleLabel.visible && titleLabel.text;

93 text: cardData && cardData["subtitle"] || "";

94 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/4.res+2−2

@@ -74,7 +74,7 @@ Label {

74 wrapMode: Text.Wrap;

75 maximumLineCount: 2;

76 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

77− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

77+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

78 visible: showHeader ;

79 text: root.title;

80 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -92,7 +92,7 @@ Label {

92 elide: Text.ElideRight;

93 fontSize: "small";

94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

95− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

95+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

96 visible: titleLabel.visible && titleLabel.text;

97 text: cardData && cardData["subtitle"] || "";

98 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/5.res+2−2

@@ -113,7 +113,7 @@ Label {

113 wrapMode: Text.Wrap;

114 maximumLineCount: 2;

115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

116− color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

116+ color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

117 visible: showHeader && overlayLoader.active;

118 text: root.title;

119 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -131,7 +131,7 @@ Label {

131 elide: Text.ElideRight;

132 fontSize: "small";

133 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

134− color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

134+ color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

135 visible: titleLabel.visible && titleLabel.text;

136 text: cardData && cardData["subtitle"] || "";

137 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/6.res+3−3

@@ -70,7 +70,7 @@ Item {

70 wrapMode: Text.Wrap;

71 maximumLineCount: 2;

72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

73− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

73+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

74 visible: showHeader ;

75 text: root.title;

76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -88,7 +88,7 @@ Item {

88 elide: Text.ElideRight;

89 fontSize: "small";

90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

91+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

92 visible: titleLabel.visible && titleLabel.text;

93 text: cardData && cardData["subtitle"] || "";

94 font.weight: Font.Light;

@@ -103,7 +103,7 @@ Item {

103 rightMargin: units.gu(1);

104 }

105 source: cardData && cardData["emblem"] || "";

106− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

106+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

107 width: height;

108 height: source != "" ? titleLabel.font.pixelSize : 0;

109 }

tests/plugins/Dash/cardcreator/7.res+3−3

@@ -95,7 +95,7 @@ Image {

95 wrapMode: Text.Wrap;

96 maximumLineCount: 2;

97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

98− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

98+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

99 visible: showHeader ;

100 text: root.title;

101 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

@@ -113,7 +113,7 @@ Image {

113 elide: Text.ElideRight;

114 fontSize: "small";

115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

116− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

116+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

117 visible: titleLabel.visible && titleLabel.text;

118 text: cardData && cardData["subtitle"] || "";

119 font.weight: Font.Light;

@@ -127,7 +127,7 @@ Image {

127 rightMargin: units.gu(1);

128 top: subtitleLabel.bottom;

129 }

130− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");

130+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);

131 model: cardData && cardData["attributes"];

132 }

133

tests/plugins/Dash/tst_ScopeStyle.qml+4−4

@@ -67,7 +67,7 @@ Rectangle {

67

68 function test_foreground_data() {

69 return [

70− { tag: "default", index: 0, foreground: "grey", luminance: 0.5020 },

70+ { tag: "default", index: 0, foreground: Theme.palette.normal.foreground, luminance: 0.5725 },

71 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },

72 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },

73 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },

@@ -101,7 +101,7 @@ Rectangle {

101

102 function test_threshold_data() {

103 return [

104− { tag: "default", index: 0, threshold: 0.7510 },

104+ { tag: "default", index: 0, threshold: 0.7863 },

105 { tag: "red on black", index: 1, threshold: 0.1063 },

106 { tag: "green on white", index: 2, threshold: 0.6795 },

107 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },

@@ -130,7 +130,7 @@ Rectangle {

130

131 function test_dark_data() {

132 return [

133− { tag: "default", index: 0, dark: "grey" },

133+ { tag: "default", index: 0, dark: Theme.palette.normal.baseText },

134 { tag: "red on black", index: 1, dark: "black" },

135 { tag: "green on white", index: 2, dark: "green" },

136 { tag: "blue on darkgrey", index: 3, dark: "blue" },

@@ -157,7 +157,7 @@ Rectangle {

157

158 function test_headerForeground_data() {

159 return [

160− { tag: "default", index: 0, headerForeground: "grey" },

160+ { tag: "default", index: 0, headerForeground: Theme.palette.normal.baseText },

161 { tag: "black", index: 2, headerForeground: "black" },

162 ];

163 }

tests/qmltests/CMakeLists.txt+2−1

@@ -31,7 +31,6 @@ add_qml_test(Components ResponsiveFlowView)

31add_qml_test(Components ResponsiveGridView)

32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

33add_qml_test(Components Showable)

34−add_qml_test(Components PageHeader)

35add_qml_test(Components ZoomableImage)

34add_qml_test(Components ZoomableImage)

36add_qml_test(Dash Dash)

35add_qml_test(Dash Dash)

37add_qml_test(Dash DashContent)

36add_qml_test(Dash DashContent)

@@ -39,6 +38,7 @@ add_qml_test(Dash Card)

39add_qml_benchmark(Dash CardBenchmark 1000)

38add_qml_benchmark(Dash CardBenchmark 1000)

40add_qml_test(Dash CardTool)

39add_qml_test(Dash CardTool)

41add_qml_test(Dash GenericScopeView)

40add_qml_test(Dash GenericScopeView)

41+add_qml_test(Dash PageHeader)

42add_qml_test(Dash PreviewListView)

43add_qml_test(Dash/Previews Preview)

44add_qml_test(Dash/Previews PreviewActions)

@@ -72,6 +72,7 @@ add_qml_test(Panel Panel)

72add_qml_test(Panel SearchIndicator)

73add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

74add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75+add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75# These MenuItemFactory tests need the test/mocks/ to come before plugins/

76# These MenuItemFactory tests need the test/mocks/ to come before plugins/

76add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

77add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

77add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

78add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

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

@@ -32,7 +32,7 @@ Rectangle {

32 rightMargin: 2 * parent.width / 3

33 }

34

35− color: "grey"

35+ color: Theme.palette.normal.baseText

36

37 Column {

38 anchors { fill: parent; margins: units.gu(5) }

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

@@ -452,7 +452,7 @@ Rectangle {

452

453 background.color = data.tag;

454

455− var fontColor = data.dark ? "grey" : "white";

455+ var fontColor = data.dark ? Theme.palette.normal.baseText : "white";

456

457 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);

458 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);

tests/qmltests/Dash/tst_CardTool.qml+13−5

@@ -237,7 +237,7 @@ Rectangle {

237

238 UT.UnityTestCase {

239 id: testCase

240− name: "Card"

240+ name: "CardTool"

241

242 property var internalCard: findChild(cardTool, "cardToolCard")

243

@@ -272,10 +272,18 @@ Rectangle {

272 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},

273 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},

274 { tag: "PortraitCarousel", width: units.gu(22), height: units.gu(44), viewWidth: 84, index: 10, layout_index: 4},

275− { tag: "SmallHorizontalList", width: units.gu(18), height: units.gu(39.5), viewWidth: 30, index: 0, layout_index: 5},

275+ { tag: "SmallHorizontalList", width: units.gu(18),

276+ height: function() { return internalCard ? internalCard.height : 0 },

277+ viewWidth: 30, index: 0, layout_index: 5 },

276− { tag: "MediumHorizontalList", width: units.gu(22), height: units.gu(43.5), viewWidth: 84, index: 0, layout_index: 5},

278+ { tag: "MediumHorizontalList", width: units.gu(22),

279+ height: function() { return internalCard ? internalCard.height : 0 },

280+ viewWidth: 84, index: 0, layout_index: 5 },

277− { tag: "LargeHorizontalList", width: units.gu(26), height: units.gu(47.5), viewWidth: 140, index: 0, layout_index: 5},

281+ { tag: "LargeHorizontalList", width: units.gu(26),

282+ height: function() { return internalCard ? internalCard.height : 0 },

283+ viewWidth: 140, index: 0, layout_index: 5 },

278− { tag: "PortraitHorizontalList", width: units.gu(22), height: units.gu(65.5), viewWidth: 84, index: 10, layout_index: 5},

284+ { tag: "PortraitHorizontalList", width: units.gu(22),

285+ height: function() { return internalCard ? internalCard.height : 0 },

286+ viewWidth: 84, index: 10, layout_index: 5 },

279 ]

287 ]

280 }

288 }

281

289

tests/qmltests/Dash/tst_Dash.qml+2−1

@@ -127,8 +127,9 @@ Item {

127 tryCompare(scopes, "loaded", true);

128 var dashContentList = findChild(dash, "dashContentList");

129 tryCompare(dashContentList, "count", 6);

130+ tryCompareFunction(function() { return findChild(dash, "MockScope1 loader") != null; }, true);

130 var mockScope1Loader = findChild(dash, "MockScope1 loader");

131 var mockScope1Loader = findChild(dash, "MockScope1 loader");

131− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);

132+ tryCompare(mockScope1Loader, "status", Loader.Ready);

132

133

133 // Show the overview

134 // Show the overview

134 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

135 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

tests/qmltests/Dash/tst_GenericScopeView.qml+51−20

@@ -76,6 +76,20 @@ Item {

76 spy.signalName = "";

77 }

78

79+ function scrollToCategory(category) {

80+ var categoryListView = findChild(genericScopeView, "categoryListView");

81+ tryCompareFunction(function() {

82+ if (findChild(genericScopeView, category)) return true;

83+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

84+ genericScopeView.width/2, genericScopeView.y)

85+ tryCompare(categoryListView, "moving", false);

86+ return findChild(genericScopeView, category) !== null;

87+ }, true);

88+

89+ tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);

90+ return findChild(genericScopeView, category);

91+ }

92+

79 function test_isActive() {

93 function test_isActive() {

80 tryCompare(genericScopeView.scope, "isActive", false)

94 tryCompare(genericScopeView.scope, "isActive", false)

81 genericScopeView.isCurrent = true

95 genericScopeView.isCurrent = true

@@ -222,12 +236,7 @@ Item {

222 }

236 }

223

237

224 function test_forced_category_expansion() {

238 function test_forced_category_expansion() {

225− tryCompareFunction(function() {

226− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

227− genericScopeView.width/2, genericScopeView.y)

228− return findChild(genericScopeView, "dashCategory19") !== null;

229− }, true);

230− var category = findChild(genericScopeView, "dashCategory19")

239+ var category = scrollToCategory("dashCategory19");

231 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");

240 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");

232

241

233 var grid = findChild(category, "19");

242 var grid = findChild(category, "19");

@@ -285,20 +294,13 @@ Item {

285 }

294 }

286

295

287 function test_showPreviewCarousel() {

296 function test_showPreviewCarousel() {

288− tryCompareFunction(function() {

297+ var category = scrollToCategory("dashCategory1");

289− var dashCategory1 = findChild(genericScopeView, "dashCategory1");

290− if (dashCategory1 != null) {

291− var tile = findChild(dashCategory1, "carouselDelegate1");

292− return tile != null;

293− }

294− return false;

295− },

296− true);

297

298

298 tryCompare(testCase.previewListView, "open", false);

299 tryCompare(testCase.previewListView, "open", false);

299

300

300− var dashCategory1 = findChild(genericScopeView, "dashCategory1");

301− var tile = findChild(dashCategory1, "carouselDelegate1");

301+ var tile = findChild(category, "carouselDelegate1");

302+ verify(tile, "Could not find delegate");

303+

302 mouseClick(tile, tile.width / 2, tile.height / 2);

304 mouseClick(tile, tile.width / 2, tile.height / 2);

303 tryCompare(tile, "explicitlyScaled", true);

305 tryCompare(tile, "explicitlyScaled", true);

304 mouseClick(tile, tile.width / 2, tile.height / 2);

306 mouseClick(tile, tile.width / 2, tile.height / 2);

@@ -306,6 +308,35 @@ Item {

306 tryCompare(testCase.previewListView, "x", 0);

308 tryCompare(testCase.previewListView, "x", 0);

307

309

308 closePreview();

310 closePreview();

311+

312+ mousePress(tile, tile.width / 2, tile.height / 2);

313+ tryCompare(testCase.previewListView, "open", true);

314+ tryCompare(testCase.previewListView, "x", 0);

315+ mouseRelease(tile, tile.width / 2, tile.height / 2);

316+

317+ closePreview();

318+ }

319+

320+ function test_showPreviewHorizontalList() {

321+ var category = scrollToCategory("dashCategory18");

322+

323+ tryCompare(testCase.previewListView, "open", false);

324+

325+ var tile = findChild(category, "delegate1");

326+ verify(tile, "Could not find delegate");

327+

328+ mouseClick(tile, tile.width / 2, tile.height / 2);

329+ tryCompare(testCase.previewListView, "open", true);

330+ tryCompare(testCase.previewListView, "x", 0);

331+

332+ closePreview();

333+

334+ mousePress(tile, tile.width / 2, tile.height / 2);

335+ tryCompare(testCase.previewListView, "open", true);

336+ tryCompare(testCase.previewListView, "x", 0);

337+ mouseRelease(tile, tile.width / 2, tile.height / 2);

338+

339+ closePreview();

309 }

340 }

310

341

311 function test_previewCycle() {

342 function test_previewCycle() {

@@ -333,10 +364,10 @@ Item {

333

364

334 function test_header_style_data() {

365 function test_header_style_data() {

335 return [

366 return [

336− { tag: "Default", index: 0, foreground: "grey", background: "", logo: "" },

367+ { tag: "Default", index: 0, foreground: Theme.palette.normal.baseText, background: "", logo: "" },

337 { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },

368 { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },

338− { tag: "Logo+Background", index: 2, foreground: "grey", background: "gradient:///lightgrey/grey",

369+ { tag: "Logo+Background", index: 2, foreground: Theme.palette.normal.baseText, background: "gradient:///lightgrey/grey",

339− logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },

370+ logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },

340 ];

371 ];

341 }

372 }

342

373

tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qmlrenamed+2−2

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

17import QtQuick 2.0

18import QtTest 1.0

19import ".."

20−import "../../../qml/Components"

20+import "../../../qml/Dash"

21import Ubuntu.Components 0.1

22import Unity 0.2

23import Unity.Test 0.1 as UT

@@ -242,7 +242,7 @@ Item {

242 searchEntryEnabled: true

243 title: "%^$%^%^&%^&%^$%GHR%"

244 scopeStyle: QtObject {

245− readonly property color foreground: "grey"

245+ readonly property color foreground: Theme.palette.normal.baseText

246 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""

247 }

248 showBackButton: showBackButtonCheckBox.checked

tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg → tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svgrenamed

The content is the same.

tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qmlnew file+137

@@ -0,0 +1,137 @@

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.0

18+import QtTest 1.0

19+import Unity.Test 0.1 as UT

20+import QMenuModel 0.1

21+import Unity.Indicators 0.1 as Indicators

22+import "../../../../qml/Panel/Indicators"

23+

24+Item {

25+ id: root

26+ width: units.gu(40)

27+ height: units.gu(70)

28+

29+ Component {

30+ id: model

31+ CachedUnityMenuModel {}

32+ }

33+

34+ UT.UnityTestCase {

35+ name: "CachedUnityMenuModel"

36+ when: windowShown

37+

38+ function cleanup() {

39+ doGC();

40+ }

41+

42+ function doGC() {

43+ // need to put some wait cycles here to get gc going properly.

44+ wait(10);

45+ gc();

46+ wait(10);

47+ }

48+

49+ function test_createDifferent() {

50+ var cachedObject = model.createObject(null,

51+ {

52+ "busName": "com.canonical.test1",

53+ "menuObjectPath": "/com/canonical/test1",

54+ "actionsObjectPath": "/com/canonical/test1"

55+ });

56+

57+ var cachedObject2 = model.createObject(null,

58+ {

59+ "busName": "com.canonical.test2",

60+ "menuObjectPath": "/com/canonical/test2",

61+ "actionsObjectPath": "/com/canonical/test2"

62+ });

63+

64+ verify(cachedObject.model !== cachedObject2.model);

65+ }

66+

67+ function test_createSame() {

68+ var cachedObject = model.createObject(null,

69+ {

70+ "busName": "com.canonical.test3",

71+ "menuObjectPath": "/com/canonical/test3",

72+ "actionsObjectPath": "/com/canonical/test3"

73+ });

74+

75+ var cachedObject2 = model.createObject(null,

76+ {

77+ "busName": "com.canonical.test3",

78+ "menuObjectPath": "/com/canonical/test3",

79+ "actionsObjectPath": "/com/canonical/test3"

80+ });

81+

82+ verify(cachedObject.model === cachedObject2.model);

83+ }

84+

85+ // Tests that changing cached model data does not change the model path of others

86+ function test_lp1328646() {

87+ var cachedObject = model.createObject(null,

88+ {

89+ "busName": "com.canonical.test4",

90+ "menuObjectPath": "/com/canonical/test4",

91+ "actionsObjectPath": "/com/canonical/test4"

92+ });

93+

94+ var cachedObject2 = model.createObject(null,

95+ {

96+ "busName": "com.canonical.test4",

97+ "menuObjectPath": "/com/canonical/test4",

98+ "actionsObjectPath": "/com/canonical/test4"

99+ });

100+

101+ cachedObject.menuObjectPath = "/com/canonical/test5";

102+ compare(cachedObject.model.menuObjectPath, "/com/canonical/test5");

103+ compare(cachedObject2.model.menuObjectPath, "/com/canonical/test4");

104+

105+ verify(cachedObject.model !== cachedObject2.model);

106+ }

107+

108+ function createAndDestroy(test) {

109+ var cachedObject = model.createObject(null,

110+ {

111+ "busName": "com.canonical."+test,

112+ "menuObjectPath": "/com/canonical/"+test,

113+ "actionsObjectPath": "/com/canonical/"+test

114+ });

115+ var cachedObject2 = model.createObject(null,

116+ {

117+ "busName": "com.canonical."+test,

118+ "menuObjectPath": "/com/canonical/"+test,

119+ "actionsObjectPath": "/com/canonical/"+test

120+ });

121+ cachedObject.destroy();

122+ return cachedObject2;

123+ }

124+

125+ function test_destroyAllDeletesModel() {

126+ createAndDestroy("test6");

127+ doGC();

128+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);

129+ }

130+

131+ function test_destroyPartialKeepsModel() {

132+ var model = createAndDestroy("test7");

133+ doGC();

134+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test7"), true);

135+ }

136+ }

137+}