git.iko.soy/unity8
on xenial help sign in
merge trunk
commit7fc36d65055688fb60bd5afa0f18c0a6a5b37051 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 24 Jul 2014, 12:38 (12 years ago) parent5a05204b6247b4
9 files changed+116−84
compare with xenial
unifiedsplit
debian/changelog+7 debian/control+5−1 debian/rules+7 plugins/Ubuntu/Payments/CMakeLists.txt+1−1 po/da.po+52−49 po/hu.po+16−16 po/is.po+22−17 tests/mocks/libusermetrics/UserMetrics.cpp+3 tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
debian/changelog+7
@@ -12,6 +12,13 @@ unity8 (8.00) UNRELEASED; urgency=medium
1212
1313 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
1414
15+unity8 (7.90+14.10.20140723.4-0ubuntu1) utopic; urgency=low
16+
17+ [ thomas-voss ]
18+ * Explicitly select gcc version.
19+
20+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 23 Jul 2014 15:32:41 +0000
21+
1522unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
1623
1724 [ Michael Terry ]
debian/control+5−1
@@ -7,6 +7,10 @@ Build-Depends: cmake,
77 debhelper (>= 9),
88 doxyqml,
99 graphviz,
10+# We rely on C++11 features, and to prevent from ABI breaks
11+# in libstdc++ causing us issues, we explicitly select a G++
12+# version.
13+ g++-4.9,
1014 libdee-qt5-dev (>= 3.2),
1115 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1216 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
1519 libgsettings-qt-dev,
1620 libhardware-dev,
1721 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
1923 libpulse-dev,
2024 libqmenumodel-dev (>= 0.2.8),
2125 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
11#!/usr/bin/make -f
22# -*- makefile -*-
33
4+include /usr/share/dpkg/default.mk
5+
46# Uncomment this to turn on verbose mode.
57#export DH_VERBOSE=1
68export DPKG_GENSYMBOLS_CHECK_LEVEL=4
79export NO_PNG_PKG_MANGLE=1
810
11+# Explicitly selecting a G{CC,++}-version here to avoid accidental
12+# ABI breaks introduced by toolchain updates.
13+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
14+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
15+
916%:
1017 dh $@ --parallel --fail-missing --with python2,python3
1118
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
1414
1515add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
1616
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
1818add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
1919
2020target_link_libraries(Payments ${LIBPAY_LDFLAGS})
po/da.po+52−49
@@ -1,199 +1,202 @@
11# Danish translation for unity8
22# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
33# This file is distributed under the same license as the unity8 package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
4+#
5+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2014.
56#
67msgid ""
78msgstr ""
89"Project-Id-Version: unity8\n"
910"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1011"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 20:16+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13−"Language-Team: Danish <da@li.org>\n"
12+"PO-Revision-Date: 2014-07-22 15:46+0000\n"
13+"Last-Translator: Kenneth Ramsussen <kentora@kentora.dk>\n"
14+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
1415"MIME-Version: 1.0\n"
1516"Content-Type: text/plain; charset=UTF-8\n"
1617"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:36+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Launchpad-Export-Date: 2014-07-23 07:01+0000\n"
19+"X-Generator: Launchpad (build 17114)\n"
1920
2021#: plugins/Unity/Launcher/launcheritem.cpp:43
2122#: plugins/Unity/Launcher/launcheritem.cpp:73
2223msgid "Pin shortcut"
23−msgstr ""
24+msgstr "Fastgør genvej"
2425
2526#: plugins/Unity/Launcher/launcheritem.cpp:73
2627msgid "Unpin shortcut"
27−msgstr ""
28+msgstr "Gør genvej flytbar"
2829
2930#: qml/Components/EdgeDemoOverlay.qml:151
3031msgid "Skip intro"
31−msgstr ""
32+msgstr "Spring intro over"
3233
3334#: qml/Components/EdgeDemo.qml:113
3435msgid "Right edge"
35−msgstr ""
36+msgstr "Højre kant"
3637
3738#: qml/Components/EdgeDemo.qml:114
3839msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
40+msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
4041
4142#: qml/Components/EdgeDemo.qml:145
4243msgid "Top edge"
43−msgstr ""
44+msgstr "Øvre kant"
4445
4546#: qml/Components/EdgeDemo.qml:146
4647msgid "Try swiping from the top edge to access the indicators"
47−msgstr ""
48+msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
4849
4950#: qml/Components/EdgeDemo.qml:171
5051msgid "Close"
51−msgstr ""
52+msgstr "Luk"
5253
5354#: qml/Components/EdgeDemo.qml:172
5455msgid "Swipe up again to close the settings screen"
55−msgstr ""
56+msgstr "Stryg op igen for at låse indstillingsskærmen"
5657
5758#: qml/Components/EdgeDemo.qml:199
5859msgid "Left edge"
59−msgstr ""
60+msgstr "Venstre kant"
6061
6162#: qml/Components/EdgeDemo.qml:200
6263msgid "Swipe from the left to reveal the launcher for quick access to apps"
63−msgstr ""
64+msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
6465
6566#: qml/Components/EdgeDemo.qml:227
6667msgid "Well done"
67−msgstr ""
68+msgstr "Godt gjort"
6869
6970#: qml/Components/EdgeDemo.qml:228
7071msgid ""
7172"You have now mastered the edge gestures and can start using the "
7273"phone<br><br>Tap on the screen to start"
7374msgstr ""
75+"Du mestrer nu kantgestusserne og kan begynde at bruge telefonen<br><br>Tryk "
76+"på skærmen for at starte"
7477
7578#: qml/Components/Lockscreen.qml:214
7679msgid "Emergency Call"
77−msgstr ""
80+msgstr "Nødopkald"
7881
7982#: qml/Components/Lockscreen.qml:231
8083msgid "OK"
81−msgstr ""
84+msgstr "O.k."
8285
8386#: qml/Components/PageHeader.qml:366
8487msgid "Recent searches"
85−msgstr ""
88+msgstr "Seneste søgninger"
8689
8790#: qml/Components/PassphraseLockscreen.qml:60
8891#, qt-format
8992msgid "Hello %1"
90−msgstr ""
93+msgstr "Hej %1"
9194
9295#: qml/Components/PassphraseLockscreen.qml:60
9396msgid "Hello"
94−msgstr ""
97+msgstr "Hej"
9598
9699#: qml/Components/PinLockscreen.qml:198
97100msgid "CANCEL"
98−msgstr ""
101+msgstr "ANNULLÉR"
99102
100103#: qml/Components/PinLockscreen.qml:216
101104msgid "DONE"
102−msgstr ""
105+msgstr "FÆRDIG"
103106
104107#: qml/Components/SeeMore.qml:35
105108msgid "See more"
106−msgstr ""
109+msgstr "Vis mere"
107110
108111#: qml/Components/SeeMore.qml:58
109112msgid "See less"
110−msgstr ""
113+msgstr "Vis mindre"
111114
112115#: qml/Dash/DashApps.qml:37
113116msgid "Recent"
114−msgstr ""
117+msgstr "Seneste"
115118
116119#: qml/Dash/Previews/PreviewActionCombo.qml:34
117120msgid "More..."
118−msgstr ""
121+msgstr "Mere..."
119122
120123#: qml/Dash/Previews/PreviewActionCombo.qml:34
121124msgid "Less..."
122−msgstr ""
125+msgstr "Mindre..."
123126
124127#: qml/Dash/Previews/PreviewRatingInput.qml:82
125128msgid "Rate this"
126−msgstr ""
129+msgstr "Bedøm dette"
127130
128131#: qml/Dash/Previews/PreviewRatingInput.qml:128
129132msgid "Add a review"
130−msgstr ""
133+msgstr "Tilføj en forhåndsvisning"
131134
132135#: qml/Dash/Previews/PreviewRatingInput.qml:168
133136msgid "Send"
134−msgstr ""
137+msgstr "Send"
135138
136139#: qml/Greeter/Greeter.qml:157
137140msgid "Swipe to unlock"
138−msgstr ""
141+msgstr "Stryg for at låse op"
139142
140143#: qml/Hud/HudParametrizedActionsPage.qml:132
141144msgid "Confirm"
142−msgstr ""
145+msgstr "Bekræft"
143146
144147#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
145148msgid "Type or say a command"
146−msgstr ""
149+msgstr "Skriv eller indtal en kommando"
147150
148151#: qml/Hud/Hud.qml:84
149152msgid "Loading. Please Wait..."
150−msgstr ""
153+msgstr "Indlæser. Vent venligst..."
151154
152155#: qml/Hud/Hud.qml:89
153156msgid "Speak Now..."
154−msgstr ""
157+msgstr "Tal nu..."
155158
156159#: qml/Hud/Hud.qml:94
157160msgid "Speaking..."
158−msgstr ""
161+msgstr "Taler..."
159162
160163#: qml/Notifications/NotificationMenuItemFactory.qml:91
161164msgid "Show password"
162−msgstr ""
165+msgstr "Vis adgangskode"
163166
164167#: qml/Notifications/NotificationMenuItemFactory.qml:103
165168msgid "Please enter SIM PIN"
166−msgstr ""
169+msgstr "Indtast venligst PIN for SIM"
167170
168171#: qml/Panel/Indicators/MenuItemFactory.qml:583
169172msgid "In queue…"
170−msgstr ""
173+msgstr "I kø…"
171174
172175#: qml/Panel/Indicators/MenuItemFactory.qml:587
173176msgid "Downloading"
174−msgstr ""
177+msgstr "Henter"
175178
176179#: qml/Panel/Indicators/MenuItemFactory.qml:589
177180msgid "Paused, tap to resume"
178−msgstr ""
181+msgstr "På pause; tryk for at fortsætte"
179182
180183#: qml/Panel/Indicators/MenuItemFactory.qml:591
181184msgid "Canceled"
182−msgstr ""
185+msgstr "Annulleret"
183186
184187#: qml/Panel/Indicators/MenuItemFactory.qml:593
185188msgid "Finished"
186−msgstr ""
189+msgstr "Færdig"
187190
188191#: qml/Panel/Indicators/MenuItemFactory.qml:595
189192msgid "Failed, tap to retry"
190−msgstr ""
193+msgstr "Mislykkedes; tryk for at prøve igen"
191194
192195#: qml/Panel/SearchIndicator.qml:27
193196msgid "Search"
194−msgstr ""
197+msgstr "Søg"
195198
196199#: qml/Shell.qml:359
197200#, qt-format
198201msgid "Please enter %1"
199−msgstr ""
202+msgstr "Indtast venligst %1"
po/hu.po+16−16
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 23:02+0000\n"
12−"Last-Translator: Kristóf Kiszel <Unknown>\n"
11+"PO-Revision-Date: 2014-07-23 10:07+0000\n"
12+"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -80,7 +80,7 @@ msgstr "Vészhívás"
8080
8181#: qml/Components/Lockscreen.qml:231
8282msgid "OK"
83−msgstr ""
83+msgstr "OK"
8484
8585#: qml/Components/PageHeader.qml:366
8686msgid "Recent searches"
@@ -97,11 +97,11 @@ msgstr "Szia"
9797
9898#: qml/Components/PinLockscreen.qml:198
9999msgid "CANCEL"
100−msgstr ""
100+msgstr "MÉGSE"
101101
102102#: qml/Components/PinLockscreen.qml:216
103103msgid "DONE"
104−msgstr ""
104+msgstr "KÉSZ"
105105
106106#: qml/Components/SeeMore.qml:35
107107msgid "See more"
@@ -113,15 +113,15 @@ msgstr ""
113113
114114#: qml/Dash/DashApps.qml:37
115115msgid "Recent"
116−msgstr ""
116+msgstr "Legutóbbi"
117117
118118#: qml/Dash/Previews/PreviewActionCombo.qml:34
119119msgid "More..."
120−msgstr ""
120+msgstr "Több…"
121121
122122#: qml/Dash/Previews/PreviewActionCombo.qml:34
123123msgid "Less..."
124−msgstr ""
124+msgstr "Kevesebb…"
125125
126126#: qml/Dash/Previews/PreviewRatingInput.qml:82
127127msgid "Rate this"
@@ -165,7 +165,7 @@ msgstr "Jelszó megjelenítése"
165165
166166#: qml/Notifications/NotificationMenuItemFactory.qml:103
167167msgid "Please enter SIM PIN"
168−msgstr ""
168+msgstr "Adja meg a SIM PIN kódját"
169169
170170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171171msgid "In queue…"
@@ -173,23 +173,23 @@ msgstr ""
173173
174174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175175msgid "Downloading"
176−msgstr ""
176+msgstr "Letöltés"
177177
178178#: qml/Panel/Indicators/MenuItemFactory.qml:589
179179msgid "Paused, tap to resume"
180−msgstr ""
180+msgstr "Szüneteltetve, koppintson a folytatáshoz"
181181
182182#: qml/Panel/Indicators/MenuItemFactory.qml:591
183183msgid "Canceled"
184−msgstr ""
184+msgstr "Megszakítva"
185185
186186#: qml/Panel/Indicators/MenuItemFactory.qml:593
187187msgid "Finished"
188−msgstr ""
188+msgstr "Befejeződött"
189189
190190#: qml/Panel/Indicators/MenuItemFactory.qml:595
191191msgid "Failed, tap to retry"
192−msgstr ""
192+msgstr "Sikertelen, koppintson az újrapróbáláshoz"
193193
194194#: qml/Panel/SearchIndicator.qml:27
195195msgid "Search"
po/is.po+22−17
@@ -1,30 +1,33 @@
1+# translation of po_unity8-is.po to icelandic
12# Icelandic translation for unity8
23# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
34# This file is distributed under the same license as the unity8 package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
55#
6+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
7+# Sveinn í Felli <sv1@fellsnet.is>, 2014.
68msgid ""
79msgstr ""
8−"Project-Id-Version: unity8\n"
10+"Project-Id-Version: po_unity8-is\n"
911"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1012"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-18 11:20+0000\n"
13+"PO-Revision-Date: 2014-07-23 05:57+0000\n"
1214"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
13−"Language-Team: Icelandic <is@li.org>\n"
15+"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
1416"MIME-Version: 1.0\n"
1517"Content-Type: text/plain; charset=UTF-8\n"
1618"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
1820"X-Generator: Launchpad (build 17114)\n"
21+"Language: is\n"
1922
2023#: plugins/Unity/Launcher/launcheritem.cpp:43
2124#: plugins/Unity/Launcher/launcheritem.cpp:73
2225msgid "Pin shortcut"
23−msgstr ""
26+msgstr "Pinna flýtilykil"
2427
2528#: plugins/Unity/Launcher/launcheritem.cpp:73
2629msgid "Unpin shortcut"
27−msgstr ""
30+msgstr "Losa flýtilykil"
2831
2932#: qml/Components/EdgeDemoOverlay.qml:151
3033msgid "Skip intro"
@@ -37,7 +40,7 @@ msgstr "Hægri brún"
3740#: qml/Components/EdgeDemo.qml:114
3841msgid "Try swiping from the right edge to unlock the phone"
3942msgstr ""
40−"Prufaðu að renna puttanum frá hægri brúninni til að aflæsa símanum þínum."
43+"Prófaðu að strjúka fingrinum frá hægri brúninni til að aflæsa símanum þínum."
4144
4245#: qml/Components/EdgeDemo.qml:145
4346msgid "Top edge"
@@ -45,7 +48,7 @@ msgstr "Efri brún"
4548
4649#: qml/Components/EdgeDemo.qml:146
4750msgid "Try swiping from the top edge to access the indicators"
48−msgstr "Reyndu að renna frá toppi til að fá aðgang að tilkynningum"
51+msgstr "Reyndu að strjúka frá toppi til að fá aðgang að tilkynningum"
4952
5053#: qml/Components/EdgeDemo.qml:171
5154msgid "Close"
@@ -53,7 +56,7 @@ msgstr "Loka"
5356
5457#: qml/Components/EdgeDemo.qml:172
5558msgid "Swipe up again to close the settings screen"
56−msgstr "Renndu upp til að loka stillingum"
59+msgstr "Strjúktu upp til að loka stillingum"
5760
5861#: qml/Components/EdgeDemo.qml:199
5962msgid "Left edge"
@@ -61,7 +64,7 @@ msgstr "Vinstri brún"
6164
6265#: qml/Components/EdgeDemo.qml:200
6366msgid "Swipe from the left to reveal the launcher for quick access to apps"
64−msgstr "Renndu frá vinstri til að afhjúpa flýtiræsi forrita"
67+msgstr "Strjúktu frá vinstri til að afhjúpa flýtiræsi forrita"
6568
6669#: qml/Components/EdgeDemo.qml:227
6770msgid "Well done"
@@ -72,6 +75,8 @@ msgid ""
7275"You have now mastered the edge gestures and can start using the "
7376"phone<br><br>Tap on the screen to start"
7477msgstr ""
78+"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
79+"símann<br><br>Sláðu létt á skjáinn til að byrja"
7580
7681#: qml/Components/Lockscreen.qml:214
7782msgid "Emergency Call"
@@ -136,7 +141,7 @@ msgstr "Senda"
136141
137142#: qml/Greeter/Greeter.qml:157
138143msgid "Swipe to unlock"
139−msgstr "Strjóka til að aflæsa"
144+msgstr "Strjúka til að aflæsa"
140145
141146#: qml/Hud/HudParametrizedActionsPage.qml:132
142147msgid "Confirm"
@@ -144,15 +149,15 @@ msgstr "Staðfesta"
144149
145150#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
146151msgid "Type or say a command"
147−msgstr "Skrifaðu eða segðu eitthvað"
152+msgstr "Skrifaðu eða segðu skipun"
148153
149154#: qml/Hud/Hud.qml:84
150155msgid "Loading. Please Wait..."
151−msgstr "Hleð. Vinsamlegast Bíðið..."
156+msgstr "Hleð. Bíddu aðeins..."
152157
153158#: qml/Hud/Hud.qml:89
154159msgid "Speak Now..."
155−msgstr "Talaðu Núna..."
160+msgstr "Tala núna..."
156161
157162#: qml/Hud/Hud.qml:94
158163msgid "Speaking..."
@@ -176,7 +181,7 @@ msgstr "Sæki"
176181
177182#: qml/Panel/Indicators/MenuItemFactory.qml:589
178183msgid "Paused, tap to resume"
179−msgstr ""
184+msgstr "Í bið, sláðu létt til að halda áfram"
180185
181186#: qml/Panel/Indicators/MenuItemFactory.qml:591
182187msgid "Canceled"
@@ -188,7 +193,7 @@ msgstr "Lokið"
188193
189194#: qml/Panel/Indicators/MenuItemFactory.qml:595
190195msgid "Failed, tap to retry"
191−msgstr ""
196+msgstr "Mistókst, sláðu létt til að reyna aftur"
192197
193198#: qml/Panel/SearchIndicator.qml:27
194199msgid "Search"
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
2424#include <QtGui/QIcon>
2525#include <QMultiMap>
2626
27+#include <functional>
28+#include <random>
29+
2730using namespace UserMetricsOutput;
2831
2932namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
2424#include <QDebug>
2525#include <unitymenumodel.h>
2626
27+#include <functional>
28+#include <chrono>
29+
2730class UnityMenuModelStackTest : public QObject
2831{
2932 Q_OBJECT