git.iko.soy/unity8
on xenial help sign in
merge prereq
2295f15Michael Zanetti
debian/changelog+7
compare with xenial
unifiedsplit
@@ -12,6 +12,13 @@ unity8 (8.00) UNRELEASED; urgency=medium
12
12
13 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
13 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
14
14
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+
15unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
22unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
16
23
17 [ Michael Terry ]
24 [ Michael Terry ]
debian/control+5−1
@@ -7,6 +7,10 @@ Build-Depends: cmake,
7 debhelper (>= 9),
7 debhelper (>= 9),
8 doxyqml,
8 doxyqml,
9 graphviz,
9 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,
10 libdee-qt5-dev (>= 3.2),
14 libdee-qt5-dev (>= 3.2),
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
15 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
12 libgl1-mesa-dri,
16 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
15 libgsettings-qt-dev,
19 libgsettings-qt-dev,
16 libhardware-dev,
20 libhardware-dev,
17 libhud-client2-dev,
21 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
19 libpulse-dev,
23 libpulse-dev,
20 libqmenumodel-dev (>= 0.2.8),
24 libqmenumodel-dev (>= 0.2.8),
21 libqt5xmlpatterns5-dev,
25 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
1#!/usr/bin/make -f
1#!/usr/bin/make -f
2# -*- makefile -*-
2# -*- makefile -*-
3
3
4+include /usr/share/dpkg/default.mk
5+
4# Uncomment this to turn on verbose mode.
6# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
7#export DH_VERBOSE=1
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
8export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7export NO_PNG_PKG_MANGLE=1
9export NO_PNG_PKG_MANGLE=1
8
10
11+# Explicitly selecting a G{CC,++}-version here to avoid accidental
12+# ABI breaks introduced by toolchain updates.
13+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
14+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
15+
9%:
16%:
10 dh $@ --parallel --fail-missing --with python2,python3
17 dh $@ --parallel --fail-missing --with python2,python3
11
18
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
14
14
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
16
16
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
19
19
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
po/da.po+52−49
@@ -1,199 +1,202 @@
1# Danish translation for unity8
1# Danish translation for unity8
2# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
2# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3# This file is distributed under the same license as the unity8 package.
3# 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.
5#
6#
6msgid ""
7msgid ""
7msgstr ""
8msgstr ""
8"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 20:16+0000\n"
12+"PO-Revision-Date: 2014-07-22 15:46+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Last-Translator: Kenneth Ramsussen <kentora@kentora.dk>\n"
13−"Language-Team: Danish <da@li.org>\n"
14+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"MIME-Version: 1.0\n"
15"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-07-23 07:01+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
19+"X-Generator: Launchpad (build 17114)\n"
19
20
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
23msgid "Pin shortcut"
23−msgstr ""
24+msgstr "Fastgør genvej"
24
25
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
27msgid "Unpin shortcut"
27−msgstr ""
28+msgstr "Gør genvej flytbar"
28
29
29#: qml/Components/EdgeDemoOverlay.qml:151
30#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
31msgid "Skip intro"
31−msgstr ""
32+msgstr "Spring intro over"
32
33
33#: qml/Components/EdgeDemo.qml:113
34#: qml/Components/EdgeDemo.qml:113
34msgid "Right edge"
35msgid "Right edge"
35−msgstr ""
36+msgstr "Højre kant"
36
37
37#: qml/Components/EdgeDemo.qml:114
38#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
39msgid "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"
40
41
41#: qml/Components/EdgeDemo.qml:145
42#: qml/Components/EdgeDemo.qml:145
42msgid "Top edge"
43msgid "Top edge"
43−msgstr ""
44+msgstr "Øvre kant"
44
45
45#: qml/Components/EdgeDemo.qml:146
46#: qml/Components/EdgeDemo.qml:146
46msgid "Try swiping from the top edge to access the indicators"
47msgid "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"
48
49
49#: qml/Components/EdgeDemo.qml:171
50#: qml/Components/EdgeDemo.qml:171
50msgid "Close"
51msgid "Close"
51−msgstr ""
52+msgstr "Luk"
52
53
53#: qml/Components/EdgeDemo.qml:172
54#: qml/Components/EdgeDemo.qml:172
54msgid "Swipe up again to close the settings screen"
55msgid "Swipe up again to close the settings screen"
55−msgstr ""
56+msgstr "Stryg op igen for at låse indstillingsskærmen"
56
57
57#: qml/Components/EdgeDemo.qml:199
58#: qml/Components/EdgeDemo.qml:199
58msgid "Left edge"
59msgid "Left edge"
59−msgstr ""
60+msgstr "Venstre kant"
60
61
61#: qml/Components/EdgeDemo.qml:200
62#: qml/Components/EdgeDemo.qml:200
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgid "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"
64
65
65#: qml/Components/EdgeDemo.qml:227
66#: qml/Components/EdgeDemo.qml:227
66msgid "Well done"
67msgid "Well done"
67−msgstr ""
68+msgstr "Godt gjort"
68
69
69#: qml/Components/EdgeDemo.qml:228
70#: qml/Components/EdgeDemo.qml:228
70msgid ""
71msgid ""
71"You have now mastered the edge gestures and can start using the "
72"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
73"phone<br><br>Tap on the screen to start"
73msgstr ""
74msgstr ""
75+"Du mestrer nu kantgestusserne og kan begynde at bruge telefonen<br><br>Tryk "
76+"på skærmen for at starte"
74
77
75#: qml/Components/Lockscreen.qml:214
78#: qml/Components/Lockscreen.qml:214
76msgid "Emergency Call"
79msgid "Emergency Call"
77−msgstr ""
80+msgstr "Nødopkald"
78
81
79#: qml/Components/Lockscreen.qml:231
82#: qml/Components/Lockscreen.qml:231
80msgid "OK"
83msgid "OK"
81−msgstr ""
84+msgstr "O.k."
82
85
83#: qml/Components/PageHeader.qml:366
86#: qml/Components/PageHeader.qml:366
84msgid "Recent searches"
87msgid "Recent searches"
85−msgstr ""
88+msgstr "Seneste søgninger"
86
89
87#: qml/Components/PassphraseLockscreen.qml:60
90#: qml/Components/PassphraseLockscreen.qml:60
88#, qt-format
91#, qt-format
89msgid "Hello %1"
92msgid "Hello %1"
90−msgstr ""
93+msgstr "Hej %1"
91
94
92#: qml/Components/PassphraseLockscreen.qml:60
95#: qml/Components/PassphraseLockscreen.qml:60
93msgid "Hello"
96msgid "Hello"
94−msgstr ""
97+msgstr "Hej"
95
98
96#: qml/Components/PinLockscreen.qml:198
99#: qml/Components/PinLockscreen.qml:198
97msgid "CANCEL"
100msgid "CANCEL"
98−msgstr ""
101+msgstr "ANNULLÉR"
99
102
100#: qml/Components/PinLockscreen.qml:216
103#: qml/Components/PinLockscreen.qml:216
101msgid "DONE"
104msgid "DONE"
102−msgstr ""
105+msgstr "FÆRDIG"
103
106
104#: qml/Components/SeeMore.qml:35
107#: qml/Components/SeeMore.qml:35
105msgid "See more"
108msgid "See more"
106−msgstr ""
109+msgstr "Vis mere"
107
110
108#: qml/Components/SeeMore.qml:58
111#: qml/Components/SeeMore.qml:58
109msgid "See less"
112msgid "See less"
110−msgstr ""
113+msgstr "Vis mindre"
111
114
112#: qml/Dash/DashApps.qml:37
115#: qml/Dash/DashApps.qml:37
113msgid "Recent"
116msgid "Recent"
114−msgstr ""
117+msgstr "Seneste"
115
118
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
119#: qml/Dash/Previews/PreviewActionCombo.qml:34
117msgid "More..."
120msgid "More..."
118−msgstr ""
121+msgstr "Mere..."
119
122
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
123#: qml/Dash/Previews/PreviewActionCombo.qml:34
121msgid "Less..."
124msgid "Less..."
122−msgstr ""
125+msgstr "Mindre..."
123
126
124#: qml/Dash/Previews/PreviewRatingInput.qml:82
127#: qml/Dash/Previews/PreviewRatingInput.qml:82
125msgid "Rate this"
128msgid "Rate this"
126−msgstr ""
129+msgstr "Bedøm dette"
127
130
128#: qml/Dash/Previews/PreviewRatingInput.qml:128
131#: qml/Dash/Previews/PreviewRatingInput.qml:128
129msgid "Add a review"
132msgid "Add a review"
130−msgstr ""
133+msgstr "Tilføj en forhåndsvisning"
131
134
132#: qml/Dash/Previews/PreviewRatingInput.qml:168
135#: qml/Dash/Previews/PreviewRatingInput.qml:168
133msgid "Send"
136msgid "Send"
134−msgstr ""
137+msgstr "Send"
135
138
136#: qml/Greeter/Greeter.qml:157
139#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
140msgid "Swipe to unlock"
138−msgstr ""
141+msgstr "Stryg for at låse op"
139
142
140#: qml/Hud/HudParametrizedActionsPage.qml:132
143#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
144msgid "Confirm"
142−msgstr ""
145+msgstr "Bekræft"
143
146
144#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
147#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
145msgid "Type or say a command"
148msgid "Type or say a command"
146−msgstr ""
149+msgstr "Skriv eller indtal en kommando"
147
150
148#: qml/Hud/Hud.qml:84
151#: qml/Hud/Hud.qml:84
149msgid "Loading. Please Wait..."
152msgid "Loading. Please Wait..."
150−msgstr ""
153+msgstr "Indlæser. Vent venligst..."
151
154
152#: qml/Hud/Hud.qml:89
155#: qml/Hud/Hud.qml:89
153msgid "Speak Now..."
156msgid "Speak Now..."
154−msgstr ""
157+msgstr "Tal nu..."
155
158
156#: qml/Hud/Hud.qml:94
159#: qml/Hud/Hud.qml:94
157msgid "Speaking..."
160msgid "Speaking..."
158−msgstr ""
161+msgstr "Taler..."
159
162
160#: qml/Notifications/NotificationMenuItemFactory.qml:91
163#: qml/Notifications/NotificationMenuItemFactory.qml:91
161msgid "Show password"
164msgid "Show password"
162−msgstr ""
165+msgstr "Vis adgangskode"
163
166
164#: qml/Notifications/NotificationMenuItemFactory.qml:103
167#: qml/Notifications/NotificationMenuItemFactory.qml:103
165msgid "Please enter SIM PIN"
168msgid "Please enter SIM PIN"
166−msgstr ""
169+msgstr "Indtast venligst PIN for SIM"
167
170
168#: qml/Panel/Indicators/MenuItemFactory.qml:583
171#: qml/Panel/Indicators/MenuItemFactory.qml:583
169msgid "In queue…"
172msgid "In queue…"
170−msgstr ""
173+msgstr "I kø…"
171
174
172#: qml/Panel/Indicators/MenuItemFactory.qml:587
175#: qml/Panel/Indicators/MenuItemFactory.qml:587
173msgid "Downloading"
176msgid "Downloading"
174−msgstr ""
177+msgstr "Henter"
175
178
176#: qml/Panel/Indicators/MenuItemFactory.qml:589
179#: qml/Panel/Indicators/MenuItemFactory.qml:589
177msgid "Paused, tap to resume"
180msgid "Paused, tap to resume"
178−msgstr ""
181+msgstr "På pause; tryk for at fortsætte"
179
182
180#: qml/Panel/Indicators/MenuItemFactory.qml:591
183#: qml/Panel/Indicators/MenuItemFactory.qml:591
181msgid "Canceled"
184msgid "Canceled"
182−msgstr ""
185+msgstr "Annulleret"
183
186
184#: qml/Panel/Indicators/MenuItemFactory.qml:593
187#: qml/Panel/Indicators/MenuItemFactory.qml:593
185msgid "Finished"
188msgid "Finished"
186−msgstr ""
189+msgstr "Færdig"
187
190
188#: qml/Panel/Indicators/MenuItemFactory.qml:595
191#: qml/Panel/Indicators/MenuItemFactory.qml:595
189msgid "Failed, tap to retry"
192msgid "Failed, tap to retry"
190−msgstr ""
193+msgstr "Mislykkedes; tryk for at prøve igen"
191
194
192#: qml/Panel/SearchIndicator.qml:27
195#: qml/Panel/SearchIndicator.qml:27
193msgid "Search"
196msgid "Search"
194−msgstr ""
197+msgstr "Søg"
195
198
196#: qml/Shell.qml:359
199#: qml/Shell.qml:359
197#, qt-format
200#, qt-format
198msgid "Please enter %1"
201msgid "Please enter %1"
199−msgstr ""
202+msgstr "Indtast venligst %1"
po/hu.po+16−16
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 23:02+0000\n"
11+"PO-Revision-Date: 2014-07-23 10:07+0000\n"
12−"Last-Translator: Kristóf Kiszel <Unknown>\n"
12+"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -80,7 +80,7 @@ msgstr "Vészhívás"
80
80
81#: qml/Components/Lockscreen.qml:231
81#: qml/Components/Lockscreen.qml:231
82msgid "OK"
82msgid "OK"
83−msgstr ""
83+msgstr "OK"
84
84
85#: qml/Components/PageHeader.qml:366
85#: qml/Components/PageHeader.qml:366
86msgid "Recent searches"
86msgid "Recent searches"
@@ -97,11 +97,11 @@ msgstr "Szia"
97
97
98#: qml/Components/PinLockscreen.qml:198
98#: qml/Components/PinLockscreen.qml:198
99msgid "CANCEL"
99msgid "CANCEL"
100−msgstr ""
100+msgstr "MÉGSE"
101
101
102#: qml/Components/PinLockscreen.qml:216
102#: qml/Components/PinLockscreen.qml:216
103msgid "DONE"
103msgid "DONE"
104−msgstr ""
104+msgstr "KÉSZ"
105
105
106#: qml/Components/SeeMore.qml:35
106#: qml/Components/SeeMore.qml:35
107msgid "See more"
107msgid "See more"
@@ -113,15 +113,15 @@ msgstr ""
113
113
114#: qml/Dash/DashApps.qml:37
114#: qml/Dash/DashApps.qml:37
115msgid "Recent"
115msgid "Recent"
116−msgstr ""
116+msgstr "Legutóbbi"
117
117
118#: qml/Dash/Previews/PreviewActionCombo.qml:34
118#: qml/Dash/Previews/PreviewActionCombo.qml:34
119msgid "More..."
119msgid "More..."
120−msgstr ""
120+msgstr "Több…"
121
121
122#: qml/Dash/Previews/PreviewActionCombo.qml:34
122#: qml/Dash/Previews/PreviewActionCombo.qml:34
123msgid "Less..."
123msgid "Less..."
124−msgstr ""
124+msgstr "Kevesebb…"
125
125
126#: qml/Dash/Previews/PreviewRatingInput.qml:82
126#: qml/Dash/Previews/PreviewRatingInput.qml:82
127msgid "Rate this"
127msgid "Rate this"
@@ -165,7 +165,7 @@ msgstr "Jelszó megjelenítése"
165
165
166#: qml/Notifications/NotificationMenuItemFactory.qml:103
166#: qml/Notifications/NotificationMenuItemFactory.qml:103
167msgid "Please enter SIM PIN"
167msgid "Please enter SIM PIN"
168−msgstr ""
168+msgstr "Adja meg a SIM PIN kódját"
169
169
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171msgid "In queue…"
171msgid "In queue…"
@@ -173,23 +173,23 @@ msgstr ""
173
173
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175msgid "Downloading"
175msgid "Downloading"
176−msgstr ""
176+msgstr "Letöltés"
177
177
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
179msgid "Paused, tap to resume"
179msgid "Paused, tap to resume"
180−msgstr ""
180+msgstr "Szüneteltetve, koppintson a folytatáshoz"
181
181
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
183msgid "Canceled"
183msgid "Canceled"
184−msgstr ""
184+msgstr "Megszakítva"
185
185
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
187msgid "Finished"
187msgid "Finished"
188−msgstr ""
188+msgstr "Befejeződött"
189
189
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
191msgid "Failed, tap to retry"
191msgid "Failed, tap to retry"
192−msgstr ""
192+msgstr "Sikertelen, koppintson az újrapróbáláshoz"
193
193
194#: qml/Panel/SearchIndicator.qml:27
194#: qml/Panel/SearchIndicator.qml:27
195msgid "Search"
195msgid "Search"
po/is.po+22−17
@@ -1,30 +1,33 @@
1+# translation of po_unity8-is.po to icelandic
1# Icelandic translation for unity8
2# Icelandic translation for unity8
2# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3# This file is distributed under the same license as the unity8 package.
4# This file is distributed under the same license as the unity8 package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
5#
5#
6+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
7+# Sveinn í Felli <sv1@fellsnet.is>, 2014.
6msgid ""
8msgid ""
7msgstr ""
9msgstr ""
8−"Project-Id-Version: unity8\n"
10+"Project-Id-Version: po_unity8-is\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
12"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"
12"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
14"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"
14"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
18"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"
18"X-Generator: Launchpad (build 17114)\n"
20"X-Generator: Launchpad (build 17114)\n"
21+"Language: is\n"
19
22
20#: plugins/Unity/Launcher/launcheritem.cpp:43
23#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
24#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
25msgid "Pin shortcut"
23−msgstr ""
26+msgstr "Pinna flýtilykil"
24
27
25#: plugins/Unity/Launcher/launcheritem.cpp:73
28#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
29msgid "Unpin shortcut"
27−msgstr ""
30+msgstr "Losa flýtilykil"
28
31
29#: qml/Components/EdgeDemoOverlay.qml:151
32#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
33msgid "Skip intro"
@@ -37,7 +40,7 @@ msgstr "Hægri brún"
37#: qml/Components/EdgeDemo.qml:114
40#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
41msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
42msgstr ""
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."
41
44
42#: qml/Components/EdgeDemo.qml:145
45#: qml/Components/EdgeDemo.qml:145
43msgid "Top edge"
46msgid "Top edge"
@@ -45,7 +48,7 @@ msgstr "Efri brún"
45
48
46#: qml/Components/EdgeDemo.qml:146
49#: qml/Components/EdgeDemo.qml:146
47msgid "Try swiping from the top edge to access the indicators"
50msgid "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"
49
52
50#: qml/Components/EdgeDemo.qml:171
53#: qml/Components/EdgeDemo.qml:171
51msgid "Close"
54msgid "Close"
@@ -53,7 +56,7 @@ msgstr "Loka"
53
56
54#: qml/Components/EdgeDemo.qml:172
57#: qml/Components/EdgeDemo.qml:172
55msgid "Swipe up again to close the settings screen"
58msgid "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"
57
60
58#: qml/Components/EdgeDemo.qml:199
61#: qml/Components/EdgeDemo.qml:199
59msgid "Left edge"
62msgid "Left edge"
@@ -61,7 +64,7 @@ msgstr "Vinstri brún"
61
64
62#: qml/Components/EdgeDemo.qml:200
65#: qml/Components/EdgeDemo.qml:200
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
66msgid "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"
65
68
66#: qml/Components/EdgeDemo.qml:227
69#: qml/Components/EdgeDemo.qml:227
67msgid "Well done"
70msgid "Well done"
@@ -72,6 +75,8 @@ msgid ""
72"You have now mastered the edge gestures and can start using the "
75"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
76"phone<br><br>Tap on the screen to start"
74msgstr ""
77msgstr ""
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"
75
80
76#: qml/Components/Lockscreen.qml:214
81#: qml/Components/Lockscreen.qml:214
77msgid "Emergency Call"
82msgid "Emergency Call"
@@ -136,7 +141,7 @@ msgstr "Senda"
136
141
137#: qml/Greeter/Greeter.qml:157
142#: qml/Greeter/Greeter.qml:157
138msgid "Swipe to unlock"
143msgid "Swipe to unlock"
139−msgstr "Strjóka til að aflæsa"
144+msgstr "Strjúka til að aflæsa"
140
145
141#: qml/Hud/HudParametrizedActionsPage.qml:132
146#: qml/Hud/HudParametrizedActionsPage.qml:132
142msgid "Confirm"
147msgid "Confirm"
@@ -144,15 +149,15 @@ msgstr "Staðfesta"
144
149
145#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
150#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
146msgid "Type or say a command"
151msgid "Type or say a command"
147−msgstr "Skrifaðu eða segðu eitthvað"
152+msgstr "Skrifaðu eða segðu skipun"
148
153
149#: qml/Hud/Hud.qml:84
154#: qml/Hud/Hud.qml:84
150msgid "Loading. Please Wait..."
155msgid "Loading. Please Wait..."
151−msgstr "Hleð. Vinsamlegast Bíðið..."
156+msgstr "Hleð. Bíddu aðeins..."
152
157
153#: qml/Hud/Hud.qml:89
158#: qml/Hud/Hud.qml:89
154msgid "Speak Now..."
159msgid "Speak Now..."
155−msgstr "Talaðu Núna..."
160+msgstr "Tala núna..."
156
161
157#: qml/Hud/Hud.qml:94
162#: qml/Hud/Hud.qml:94
158msgid "Speaking..."
163msgid "Speaking..."
@@ -176,7 +181,7 @@ msgstr "Sæki"
176
181
177#: qml/Panel/Indicators/MenuItemFactory.qml:589
182#: qml/Panel/Indicators/MenuItemFactory.qml:589
178msgid "Paused, tap to resume"
183msgid "Paused, tap to resume"
179−msgstr ""
184+msgstr "Í bið, sláðu létt til að halda áfram"
180
185
181#: qml/Panel/Indicators/MenuItemFactory.qml:591
186#: qml/Panel/Indicators/MenuItemFactory.qml:591
182msgid "Canceled"
187msgid "Canceled"
@@ -188,7 +193,7 @@ msgstr "Lokið"
188
193
189#: qml/Panel/Indicators/MenuItemFactory.qml:595
194#: qml/Panel/Indicators/MenuItemFactory.qml:595
190msgid "Failed, tap to retry"
195msgid "Failed, tap to retry"
191−msgstr ""
196+msgstr "Mistókst, sláðu létt til að reyna aftur"
192
197
193#: qml/Panel/SearchIndicator.qml:27
198#: qml/Panel/SearchIndicator.qml:27
194msgid "Search"
199msgid "Search"
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
24#include <QtGui/QIcon>
24#include <QtGui/QIcon>
25#include <QMultiMap>
25#include <QMultiMap>
26
26
27+#include <functional>
28+#include <random>
29+
27using namespace UserMetricsOutput;
30using namespace UserMetricsOutput;
28
31
29namespace UserMetricsOutput
32namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
24#include <QDebug>
24#include <QDebug>
25#include <unitymenumodel.h>
25#include <unitymenumodel.h>
26
26
27+#include <functional>
28+#include <chrono>
29+
27class UnityMenuModelStackTest : public QObject
30class UnityMenuModelStackTest : public QObject
28{
31{
29 Q_OBJECT
32 Q_OBJECT