git.iko.soy/unity8
on xenial help sign in
merge prereq
fa6ee0bJosh Arenson
debian/changelog+14
compare with xenial
unifiedsplit
@@ -1,3 +1,17 @@
1+unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium
2+
3+ [ CI Train Bot ]
4+ * Update translation template
5+
6+ [ Lukáš Tinkl ]
7+ * Fix notifications with the new UITK color schemes (LP: #1554616,
8+ #1556523)
9+
10+ [ Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]
11+ * more fixes for the new theme palette (LP: #1554616, #1557534)
12+
13+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 18 Mar 2016 17:12:53 +0000
14+
1unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium
15unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium
2
16
3 [ Albert Astals Cid ]
17 [ Albert Astals Cid ]
po/es.po+49−55
@@ -8,15 +8,15 @@ 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: 2016-03-10 22:48+0000\n"
10"POT-Creation-Date: 2016-03-10 22:48+0000\n"
11−"PO-Revision-Date: 2016-01-15 14:48+0000\n"
11+"PO-Revision-Date: 2016-03-21 04:18+0000\n"
12−"Last-Translator: Víctor R. Ruiz <Unknown>\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@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"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-21 06:03+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17947)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -77,8 +77,9 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr "Cerrar la sesión"
78msgstr "Cerrar la sesión"
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Cancelar"
84msgstr "Cancelar"
84
85
@@ -101,29 +102,29 @@ msgctxt "Button: Shut down the system"
101msgid "Shut down"
102msgid "Shut down"
102msgstr "Apagar"
103msgstr "Apagar"
103
104
104−#: qml/Components/Dialogs.qml:207
105+#: qml/Components/Dialogs.qml:173
105msgctxt "Title: Reboot dialog"
106msgctxt "Title: Reboot dialog"
106msgid "Reboot"
107msgid "Reboot"
107msgstr "Reiniciar"
108msgstr "Reiniciar"
108
109
109−#: qml/Components/Dialogs.qml:208
110+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
111msgid "Are you sure you want to reboot?"
111msgstr "¿Seguro que quiere reiniciar?"
112msgstr "¿Seguro que quiere reiniciar?"
112
113
113−#: qml/Components/Dialogs.qml:210
114+#: qml/Components/Dialogs.qml:176
114msgid "No"
115msgid "No"
115msgstr "No"
116msgstr "No"
116
117
117−#: qml/Components/Dialogs.qml:217
118+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
119msgid "Yes"
119msgstr "Sí"
120msgstr "Sí"
120
121
121−#: qml/Components/Dialogs.qml:232
122+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
123msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
124msgid "Power"
124msgstr "Apagar"
125msgstr "Apagar"
125
126
126−#: qml/Components/Dialogs.qml:233
127+#: qml/Components/Dialogs.qml:199
127msgid ""
128msgid ""
128"Are you sure you would like\n"
129"Are you sure you would like\n"
129"to power off?"
130"to power off?"
@@ -131,12 +132,12 @@ msgstr ""
131"¿Seguro que quiere\n"
132"¿Seguro que quiere\n"
132"apagar?"
133"apagar?"
133
134
134−#: qml/Components/Dialogs.qml:235
135+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
136msgctxt "Button: Power off the system"
136msgid "Power off"
137msgid "Power off"
137msgstr "Apagar"
138msgstr "Apagar"
138
139
139−#: qml/Components/Dialogs.qml:244
140+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
141msgctxt "Button: Restart the system"
141msgid "Restart"
142msgid "Restart"
142msgstr "Reiniciar"
143msgstr "Reiniciar"
@@ -162,6 +163,7 @@ msgctxt ""
162"Re-dock means connect the device again to an external screen/mouse/keyboard"
163"Re-dock means connect the device again to an external screen/mouse/keyboard"
163msgid "Re-dock, save your work and close these apps to continue."
164msgid "Re-dock, save your work and close these apps to continue."
164msgstr ""
165msgstr ""
166+"Reconecte, guarde el trabajo y cierre estas aplicaciones para continuar."
165
167
166#: qml/Components/ModeSwitchWarningDialog.qml:63
168#: qml/Components/ModeSwitchWarningDialog.qml:63
167msgid "Or force close now (unsaved data will be lost)."
169msgid "Or force close now (unsaved data will be lost)."
@@ -179,38 +181,38 @@ msgstr "¡Reconectar ahora!"
179msgid "Close all"
181msgid "Close all"
180msgstr "Cerrar todo"
182msgstr "Cerrar todo"
181
183
182−#: qml/Dash/DashPageHeader.qml:270
184+#: qml/Dash/DashPageHeader.qml:337
183msgctxt "Button: Open the Ubuntu Store"
185msgctxt "Button: Open the Ubuntu Store"
184msgid "Store"
186msgid "Store"
185msgstr "Tienda"
187msgstr "Tienda"
186
188
187−#: qml/Dash/DashPageHeader.qml:277
189+#: qml/Dash/DashPageHeader.qml:344
188msgctxt "Button: Start a search in the current dash scope"
190msgctxt "Button: Start a search in the current dash scope"
189msgid "Search"
191msgid "Search"
190msgstr "Buscar"
192msgstr "Buscar"
191
193
192−#: qml/Dash/DashPageHeader.qml:287
194+#: qml/Dash/DashPageHeader.qml:354
193msgctxt "Button: Show the current dash scope settings"
195msgctxt "Button: Show the current dash scope settings"
194msgid "Settings"
196msgid "Settings"
195msgstr "Ajustes"
197msgstr "Ajustes"
196
198
197−#: qml/Dash/DashPageHeader.qml:294
199+#: qml/Dash/DashPageHeader.qml:361
198msgid "Remove from Favorites"
200msgid "Remove from Favorites"
199msgstr "Quitar de favoritos"
201msgstr "Quitar de favoritos"
200
202
201−#: qml/Dash/DashPageHeader.qml:294
203+#: qml/Dash/DashPageHeader.qml:361
202msgid "Add to Favorites"
204msgid "Add to Favorites"
203msgstr "Añadir a favoritos"
205msgstr "Añadir a favoritos"
204
206
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
207+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206msgid "See less"
208msgid "See less"
207msgstr "Ver menos"
209msgstr "Ver menos"
208
210
209−#: qml/Dash/GenericScopeView.qml:567
211+#: qml/Dash/GenericScopeView.qml:570
210msgid "See all"
212msgid "See all"
211msgstr "Ver todo"
213msgstr "Ver todo"
212
214
213−#: qml/Dash/GenericScopeView.qml:629
215+#: qml/Dash/GenericScopeView.qml:627
214msgctxt "Label: Hint for dash search line edit"
216msgctxt "Label: Hint for dash search line edit"
215msgid "Search"
217msgid "Search"
216msgstr "Búsqueda"
218msgstr "Búsqueda"
@@ -269,6 +271,8 @@ msgid ""
269"Your device is now connected to an external display. Use this screen as a "
271"Your device is now connected to an external display. Use this screen as a "
270"touch pad to interact with the pointer."
272"touch pad to interact with the pointer."
271msgstr ""
273msgstr ""
274+"Se ha conectado el dispositivo a una pantalla externa. Utilice esta ventana "
275+"como panel táctil para mover el puntero."
272
276
273#: qml/Greeter/CoverPage.qml:118
277#: qml/Greeter/CoverPage.qml:118
274msgid "Unlock"
278msgid "Unlock"
@@ -282,11 +286,11 @@ msgstr "Reintentar"
282msgid "Tap to unlock"
286msgid "Tap to unlock"
283msgstr "Toque para desbloquear"
287msgstr "Toque para desbloquear"
284
288
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
289+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
290msgid "Sorry, incorrect passphrase."
287msgstr "La contraseña es incorrecta."
291msgstr "La contraseña es incorrecta."
288
292
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
293+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
294msgid "Sorry, incorrect passcode."
291msgstr "Código de acceso incorrecto."
295msgstr "Código de acceso incorrecto."
292
296
@@ -315,7 +319,7 @@ msgstr ""
315msgid "Enter %1"
319msgid "Enter %1"
316msgstr "Introduzca %1"
320msgstr "Introduzca %1"
317
321
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
322+#: qml/Greeter/NarrowView.qml:117
319msgid "Enter passphrase"
323msgid "Enter passphrase"
320msgstr "Introduzca la contraseña"
324msgstr "Introduzca la contraseña"
321
325
@@ -353,62 +357,62 @@ msgstr "Toque para volver a la llamada…"
353msgid "Conference"
357msgid "Conference"
354msgstr "Conferencia"
358msgstr "Conferencia"
355
359
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
360+#: qml/Panel/Indicators/MenuItemFactory.qml:756
357msgid "Nothing is playing"
361msgid "Nothing is playing"
358msgstr "Ningún contenido en reproducción"
362msgstr "Ningún contenido en reproducción"
359
363
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
364+#: qml/Panel/Indicators/MenuItemFactory.qml:885
361#, qt-format
365#, qt-format
362msgid "%1 hour"
366msgid "%1 hour"
363msgid_plural "%1 hours"
367msgid_plural "%1 hours"
364msgstr[0] "%1 hora"
368msgstr[0] "%1 hora"
365msgstr[1] "%1 horas"
369msgstr[1] "%1 horas"
366
370
367−#: qml/Panel/Indicators/MenuItemFactory.qml:885
371+#: qml/Panel/Indicators/MenuItemFactory.qml:889
368#, qt-format
372#, qt-format
369msgid "%1 minute"
373msgid "%1 minute"
370msgid_plural "%1 minutes"
374msgid_plural "%1 minutes"
371msgstr[0] "%1 minuto"
375msgstr[0] "%1 minuto"
372msgstr[1] "%1 minutos"
376msgstr[1] "%1 minutos"
373
377
374−#: qml/Panel/Indicators/MenuItemFactory.qml:890
378+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375#, qt-format
379#, qt-format
376msgid "%1 second"
380msgid "%1 second"
377msgid_plural "%1 seconds"
381msgid_plural "%1 seconds"
378msgstr[0] "%1 segundo"
382msgstr[0] "%1 segundo"
379msgstr[1] "%1 segundos"
383msgstr[1] "%1 segundos"
380
384
381−#: qml/Panel/Indicators/MenuItemFactory.qml:893
385+#: qml/Panel/Indicators/MenuItemFactory.qml:897
382msgid "0 seconds"
386msgid "0 seconds"
383msgstr "0 segundos"
387msgstr "0 segundos"
384
388
385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
389#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386−#: qml/Panel/Indicators/MenuItemFactory.qml:895
390+#: qml/Panel/Indicators/MenuItemFactory.qml:899
387#, qt-format
391#, qt-format
388msgid "%1 remaining"
392msgid "%1 remaining"
389msgstr "%1 restante(s)"
393msgstr "%1 restante(s)"
390
394
391−#: qml/Panel/Indicators/MenuItemFactory.qml:901
395+#: qml/Panel/Indicators/MenuItemFactory.qml:905
392msgid "In queue…"
396msgid "In queue…"
393msgstr "En espera…"
397msgstr "En espera…"
394
398
395−#: qml/Panel/Indicators/MenuItemFactory.qml:905
399+#: qml/Panel/Indicators/MenuItemFactory.qml:909
396msgid "Downloading"
400msgid "Downloading"
397msgstr "Descargando"
401msgstr "Descargando"
398
402
399−#: qml/Panel/Indicators/MenuItemFactory.qml:907
403+#: qml/Panel/Indicators/MenuItemFactory.qml:911
400msgid "Paused, tap to resume"
404msgid "Paused, tap to resume"
401msgstr "Pausado, toque para reanudar"
405msgstr "Pausado, toque para reanudar"
402
406
403−#: qml/Panel/Indicators/MenuItemFactory.qml:909
407+#: qml/Panel/Indicators/MenuItemFactory.qml:913
404msgid "Canceled"
408msgid "Canceled"
405msgstr "Cancelado"
409msgstr "Cancelado"
406
410
407−#: qml/Panel/Indicators/MenuItemFactory.qml:911
411+#: qml/Panel/Indicators/MenuItemFactory.qml:915
408msgid "Finished"
412msgid "Finished"
409msgstr "Finalizado"
413msgstr "Finalizado"
410
414
411−#: qml/Panel/Indicators/MenuItemFactory.qml:913
415+#: qml/Panel/Indicators/MenuItemFactory.qml:917
412msgid "Failed, tap to retry"
416msgid "Failed, tap to retry"
413msgstr "Falló, toque para reintentar"
417msgstr "Falló, toque para reintentar"
414
418
@@ -481,7 +485,7 @@ msgstr "Deslizamiento largo desde el borde derecho."
481msgid "View all your running tasks."
485msgid "View all your running tasks."
482msgstr "Ver todas las tareas en ejecución."
486msgstr "Ver todas las tareas en ejecución."
483
487
484−#: qml/Wizard/Page.qml:89
488+#: qml/Wizard/Page.qml:54
485msgctxt "Button: Go back one page in the Wizard"
489msgctxt "Button: Go back one page in the Wizard"
486msgid "Back"
490msgid "Back"
487msgstr "Atrás"
491msgstr "Atrás"
@@ -513,7 +517,8 @@ msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
513msgid "Without it, you won’t be able to make calls or use text messaging."
517msgid "Without it, you won’t be able to make calls or use text messaging."
514msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
518msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
515
519
516−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
520+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
521+#: qml/Wizard/Pages/sim.qml:101
517msgid "Skip"
522msgid "Skip"
518msgstr "Omitir"
523msgstr "Omitir"
519
524
@@ -555,7 +560,7 @@ msgctxt "Label: Description of security method"
555msgid "Numbers and letters"
560msgid "Numbers and letters"
556msgstr "Números y letras"
561msgstr "Números y letras"
557
562
558−#: qml/Wizard/Pages/40-wifi.qml:29
563+#: qml/Wizard/Pages/30-wifi.qml:29
559msgid "Connect to Wi‑Fi"
564msgid "Connect to Wi‑Fi"
560msgstr "Conectar con wifi"
565msgstr "Conectar con wifi"
561
566
@@ -630,13 +635,13 @@ msgstr "¡Buen trabajo!"
630
635
631#: qml/Wizard/Pages/80-finished.qml:46
636#: qml/Wizard/Pages/80-finished.qml:46
632msgid "Your device is now ready to use."
637msgid "Your device is now ready to use."
633−msgstr "El dispositivo ya está listo."
638+msgstr "El dispositivo está listo para su uso."
634
639
635#: qml/Wizard/Pages/80-finished.qml:53
640#: qml/Wizard/Pages/80-finished.qml:53
636msgid "Finish"
641msgid "Finish"
637msgstr "Finalizar"
642msgstr "Finalizar"
638
643
639−#: qml/Wizard/Pages/here-terms.qml:27
644+#: qml/Wizard/Pages/here-terms.qml:25
640msgid "Terms & Conditions"
645msgid "Terms & Conditions"
641msgstr "Términos y condiciones"
646msgstr "Términos y condiciones"
642
647
@@ -644,7 +649,8 @@ msgstr "Términos y condiciones"
644msgid "Confirm passphrase"
649msgid "Confirm passphrase"
645msgstr "Confirme la contraseña"
650msgstr "Confirme la contraseña"
646
651
647−#: qml/Wizard/Pages/passwd-confirm.qml:50
652+#: qml/Wizard/Pages/passcode-confirm.qml:43
653+#: qml/Wizard/Pages/passcode-desktop.qml:80
648msgid "Confirm passcode"
654msgid "Confirm passcode"
649msgstr "Confirme el código"
655msgstr "Confirme el código"
650
656
@@ -817,15 +823,3 @@ msgstr "%1 〉"
817
823
818#~ msgid "Call back"
824#~ msgid "Call back"
819#~ msgstr "Devolver llamada"
825#~ msgstr "Devolver llamada"
820−
821−#~ msgid "Re-dock, save your work and close these apps to continue."
822−#~ msgstr ""
823−#~ "Re-acople el dispositivo, guarde el trabajo y cierre estas aplicaciones para "
824−#~ "continuar."
825−
826−#~ msgid ""
827−#~ "Your device is now connected to an external display. Use this screen as a "
828−#~ "touch pad to interact with the mouse."
829−#~ msgstr ""
830−#~ "Ahora está conectado a una pantalla externa. Utilice esta pantalla como "
831−#~ "dispositivo táctil para controlar el ratón."
po/hu.po+45−54
@@ -8,15 +8,15 @@ 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: 2016-03-10 22:48+0000\n"
10"POT-Creation-Date: 2016-03-10 22:48+0000\n"
11−"PO-Revision-Date: 2016-02-16 07:23+0000\n"
11+"PO-Revision-Date: 2016-03-17 08:46+0000\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
12"Last-Translator: Richard Somlói <ricsipontaz@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"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-18 06:08+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17947)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,8 +73,9 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr "Kijelentkezés"
74msgstr "Kijelentkezés"
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr "Mégse"
80msgstr "Mégse"
80
81
@@ -97,29 +98,29 @@ msgctxt "Button: Shut down the system"
97msgid "Shut down"
98msgid "Shut down"
98msgstr "Leállítás"
99msgstr "Leállítás"
99
100
100−#: qml/Components/Dialogs.qml:207
101+#: qml/Components/Dialogs.qml:173
101msgctxt "Title: Reboot dialog"
102msgctxt "Title: Reboot dialog"
102msgid "Reboot"
103msgid "Reboot"
103msgstr "Újraindítás"
104msgstr "Újraindítás"
104
105
105−#: qml/Components/Dialogs.qml:208
106+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
107msgid "Are you sure you want to reboot?"
107msgstr "Biztosan újra szeretné indítani?"
108msgstr "Biztosan újra szeretné indítani?"
108
109
109−#: qml/Components/Dialogs.qml:210
110+#: qml/Components/Dialogs.qml:176
110msgid "No"
111msgid "No"
111msgstr "Nem"
112msgstr "Nem"
112
113
113−#: qml/Components/Dialogs.qml:217
114+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
115msgid "Yes"
115msgstr "Igen"
116msgstr "Igen"
116
117
117−#: qml/Components/Dialogs.qml:232
118+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
119msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
120msgid "Power"
120msgstr "Menü"
121msgstr "Menü"
121
122
122−#: qml/Components/Dialogs.qml:233
123+#: qml/Components/Dialogs.qml:199
123msgid ""
124msgid ""
124"Are you sure you would like\n"
125"Are you sure you would like\n"
125"to power off?"
126"to power off?"
@@ -127,12 +128,12 @@ msgstr ""
127"Biztos benne, hogy ki\n"
128"Biztos benne, hogy ki\n"
128"szeretné kapcsolni?"
129"szeretné kapcsolni?"
129
130
130−#: qml/Components/Dialogs.qml:235
131+#: qml/Components/Dialogs.qml:201
131msgctxt "Button: Power off the system"
132msgctxt "Button: Power off the system"
132msgid "Power off"
133msgid "Power off"
133msgstr "Kikapcsolás"
134msgstr "Kikapcsolás"
134
135
135−#: qml/Components/Dialogs.qml:244
136+#: qml/Components/Dialogs.qml:210
136msgctxt "Button: Restart the system"
137msgctxt "Button: Restart the system"
137msgid "Restart"
138msgid "Restart"
138msgstr "Újraindítás"
139msgstr "Újraindítás"
@@ -177,38 +178,38 @@ msgstr "Újracsatlakozás most!"
177msgid "Close all"
178msgid "Close all"
178msgstr "Minden bezárása"
179msgstr "Minden bezárása"
179
180
180−#: qml/Dash/DashPageHeader.qml:270
181+#: qml/Dash/DashPageHeader.qml:337
181msgctxt "Button: Open the Ubuntu Store"
182msgctxt "Button: Open the Ubuntu Store"
182msgid "Store"
183msgid "Store"
183msgstr "Áruház"
184msgstr "Áruház"
184
185
185−#: qml/Dash/DashPageHeader.qml:277
186+#: qml/Dash/DashPageHeader.qml:344
186msgctxt "Button: Start a search in the current dash scope"
187msgctxt "Button: Start a search in the current dash scope"
187msgid "Search"
188msgid "Search"
188msgstr "Keresés"
189msgstr "Keresés"
189
190
190−#: qml/Dash/DashPageHeader.qml:287
191+#: qml/Dash/DashPageHeader.qml:354
191msgctxt "Button: Show the current dash scope settings"
192msgctxt "Button: Show the current dash scope settings"
192msgid "Settings"
193msgid "Settings"
193msgstr "Beállítások"
194msgstr "Beállítások"
194
195
195−#: qml/Dash/DashPageHeader.qml:294
196+#: qml/Dash/DashPageHeader.qml:361
196msgid "Remove from Favorites"
197msgid "Remove from Favorites"
197msgstr "Eltávolítás a kedvencek közül"
198msgstr "Eltávolítás a kedvencek közül"
198
199
199−#: qml/Dash/DashPageHeader.qml:294
200+#: qml/Dash/DashPageHeader.qml:361
200msgid "Add to Favorites"
201msgid "Add to Favorites"
201msgstr "Hozzáadás a kedvencekhez"
202msgstr "Hozzáadás a kedvencekhez"
202
203
203−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
204+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
204msgid "See less"
205msgid "See less"
205msgstr "Kevesebb"
206msgstr "Kevesebb"
206
207
207−#: qml/Dash/GenericScopeView.qml:567
208+#: qml/Dash/GenericScopeView.qml:570
208msgid "See all"
209msgid "See all"
209msgstr "Összes megtekintése"
210msgstr "Összes megtekintése"
210
211
211−#: qml/Dash/GenericScopeView.qml:629
212+#: qml/Dash/GenericScopeView.qml:627
212msgctxt "Label: Hint for dash search line edit"
213msgctxt "Label: Hint for dash search line edit"
213msgid "Search"
214msgid "Search"
214msgstr "Keresés"
215msgstr "Keresés"
@@ -268,7 +269,7 @@ msgid ""
268"touch pad to interact with the pointer."
269"touch pad to interact with the pointer."
269msgstr ""
270msgstr ""
270"Az eszköz jelenleg egy külső kijelzőhöz van csatlakoztatva. Használja ezt a "
271"Az eszköz jelenleg egy külső kijelzőhöz van csatlakoztatva. Használja ezt a "
271−"kijelzőt érintőpadként, hogy irányítsa a mutatót."
272+"kijelzőt érintőtáblaként, melynek segítéségével irányíthatja a mutatót."
272
273
273#: qml/Greeter/CoverPage.qml:118
274#: qml/Greeter/CoverPage.qml:118
274msgid "Unlock"
275msgid "Unlock"
@@ -282,11 +283,11 @@ msgstr "Újra"
282msgid "Tap to unlock"
283msgid "Tap to unlock"
283msgstr "Koppintson a feloldáshoz"
284msgstr "Koppintson a feloldáshoz"
284
285
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
286+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
287msgid "Sorry, incorrect passphrase."
287msgstr "Elnézést, helytelen jelmondat."
288msgstr "Elnézést, helytelen jelmondat."
288
289
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
290+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
291msgid "Sorry, incorrect passcode."
291msgstr "Elnézést, helytelen jelkód."
292msgstr "Elnézést, helytelen jelkód."
292
293
@@ -315,7 +316,7 @@ msgstr ""
315msgid "Enter %1"
316msgid "Enter %1"
316msgstr "%1 megadása"
317msgstr "%1 megadása"
317
318
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
319+#: qml/Greeter/NarrowView.qml:117
319msgid "Enter passphrase"
320msgid "Enter passphrase"
320msgstr "Jelmondat megadása"
321msgstr "Jelmondat megadása"
321
322
@@ -353,62 +354,62 @@ msgstr "Ide koppintva visszatérhet a híváshoz"
353msgid "Conference"
354msgid "Conference"
354msgstr "Konferencia"
355msgstr "Konferencia"
355
356
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
357+#: qml/Panel/Indicators/MenuItemFactory.qml:756
357msgid "Nothing is playing"
358msgid "Nothing is playing"
358msgstr "Nincs lejátszás"
359msgstr "Nincs lejátszás"
359
360
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
361+#: qml/Panel/Indicators/MenuItemFactory.qml:885
361#, qt-format
362#, qt-format
362msgid "%1 hour"
363msgid "%1 hour"
363msgid_plural "%1 hours"
364msgid_plural "%1 hours"
364msgstr[0] "%1 óra"
365msgstr[0] "%1 óra"
365msgstr[1] "%1 óra"
366msgstr[1] "%1 óra"
366
367
367−#: qml/Panel/Indicators/MenuItemFactory.qml:885
368+#: qml/Panel/Indicators/MenuItemFactory.qml:889
368#, qt-format
369#, qt-format
369msgid "%1 minute"
370msgid "%1 minute"
370msgid_plural "%1 minutes"
371msgid_plural "%1 minutes"
371msgstr[0] "%1 perc"
372msgstr[0] "%1 perc"
372msgstr[1] "%1 perc"
373msgstr[1] "%1 perc"
373
374
374−#: qml/Panel/Indicators/MenuItemFactory.qml:890
375+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375#, qt-format
376#, qt-format
376msgid "%1 second"
377msgid "%1 second"
377msgid_plural "%1 seconds"
378msgid_plural "%1 seconds"
378msgstr[0] "%1 másodperc"
379msgstr[0] "%1 másodperc"
379msgstr[1] "%1 másodperc"
380msgstr[1] "%1 másodperc"
380
381
381−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:897
382msgid "0 seconds"
383msgid "0 seconds"
383msgstr "0 másodperc"
384msgstr "0 másodperc"
384
385
385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:899
387#, qt-format
388#, qt-format
388msgid "%1 remaining"
389msgid "%1 remaining"
389msgstr "%1 van hátra"
390msgstr "%1 van hátra"
390
391
391−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:905
392msgid "In queue…"
393msgid "In queue…"
393msgstr "Sorban…"
394msgstr "Sorban…"
394
395
395−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:909
396msgid "Downloading"
397msgid "Downloading"
397msgstr "Letöltés"
398msgstr "Letöltés"
398
399
399−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:911
400msgid "Paused, tap to resume"
401msgid "Paused, tap to resume"
401msgstr "Szüneteltetve, koppintson a folytatáshoz"
402msgstr "Szüneteltetve, koppintson a folytatáshoz"
402
403
403−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:913
404msgid "Canceled"
405msgid "Canceled"
405msgstr "Megszakítva"
406msgstr "Megszakítva"
406
407
407−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:915
408msgid "Finished"
409msgid "Finished"
409msgstr "Befejeződött"
410msgstr "Befejeződött"
410
411
411−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:917
412msgid "Failed, tap to retry"
413msgid "Failed, tap to retry"
413msgstr "Sikertelen, koppintson az újrapróbáláshoz"
414msgstr "Sikertelen, koppintson az újrapróbáláshoz"
414
415
@@ -481,7 +482,7 @@ msgstr "Húzza az ujját hosszan a kijelző jobboldalától indulva."
481msgid "View all your running tasks."
482msgid "View all your running tasks."
482msgstr "A futó alkalmazások itt tekinthetőek meg."
483msgstr "A futó alkalmazások itt tekinthetőek meg."
483
484
484−#: qml/Wizard/Page.qml:89
485+#: qml/Wizard/Page.qml:54
485msgctxt "Button: Go back one page in the Wizard"
486msgctxt "Button: Go back one page in the Wizard"
486msgid "Back"
487msgid "Back"
487msgstr "Vissza"
488msgstr "Vissza"
@@ -515,7 +516,8 @@ msgstr ""
515"Anélkül nem indíthat vagy fogadhat hívásokat, és nem küldhet vagy fogadhat "
516"Anélkül nem indíthat vagy fogadhat hívásokat, és nem küldhet vagy fogadhat "
516"üzeneteket."
517"üzeneteket."
517
518
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
519+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
520+#: qml/Wizard/Pages/sim.qml:101
519msgid "Skip"
521msgid "Skip"
520msgstr "Kihagyás"
522msgstr "Kihagyás"
521
523
@@ -557,7 +559,7 @@ msgctxt "Label: Description of security method"
557msgid "Numbers and letters"
559msgid "Numbers and letters"
558msgstr "Betűk és számok"
560msgstr "Betűk és számok"
559
561
560−#: qml/Wizard/Pages/40-wifi.qml:29
562+#: qml/Wizard/Pages/30-wifi.qml:29
561msgid "Connect to Wi‑Fi"
563msgid "Connect to Wi‑Fi"
562msgstr "Csatlakozás Wi-Fi hálózathoz"
564msgstr "Csatlakozás Wi-Fi hálózathoz"
563
565
@@ -638,7 +640,7 @@ msgstr "Az eszköze készen áll a használatra."
638msgid "Finish"
640msgid "Finish"
639msgstr "Befejezés"
641msgstr "Befejezés"
640
642
641−#: qml/Wizard/Pages/here-terms.qml:27
643+#: qml/Wizard/Pages/here-terms.qml:25
642msgid "Terms & Conditions"
644msgid "Terms & Conditions"
643msgstr "Felhasználási feltételek"
645msgstr "Felhasználási feltételek"
644
646
@@ -646,7 +648,8 @@ msgstr "Felhasználási feltételek"
646msgid "Confirm passphrase"
648msgid "Confirm passphrase"
647msgstr "Jelmondat megerősítése"
649msgstr "Jelmondat megerősítése"
648
650
649−#: qml/Wizard/Pages/passwd-confirm.qml:50
651+#: qml/Wizard/Pages/passcode-confirm.qml:43
652+#: qml/Wizard/Pages/passcode-desktop.qml:80
650msgid "Confirm passcode"
653msgid "Confirm passcode"
651msgstr "Jelkód megerősítése"
654msgstr "Jelkód megerősítése"
652
655
@@ -818,15 +821,3 @@ msgstr "%1 〉"
818
821
819#~ msgid "%a %d %b %H:%M"
822#~ msgid "%a %d %b %H:%M"
820#~ msgstr "%b. %d., %a %H.%M"
823#~ msgstr "%b. %d., %a %H.%M"
821−
822−#~ msgid "Re-dock, save your work and close these apps to continue."
823−#~ msgstr ""
824−#~ "Dokkoljon újra, mentse a munkáját, majd zárjon be minden alkalmazást a "
825−#~ "folytatáshoz."
826−
827−#~ msgid ""
828−#~ "Your device is now connected to an external display. Use this screen as a "
829−#~ "touch pad to interact with the mouse."
830−#~ msgstr ""
831−#~ "Egy külső kijelzőhöz csatlakoztatta a készülékét. A telefon kijelzőjén tett "
832−#~ "ujjmozdulatokkal mozgathatja az egeret."
po/unity8.pot+13−13
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2016-03-10 22:48+0000\n"
11+"POT-Creation-Date: 2016-03-18 17:18+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -343,62 +343,62 @@ msgstr ""
343msgid "Conference"
343msgid "Conference"
344msgstr ""
344msgstr ""
345
345
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
346+#: qml/Panel/Indicators/MenuItemFactory.qml:757
347msgid "Nothing is playing"
347msgid "Nothing is playing"
348msgstr ""
348msgstr ""
349
349
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
350+#: qml/Panel/Indicators/MenuItemFactory.qml:886
351#, qt-format
351#, qt-format
352msgid "%1 hour"
352msgid "%1 hour"
353msgid_plural "%1 hours"
353msgid_plural "%1 hours"
354msgstr[0] ""
354msgstr[0] ""
355msgstr[1] ""
355msgstr[1] ""
356
356
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
357+#: qml/Panel/Indicators/MenuItemFactory.qml:890
358#, qt-format
358#, qt-format
359msgid "%1 minute"
359msgid "%1 minute"
360msgid_plural "%1 minutes"
360msgid_plural "%1 minutes"
361msgstr[0] ""
361msgstr[0] ""
362msgstr[1] ""
362msgstr[1] ""
363
363
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
364+#: qml/Panel/Indicators/MenuItemFactory.qml:895
365#, qt-format
365#, qt-format
366msgid "%1 second"
366msgid "%1 second"
367msgid_plural "%1 seconds"
367msgid_plural "%1 seconds"
368msgstr[0] ""
368msgstr[0] ""
369msgstr[1] ""
369msgstr[1] ""
370
370
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
371+#: qml/Panel/Indicators/MenuItemFactory.qml:898
372msgid "0 seconds"
372msgid "0 seconds"
373msgstr ""
373msgstr ""
374
374
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
376+#: qml/Panel/Indicators/MenuItemFactory.qml:900
377#, qt-format
377#, qt-format
378msgid "%1 remaining"
378msgid "%1 remaining"
379msgstr ""
379msgstr ""
380
380
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
381+#: qml/Panel/Indicators/MenuItemFactory.qml:906
382msgid "In queue…"
382msgid "In queue…"
383msgstr ""
383msgstr ""
384
384
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
385+#: qml/Panel/Indicators/MenuItemFactory.qml:910
386msgid "Downloading"
386msgid "Downloading"
387msgstr ""
387msgstr ""
388
388
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
389+#: qml/Panel/Indicators/MenuItemFactory.qml:912
390msgid "Paused, tap to resume"
390msgid "Paused, tap to resume"
391msgstr ""
391msgstr ""
392
392
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
393+#: qml/Panel/Indicators/MenuItemFactory.qml:914
394msgid "Canceled"
394msgid "Canceled"
395msgstr ""
395msgstr ""
396
396
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
397+#: qml/Panel/Indicators/MenuItemFactory.qml:916
398msgid "Finished"
398msgid "Finished"
399msgstr ""
399msgstr ""
400
400
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
401+#: qml/Panel/Indicators/MenuItemFactory.qml:918
402msgid "Failed, tap to retry"
402msgid "Failed, tap to retry"
403msgstr ""
403msgstr ""
404
404
qml/Components/ShellDialog.qml+3−1
@@ -17,6 +17,7 @@
17import QtQuick 2.4
17import QtQuick 2.4
18
18
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20+import Ubuntu.Components.Themes 1.3
20import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.Popups 1.3
21
22
22/*
23/*
@@ -41,10 +42,11 @@ Dialog {
41 // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
42 // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
42 ThemeSettings {
43 ThemeSettings {
43 id: themeHack
44 id: themeHack
44− name: "Ubuntu.Components.Themes.Ambiance"
45 }
45 }
46
46
47 Component.onCompleted: {
47 Component.onCompleted: {
48+ themeHack.palette.normal.overlay = "white";
49+ themeHack.palette.normal.overlayText = UbuntuColors.slate;
48 __foreground.theme = themeHack
50 __foreground.theme = themeHack
49 show();
51 show();
50 }
52 }
qml/Launcher/LauncherPanel.qml+34−30
@@ -767,38 +767,42 @@ Rectangle {
767 quickList.state = "open";
767 quickList.state = "open";
768 }
768 }
769
769
770− Column {
770+ StyledItem {
771− id: quickListColumn
772 width: parent.width
771 width: parent.width
772+ height: quickListColumn.height
773+
774+ theme: ThemeSettings {
775+ name: "Ubuntu.Components.Themes.Ambiance"
776+ }
777+
778+ Column {
779+ id: quickListColumn
780+ width: parent.width
773− height: childrenRect.height
781+ height: childrenRect.height
774−
782+
775− Repeater {
783+ Repeater {
776− id: popoverRepeater
784+ id: popoverRepeater
777− model: quickList.model
785+ model: quickList.model
778−
786+
779− ListItems.Standard {
787+ ListItems.Standard {
780− objectName: "quickListEntry" + index
788+ objectName: "quickListEntry" + index
781− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
789+ text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
782− highlightWhenPressed: model.clickable
790+ highlightWhenPressed: model.clickable
783− selected: index === quickList.selectedIndex
791+ selected: index === quickList.selectedIndex
784−
792+
785− // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
786− // ListItems don't know that they are sitting in a themed Popover where the color
787− // needs to be inverted.
788− __foregroundColor: "black"
789−
790− onClicked: {
793+ onClicked: {
791− if (!model.clickable) {
794+ if (!model.clickable) {
792− return;
795+ return;
796+ }
797+ Haptics.play();
798+ quickList.state = "";
799+ // Unsetting model to prevent showing changing entries during fading out
800+ // that may happen because of triggering an action.
801+ LauncherModel.quickListActionInvoked(quickList.appId, index);
802+ quickList.focus = false;
803+ root.kbdNavigationCancelled();
804+ quickList.model = undefined;
793 }
805 }
794− Haptics.play();
795− quickList.state = "";
796− // Unsetting model to prevent showing changing entries during fading out
797− // that may happen because of triggering an action.
798− LauncherModel.quickListActionInvoked(quickList.appId, index);
799− quickList.focus = false;
800− root.kbdNavigationCancelled();
801− quickList.model = undefined;
802 }
806 }
803 }
807 }
804 }
808 }
qml/Notifications/Notification.qml+10−16
@@ -41,15 +41,12 @@ StyledItem {
41 property int maxHeight
41 property int maxHeight
42 property int margins
42 property int margins
43 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
43 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
44− readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
44+ readonly property bool darkOnBright: inverseMode || type === Notification.SnapDecision
45− readonly property color red: "#fc4949"
46− readonly property color green: "#3fb24f"
47 readonly property color sdLightGrey: "#eaeaea"
45 readonly property color sdLightGrey: "#eaeaea"
48− readonly property color sdDarkGrey: "#dddddd"
49− readonly property color sdFontColor: "#5d5d5d"
50 readonly property real contentSpacing: units.gu(2)
46 readonly property real contentSpacing: units.gu(2)
51 readonly property bool canBeClosed: type === Notification.Ephemeral
47 readonly property bool canBeClosed: type === Notification.Ephemeral
52 property bool hasMouse
48 property bool hasMouse
49+ property bool inverseMode
53 property url background: ""
50 property url background: ""
54
51
55 objectName: "background"
52 objectName: "background"
@@ -59,7 +56,7 @@ StyledItem {
59 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
56 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
60
57
61 theme: ThemeSettings {
58 theme: ThemeSettings {
62− name: "Ubuntu.Components.Themes.Ambiance"
59+ name: darkOnBright ? "Ubuntu.Components.Themes.Ambiance" : "Ubuntu.Components.Themes.SuruDark"
63 }
60 }
64
61
65 state: {
62 state: {
@@ -285,7 +282,6 @@ StyledItem {
285 }
282 }
286 visible: type !== Notification.Confirmation
283 visible: type !== Notification.Confirmation
287 fontSize: "medium"
284 fontSize: "medium"
288− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
289 elide: Text.ElideRight
285 elide: Text.ElideRight
290 textFormat: Text.PlainText
286 textFormat: Text.PlainText
291 }
287 }
@@ -300,7 +296,6 @@ StyledItem {
300 }
296 }
301 visible: body != "" && type !== Notification.Confirmation
297 visible: body != "" && type !== Notification.Confirmation
302 fontSize: "small"
298 fontSize: "small"
303− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
304 wrapMode: Text.Wrap
299 wrapMode: Text.Wrap
305 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
300 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
306 elide: Text.ElideRight
301 elide: Text.ElideRight
@@ -341,7 +336,6 @@ StyledItem {
341 anchors.horizontalCenter: parent.horizontalCenter
336 anchors.horizontalCenter: parent.horizontalCenter
342 visible: type === Notification.Confirmation && body !== ""
337 visible: type === Notification.Confirmation && body !== ""
343 fontSize: "medium"
338 fontSize: "medium"
344− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
345 wrapMode: Text.WordWrap
339 wrapMode: Text.WordWrap
346 maximumLineCount: 1
340 maximumLineCount: 1
347 elide: Text.ElideRight
341 elide: Text.ElideRight
@@ -361,7 +355,7 @@ StyledItem {
361 }
355 }
362
356
363 height: units.gu(1)
357 height: units.gu(1)
364− backgroundColor: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey
358+ backgroundColor: theme.palette.normal.background
365 aspect: UbuntuShape.Flat
359 aspect: UbuntuShape.Flat
366 radius: "small"
360 radius: "small"
367
361
@@ -370,7 +364,7 @@ StyledItem {
370 objectName: "innerBar"
364 objectName: "innerBar"
371 width: valueIndicator.width * valueIndicator.value / 100
365 width: valueIndicator.width * valueIndicator.value / 100
372 height: units.gu(1)
366 height: units.gu(1)
373− backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"
367+ backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? theme.palette.normal.activity : theme.palette.highlighted.foreground
374 aspect: UbuntuShape.Flat
368 aspect: UbuntuShape.Flat
375 radius: "small"
369 radius: "small"
376 }
370 }
@@ -447,7 +441,7 @@ StyledItem {
447 objectName: "notify_oot_button" + index
441 objectName: "notify_oot_button" + index
448 width: oneOverTwoCase.width
442 width: oneOverTwoCase.width
449 text: oneOverTwoLoaderTop.actionLabel
443 text: oneOverTwoLoaderTop.actionLabel
450− color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : sdDarkGrey
444+ color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? UbuntuColors.green : theme.palette.normal.baseText
451 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
445 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
452 }
446 }
453 }
447 }
@@ -475,7 +469,7 @@ StyledItem {
475 objectName: "notify_oot_button" + index
469 objectName: "notify_oot_button" + index
476 width: oneOverTwoCase.width / 2 - spacing * 2
470 width: oneOverTwoCase.width / 2 - spacing * 2
477 text: oneOverTwoLoaderBottom.actionLabel
471 text: oneOverTwoLoaderBottom.actionLabel
478− color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : sdDarkGrey
472+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? UbuntuColors.red : theme.palette.normal.baseText
479 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
473 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
480 }
474 }
481 }
475 }
@@ -536,12 +530,12 @@ StyledItem {
536 width: buttonRow.width / 2 - spacing * 2
530 width: buttonRow.width / 2 - spacing * 2
537 text: loader.actionLabel
531 text: loader.actionLabel
538 color: {
532 color: {
539− var result = sdDarkGrey;
533+ var result = theme.palette.normal.baseText;
540 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
534 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
541− result = green;
535+ result = UbuntuColors.green;
542 }
536 }
543 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
537 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
544− result = red;
538+ result = UbuntuColors.red;
545 }
539 }
546 return result;
540 return result;
547 }
541 }
qml/Notifications/Notifications.qml+2
@@ -29,6 +29,7 @@ ListView {
29 property real margin
29 property real margin
30 property bool useModal: snapDecisionProxyModel.count > 0
30 property bool useModal: snapDecisionProxyModel.count > 0
31 property bool hasMouse
31 property bool hasMouse
32+ property bool inverseMode
32 property url background: ""
33 property url background: ""
33
34
34 UnitySortFilterProxyModel {
35 UnitySortFilterProxyModel {
@@ -61,6 +62,7 @@ ListView {
61 maxHeight: notificationList.height
62 maxHeight: notificationList.height
62 margins: notificationList.margin
63 margins: notificationList.margin
63 hasMouse: notificationList.hasMouse
64 hasMouse: notificationList.hasMouse
65+ inverseMode: notificationList.inverseMode
64 background: notificationList.background
66 background: notificationList.background
65
67
66 // make sure there's no opacity-difference between the several
68 // make sure there's no opacity-difference between the several
qml/Notifications/OptionToggle.qml+1−1
@@ -96,7 +96,7 @@ UbuntuShape {
96
96
97 width: parent.width
97 width: parent.width
98 text: splitLabel[3]
98 text: splitLabel[3]
99− color:"#5d5d5d"
99+ color: theme.palette.normal.backgroundText
100 fontSize: "small"
100 fontSize: "small"
101 maximumLineCount: 1
101 maximumLineCount: 1
102 elide: Text.ElideRight
102 elide: Text.ElideRight
qml/Panel/IndicatorItem.qml−7
@@ -113,13 +113,6 @@ IndicatorDelegate {
113 source: modelData
113 source: modelData
114 color: root.color
114 color: root.color
115 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
115 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
116−
117− opacity: {
118− if (!expanded) return 1.0;
119− if (!selected) return 0.6;
120− return 1.0;
121− }
122− Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
123 }
116 }
124 }
117 }
125 }
118 }
qml/Panel/Indicators/MenuItemFactory.qml+5
@@ -228,6 +228,11 @@ Item {
228 text: menuData && menuData.label || ""
228 text: menuData && menuData.label || ""
229 iconSource: menuData && menuData.icon || ""
229 iconSource: menuData && menuData.icon || ""
230 value : menuData && menuData.actionState || 0.0
230 value : menuData && menuData.actionState || 0.0
231+ enabled: menuData && menuData.sensitive || false
232+ // FIXME: Because of this bug, setting it to the theme foreground color (white)
233+ // currently doesn't work. Let's hack it to be "close enough"
234+ // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555784
235+ foregroundColor: "#fffffe"
231 highlightWhenPressed: false
236 highlightWhenPressed: false
232 }
237 }
233 }
238 }
qml/Panel/IndicatorsMenu.qml+2−3
@@ -38,7 +38,7 @@ Showable {
38 property bool enableHint: true
38 property bool enableHint: true
39 property bool contentEnabled: true
39 property bool contentEnabled: true
40 property bool showOnClick: true
40 property bool showOnClick: true
41− property color panelColor: UbuntuColors.jet
41+ property color panelColor: theme.palette.normal.background
42
42
43 signal showTapped(point position)
43 signal showTapped(point position)
44
44
@@ -76,7 +76,6 @@ Showable {
76 MenuContent {
76 MenuContent {
77 id: content
77 id: content
78 objectName: "menuContent"
78 objectName: "menuContent"
79− color: root.panelColor
80
79
81 anchors {
80 anchors {
82 left: parent.left
81 left: parent.left
@@ -111,7 +110,7 @@ Showable {
111 height: units.gu(0.5)
110 height: units.gu(0.5)
112 gradient: Gradient {
111 gradient: Gradient {
113 GradientStop { position: 0.0; color: "transparent" }
112 GradientStop { position: 0.0; color: "transparent" }
114− GradientStop { position: 1.0; color: root.panelColor }
113+ GradientStop { position: 1.0; color: theme.palette.normal.background }
115 }
114 }
116 opacity: 0.3
115 opacity: 0.3
117 }
116 }
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
89
89
90 Rectangle {
90 Rectangle {
91 id: indicatorAreaBackground
91 id: indicatorAreaBackground
92− color: callHint.visible ? UbuntuColors.green : indicators.panelColor
92+ color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
93 anchors {
93 anchors {
94 top: parent.top
94 top: parent.top
95 left: parent.left
95 left: parent.left
qml/Shell.qml+1
@@ -663,6 +663,7 @@ Item {
663 model: NotificationBackend.Model
663 model: NotificationBackend.Model
664 margin: units.gu(1)
664 margin: units.gu(1)
665 hasMouse: shell.hasMouse
665 hasMouse: shell.hasMouse
666+ inverseMode: panel.indicators.shown
666 background: wallpaperResolver.background
667 background: wallpaperResolver.background
667
668
668 y: topmostIsFullscreen ? 0 : panel.panelHeight
669 y: topmostIsFullscreen ? 0 : panel.panelHeight
qml/Stages/WindowDecoration.qml+1−1
@@ -67,7 +67,7 @@ MouseArea {
67 anchors.fill: parent
67 anchors.fill: parent
68 anchors.bottomMargin: -radius
68 anchors.bottomMargin: -radius
69 radius: units.gu(.5)
69 radius: units.gu(.5)
70− color: "#292929"
70+ color: theme.palette.normal.background
71 }
71 }
72
72
73 Row {
73 Row {
tests/qmltests/Notifications/tst_Notifications.qml+13−8
@@ -187,7 +187,8 @@ Item {
187
187
188 anchors.fill: parent
188 anchors.fill: parent
189 model: mockModel
189 model: mockModel
190− hasMouse: false
190+ hasMouse: fakeMouseCB.checked
191+ inverseMode: inverseModeCB.checked
191 }
192 }
192 }
193 }
193
194
@@ -261,19 +262,23 @@ Item {
261 Layout.fillWidth: true
262 Layout.fillWidth: true
262 CheckBox {
263 CheckBox {
263 id: fakeMouseCB
264 id: fakeMouseCB
264− onClicked: {
265− if (checked) {
266− notifications.hasMouse = true;
267− } else {
268− notifications.hasMouse = false;
269− }
270− }
271 }
265 }
272 Label {
266 Label {
273 text: "With fake mouse"
267 text: "With fake mouse"
274 anchors.verticalCenter: parent.verticalCenter
268 anchors.verticalCenter: parent.verticalCenter
275 }
269 }
276 }
270 }
271+
272+ RowLayout {
273+ Layout.fillWidth: true
274+ CheckBox {
275+ id: inverseModeCB
276+ }
277+ Label {
278+ text: "Inverse mode"
279+ anchors.verticalCenter: parent.verticalCenter
280+ }
281+ }
277 }
282 }
278 }
283 }
279
284
tests/qmltests/Panel/IndicatorTest.qml+2−1
@@ -24,7 +24,8 @@ import Unity.Indicators 0.1 as Indicators
24
24
25Rectangle {
25Rectangle {
26 id: root
26 id: root
27− color: "white"
27+ color: theme.palette.normal.background
28+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
28
29
29 property alias indicatorsModel: __indicatorsModel
30 property alias indicatorsModel: __indicatorsModel
30 property alias originalModelData: __indicatorsModel.originalModelData
31 property alias originalModelData: __indicatorsModel.originalModelData
tests/qmltests/Panel/tst_IndicatorItem.qml−3
@@ -184,21 +184,18 @@ Rectangle {
184
184
185 function test_select() {
185 function test_select() {
186 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
186 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
187− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
188 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
187 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
189 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
188 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
190 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
189 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
191
190
192 indicatorItem.expanded = true;
191 indicatorItem.expanded = true;
193 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);
192 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);
194− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);
195 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);
193 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);
196 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);
194 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);
197 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);
195 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);
198
196
199 indicatorItem.selected = true;
197 indicatorItem.selected = true;
200 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
198 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
201− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
202 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
199 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
203 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
200 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
204 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
201 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
tests/qmltests/Panel/tst_IndicatorItemRow.qml+1−2
@@ -26,7 +26,6 @@ IndicatorTest {
26 id: root
26 id: root
27 width: units.gu(120)
27 width: units.gu(120)
28 height: units.gu(40)
28 height: units.gu(40)
29− color: "white"
30
29
31 RowLayout {
30 RowLayout {
32 anchors.fill: parent
31 anchors.fill: parent
@@ -40,7 +39,7 @@ IndicatorTest {
40 color: "blue"
39 color: "blue"
41
40
42 Rectangle {
41 Rectangle {
43− color: "black"
42+ color: theme.palette.normal.background
44 anchors.fill: indicatorsRow
43 anchors.fill: indicatorsRow
45 }
44 }
46
45
tests/qmltests/Panel/tst_IndicatorsMenu.qml−1
@@ -26,7 +26,6 @@ IndicatorTest {
26 id: root
26 id: root
27 width: units.gu(80)
27 width: units.gu(80)
28 height: units.gu(71)
28 height: units.gu(71)
29− color: "white"
30
29
31 RowLayout {
30 RowLayout {
32 anchors.fill: parent
31 anchors.fill: parent
tests/qmltests/tst_Shell.qml+13−1
@@ -141,8 +141,10 @@ Rectangle {
141 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
141 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
142 spacing: units.gu(1)
142 spacing: units.gu(1)
143
143
144− Row {
144+ Flow {
145 spacing: units.gu(1)
145 spacing: units.gu(1)
146+ anchors { left: parent.left; right: parent.right }
147+
146 Button {
148 Button {
147 text: "Show Greeter"
149 text: "Show Greeter"
148 activeFocusOnPress: false
150 activeFocusOnPress: false
@@ -169,6 +171,16 @@ Rectangle {
169 }
171 }
170 }
172 }
171 }
173 }
174+ Button {
175+ text: callManager.foregroundCall ? "Hide Call" : "Show Call"
176+ activeFocusOnPress: false
177+ onClicked: {
178+ if (shellLoader.status !== Loader.Ready)
179+ return;
180+
181+ callManager.foregroundCall = callManager.foregroundCall ? null : phoneCall;
182+ }
183+ }
172 }
184 }
173 ListItem.ItemSelector {
185 ListItem.ItemSelector {
174 anchors { left: parent.left; right: parent.right }
186 anchors { left: parent.left; right: parent.right }