git.iko.soy/unity8
on xenial help sign in
Merge & make tests pass
commit506f3bb5a21754b7bb26423868eddc576315b35d authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 13 Apr 2016, 10:16 (11 years ago) parent4a93bc78e46b45
7 files changed+188−165
compare with xenial
unifiedsplit
debian/changelog+8 debian/control+1 po/it.po+82−77 po/uk.po+82−76 tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+2 tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+3−2 tests/qmltests/Dash/tst_Card.qml+10−10
debian/changelog+8
@@ -1,3 +1,11 @@
1+unity8 (8.12+16.04.20160401-0ubuntu1) xenial; urgency=medium
2+
3+ * Add missing Testsuite header
4+ * Skip the failing test until we have a working solution for bug
5+ #1564571 (LP: #1564571)
6+
7+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 01 Apr 2016 08:32:16 +0000
8+
19unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium
210
311 [ Albert Astals Cid ]
debian/control+1
@@ -66,6 +66,7 @@ Homepage: http://launchpad.net/unity
6666# and sync up the code again.
6767Vcs-Bzr: https://code.launchpad.net/unity8
6868Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
69+XS-Testsuite: autopkgtest
6970X-Ubuntu-Use-Langpack: yes
7071
7172Package: indicators-client
po/it.po+82−77
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2015-09-18 08:24+0000\n"
12−"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
11+"PO-Revision-Date: 2016-04-03 16:08+0000\n"
12+"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
1313"Language-Team: Italian <it@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
19−"X-Generator: Launchpad (build 17958)\n"
18+"X-Launchpad-Export-Date: 2016-04-04 05:38+0000\n"
19+"X-Generator: Launchpad (build 17972)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -188,11 +188,11 @@ msgstr "Aggiungi ai preferiti"
188188
189189#: qml/Dash/FiltersPopover.qml:60
190190msgid "Refine your results"
191−msgstr ""
191+msgstr "Affina la ricerca"
192192
193193#: qml/Dash/FiltersPopover.qml:69
194194msgid "Reset"
195−msgstr ""
195+msgstr "Azzera"
196196
197197#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
198198msgid "See less"
@@ -209,11 +209,11 @@ msgstr "Cerca"
209209
210210#: qml/Dash/PageHeaderExtraPanel.qml:55
211211msgid "Recent Searches"
212−msgstr ""
212+msgstr "Ricerche recenti"
213213
214214#: qml/Dash/PageHeaderExtraPanel.qml:66
215215msgid "Clear All"
216−msgstr ""
216+msgstr "Pulisci tutto"
217217
218218#: qml/Dash/Previews/PreviewActionCombo.qml:35
219219msgid "More..."
@@ -433,50 +433,55 @@ msgstr "Richiama"
433433#: qml/Stages/SideStage.qml:76
434434msgid "Drag using 3 fingers any application from one window to the other"
435435msgstr ""
436+"Trascinare con 3 dita qualsiasi applicazione da una finestra all'altra"
436437
437438#: qml/Tutorial/TutorialBottom.qml:78
438439msgid "Swipe up to add a contact"
439−msgstr ""
440+msgstr "Scorrere verso l'alto per aggiungere un contatto"
440441
441442#: qml/Tutorial/TutorialBottom.qml:80
442443msgid "Swipe up for favorite calculations"
443−msgstr ""
444+msgstr "Scorrere verso l'alto per i calcoli preferiti"
444445
445446#: qml/Tutorial/TutorialBottom.qml:82
446447msgid "Swipe up for recent calls"
447−msgstr ""
448+msgstr "Scorrere verso l'alto per le chiamate recenti"
448449
449450#: qml/Tutorial/TutorialBottom.qml:84
450451msgid "Swipe up to create a message"
451−msgstr ""
452+msgstr "Scorrere verso l'alto per creare un messaggio"
452453
453454#: qml/Tutorial/TutorialBottom.qml:85
454455msgid "Swipe up to manage the app"
455−msgstr ""
456+msgstr "Scorrere verso l'alto per gestire l'applicazione"
456457
457458#: qml/Tutorial/TutorialLeft.qml:47
458459msgid "Swipe from the left edge to open the launcher"
459−msgstr ""
460+msgstr "Scorrere dal bordo sinistro per aprire il launcher"
460461
461462#: qml/Tutorial/TutorialLeftLong.qml:47
462463msgid "Long swipe from the left edge to open the Today scope"
463−msgstr ""
464+msgstr "Scorrere lentamente dal bordo sinistro per aprire la scope Oggi"
464465
465466#: qml/Tutorial/TutorialRight.qml:54
466467msgid "Hover your mouse on the right edge to view your open apps"
467468msgstr ""
469+"Posizionare il mouse sul bordo destro per vedere le applicazioni aperte"
468470
469471#: qml/Tutorial/TutorialRight.qml:55
470472msgid "Short or long swipe from the right edge to view your open apps"
471473msgstr ""
474+"Scorrere lentamente o velocemente dal bordo destro per visualizzare le "
475+"applicazioni aperte"
472476
473477#: qml/Tutorial/TutorialTop.qml:53
474478msgid "Swipe from the top right edge to open the notification bar"
475479msgstr ""
480+"Scorrere dal bordo superiore destro per aprire la barra delle modifiche"
476481
477482#: qml/Tutorial/TutorialTop.qml:54
478483msgid "Swipe from the top edge to open the notification bar"
479−msgstr ""
484+msgstr "Scorrere dal bordo superiore per aprire la barra delle notifiche"
480485
481486#: qml/Wizard/Page.qml:54
482487msgctxt "Button: Go back one page in the Wizard"
@@ -485,7 +490,7 @@ msgstr "Indietro"
485490
486491#: qml/Wizard/Pages/10-welcome.qml:27
487492msgid "Language"
488−msgstr ""
493+msgstr "Lingua"
489494
490495#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
491496#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -494,7 +499,7 @@ msgstr ""
494499#: qml/Wizard/Pages/passcode-desktop.qml:124
495500#: qml/Wizard/Pages/password-set.qml:141
496501msgid "Next"
497−msgstr ""
502+msgstr "Avanti"
498503
499504#: qml/Wizard/Pages/30-wifi.qml:29
500505msgid "Connect to Wi‑Fi"
@@ -502,15 +507,15 @@ msgstr "Connetti al Wi-Fi"
502507
503508#: qml/Wizard/Pages/30-wifi.qml:130
504509msgid "Connected"
505−msgstr ""
510+msgstr "Connessi"
506511
507512#: qml/Wizard/Pages/30-wifi.qml:163
508513msgid "Available Wi-Fi networks"
509−msgstr ""
514+msgstr "Reti Wi-Fi disponibili"
510515
511516#: qml/Wizard/Pages/30-wifi.qml:164
512517msgid "No available Wi-Fi networks"
513−msgstr ""
518+msgstr "Nessuna rete Wi-Fi disponibile"
514519
515520#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
516521#: qml/Wizard/Pages/sim.qml:101
@@ -519,98 +524,102 @@ msgstr "Salta"
519524
520525#: qml/Wizard/Pages/40-location.qml:27
521526msgid "Location Services"
522−msgstr ""
527+msgstr "Servizi di posizionamento"
523528
524529#: qml/Wizard/Pages/40-location.qml:83
525530msgid ""
526531"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
527532"(recommended)"
528533msgstr ""
534+"Usa in maniera anonima GPS, punti di accesso Wi-Fi e rete cellulare per "
535+"determinare la posizione (suggerito)"
529536
530537#: qml/Wizard/Pages/40-location.qml:105
531538#, qt-format
532539msgid "By selecting this option you agree to the Nokia HERE %1."
533−msgstr ""
540+msgstr "Selezionando questa opzione si accettano i %1 di Nokia HERE."
534541
535542#: qml/Wizard/Pages/40-location.qml:106
536543msgctxt "part of: Nokia HERE terms and conditions"
537544msgid "terms and conditions"
538−msgstr ""
545+msgstr "termini e condizioni"
539546
540547#: qml/Wizard/Pages/40-location.qml:160
541548msgid "GPS only"
542−msgstr ""
549+msgstr "Solo GPS"
543550
544551#: qml/Wizard/Pages/40-location.qml:214
545552msgid "Don't use my location"
546−msgstr ""
553+msgstr "Non utilizzare la posizione"
547554
548555#: qml/Wizard/Pages/40-location.qml:260
549556msgid "You can change it later in System Settings."
550−msgstr ""
557+msgstr "È possibile effettuare modifiche in seguito dalle Impostazioni."
551558
552559#: qml/Wizard/Pages/50-timezone.qml:29
553560msgid "Time Zone"
554−msgstr ""
561+msgstr "Fuso orario"
555562
556563#: qml/Wizard/Pages/50-timezone.qml:178
557564msgid "Enter your city"
558−msgstr ""
565+msgstr "Inserisci la propria città"
559566
560567#: qml/Wizard/Pages/60-account.qml:24
561568msgid "Personalize Your Device"
562−msgstr ""
569+msgstr "Personalizzare il dispositivo"
563570
564571#: qml/Wizard/Pages/60-account.qml:48
565572msgid "Preferred Name"
566−msgstr ""
573+msgstr "Nome preferito"
567574
568575#: qml/Wizard/Pages/70-passwd-type.qml:39
569576msgid "Lock Screen"
570−msgstr ""
577+msgstr "Blocco schermo"
571578
572579#: qml/Wizard/Pages/70-passwd-type.qml:101
573580msgctxt "Label: Type of security method"
574581msgid "Create new password"
575−msgstr ""
582+msgstr "Crea nuova password"
576583
577584#: qml/Wizard/Pages/70-passwd-type.qml:103
578585msgctxt "Label: Type of security method"
579586msgid "Create passcode (numbers only)"
580−msgstr ""
587+msgstr "Crea codice (numerico)"
581588
582589#: qml/Wizard/Pages/70-passwd-type.qml:105
583590msgctxt "Label: Type of security method"
584591msgid "No lock code"
585−msgstr ""
592+msgstr "Nessun codice di blocco"
586593
587594#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
588595msgid "Privacy Policy"
589−msgstr ""
596+msgstr "Informativa sulla privacy"
590597
591598#: qml/Wizard/Pages/75-report-check.qml:26
592599msgid "Help Us Improve"
593−msgstr ""
600+msgstr "Aiutaci a migliorare"
594601
595602#: qml/Wizard/Pages/75-report-check.qml:59
596603msgid "Improve system performance by sending us crashes and error reports."
597604msgstr ""
605+"Migliora l'efficienza del sistema inviandoci notificazioni di errori e "
606+"blocchi critici."
598607
599608#: qml/Wizard/Pages/75-report-check.qml:60
600609msgid "Privacy policy"
601−msgstr ""
610+msgstr "Informativa sulla privacy"
602611
603612#: qml/Wizard/Pages/80-finished.qml:89
604613msgid "Welcome to Ubuntu"
605−msgstr ""
614+msgstr "Benvenuti in Ubuntu"
606615
607616#: qml/Wizard/Pages/80-finished.qml:104
608617msgid "You are ready to use your device now"
609−msgstr ""
618+msgstr "Il dispositivo è pronto per essere utilizzato"
610619
611620#: qml/Wizard/Pages/80-finished.qml:124
612621msgid "Get Started"
613−msgstr ""
622+msgstr "Inizia"
614623
615624#: qml/Wizard/Pages/here-terms.qml:25
616625msgid "Terms & Conditions"
@@ -618,7 +627,7 @@ msgstr "Termini e condizioni"
618627
619628#: qml/Wizard/Pages/here-terms.qml:69
620629msgid "Your device uses positioning technologies provided by HERE."
621−msgstr ""
630+msgstr "Il dispositivo usa tecnologie di posizionamento fornite da HERE."
622631
623632#: qml/Wizard/Pages/here-terms.qml:81
624633msgid ""
@@ -626,21 +635,26 @@ msgid ""
626635"collects information about nearby cell towers and Wi-Fi hotspots around your "
627636"current location whenever your position is being found."
628637msgstr ""
638+"Per fornire servizi di posizionamento e migliorare la qualità, ogni volta "
639+"che la posizione viene rilevata HERE raccoglie informazioni riguardo ai "
640+"punti di accesso Wi-Fi e ai ripetitori cellulari nelle vicinanze."
629641
630642#: qml/Wizard/Pages/here-terms.qml:93
631643msgid ""
632644"The information collected is used to analyze the service and to improve the "
633645"use of service, but not to identify you personally."
634646msgstr ""
647+"Le informazioni raccolte vengono utilizzate per analizzare il servizio e "
648+"migliorarne l'uso, non per identificare l'utente."
635649
636650#: qml/Wizard/Pages/here-terms.qml:106
637651#, qt-format
638652msgid "By continuing, you agree to the HERE platform %1 and %2."
639−msgstr ""
653+msgstr "Continuando, si accettano i %1 e la %2 della piattaforma HERE."
640654
641655#: qml/Wizard/Pages/here-terms.qml:107
642656msgid "Service Terms"
643−msgstr ""
657+msgstr "termini di servizio"
644658
645659#: qml/Wizard/Pages/passcode-confirm.qml:43
646660#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -649,69 +663,69 @@ msgstr "Conferma codice"
649663
650664#: qml/Wizard/Pages/passcode-confirm.qml:45
651665msgid "Incorrect passcode."
652−msgstr ""
666+msgstr "Codice errato."
653667
654668#: qml/Wizard/Pages/passcode-confirm.qml:45
655669msgctxt "Enter the passcode again"
656670msgid "Please re-enter."
657−msgstr ""
671+msgstr "Ripetere."
658672
659673#: qml/Wizard/Pages/passcode-desktop.qml:30
660674msgid "Lock Screen Passcode"
661−msgstr ""
675+msgstr "Codice blocco schermo"
662676
663677#: qml/Wizard/Pages/passcode-desktop.qml:56
664678msgid "Enter 4 numbers to setup your passcode"
665−msgstr ""
679+msgstr "Inserire 4 numeri per impostare il codice"
666680
667681#: qml/Wizard/Pages/passcode-desktop.qml:65
668682#: qml/Wizard/Pages/passcode-set.qml:54
669683msgid "Choose passcode"
670−msgstr ""
684+msgstr "Scegli codice"
671685
672686#: qml/Wizard/Pages/passcode-desktop.qml:105
673687msgid "Passcode too short"
674−msgstr ""
688+msgstr "Codice troppo corto"
675689
676690#: qml/Wizard/Pages/passcode-desktop.qml:107
677691msgid "Passcodes match"
678−msgstr ""
692+msgstr "I codici corrispondono"
679693
680694#: qml/Wizard/Pages/passcode-desktop.qml:109
681695msgid "Passcodes do not match"
682−msgstr ""
696+msgstr "I codici non corrispondono"
683697
684698#: qml/Wizard/Pages/passcode-set.qml:62
685699msgid "Passcode must be 4 characters long"
686−msgstr ""
700+msgstr "Il codice deve essere di 4 caratteri"
687701
688702#: qml/Wizard/Pages/password-set.qml:30
689703msgid "Lock Screen Password"
690−msgstr ""
704+msgstr "Password blocco schermo"
691705
692706#: qml/Wizard/Pages/password-set.qml:61
693707msgid "Enter at least 8 characters"
694−msgstr ""
708+msgstr "Inserire almeno 8 caratteri"
695709
696710#: qml/Wizard/Pages/password-set.qml:73
697711msgid "Choose password"
698−msgstr ""
712+msgstr "Scegli una password"
699713
700714#: qml/Wizard/Pages/password-set.qml:103
701715msgid "Confirm password"
702−msgstr ""
716+msgstr "Conferma password"
703717
704718#: qml/Wizard/Pages/sim.qml:27
705719msgid "No SIM card installed"
706−msgstr ""
720+msgstr "Nessuna scheda SIM installata"
707721
708722#: qml/Wizard/Pages/sim.qml:54
709723msgid "SIM card added"
710−msgstr ""
724+msgstr "Scheda SIM aggiunta"
711725
712726#: qml/Wizard/Pages/sim.qml:55
713727msgid "You must restart the device to access the mobile network."
714−msgstr ""
728+msgstr "È necessario riavviare il dispositivo per poter accedere alla rete."
715729
716730#: qml/Wizard/Pages/sim.qml:59
717731msgid "Restart"
@@ -719,35 +733,35 @@ msgstr "Riavvia"
719733
720734#: qml/Wizard/Pages/sim.qml:78
721735msgid "You won’t be able to make calls or use text messaging without a SIM."
722−msgstr ""
736+msgstr "Senza una SIM non è possibile chiamare o inviare messaggi SMS."
723737
724738#: qml/Wizard/Pages/sim.qml:90
725739msgid "To proceed with no SIM tap Skip."
726−msgstr ""
740+msgstr "Per continuare senza SIM, premere Salta."
727741
728742#: qml/Wizard/PasswordMeter.qml:87
729743msgid "Passwords match"
730−msgstr ""
744+msgstr "Le password corrispondono"
731745
732746#: qml/Wizard/PasswordMeter.qml:89
733747msgid "Passwords do not match"
734−msgstr ""
748+msgstr "Le password non corrispondono"
735749
736750#: qml/Wizard/PasswordMeter.qml:93
737751msgid "Strong password"
738−msgstr ""
752+msgstr "Password robusta"
739753
740754#: qml/Wizard/PasswordMeter.qml:95
741755msgid "Fair password"
742−msgstr ""
756+msgstr "Password discreta"
743757
744758#: qml/Wizard/PasswordMeter.qml:97
745759msgid "Weak password"
746−msgstr ""
760+msgstr "Password fragile"
747761
748762#: qml/Wizard/PasswordMeter.qml:99
749763msgid "Very weak password"
750−msgstr ""
764+msgstr "Password molto fragile"
751765
752766#~ msgid "Confirm"
753767#~ msgstr "Conferma"
@@ -1069,12 +1083,3 @@ msgstr ""
10691083
10701084#~ msgid "Call back"
10711085#~ msgstr "Richiama"
1072−
1073−#~ msgid "Your device is now ready to use."
1074−#~ msgstr "Il dispositivo è ora pronto all'uso."
1075−
1076−#~ msgid "Please select how you’d like to unlock your device."
1077−#~ msgstr "Selezionare come sbloccare il proprio dispositivo."
1078−
1079−#~ msgid "Welcome to your Ubuntu device."
1080−#~ msgstr "Benvenuti sul vostro dispositivo Ubuntu."
po/uk.po+82−76
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2015-07-04 05:53+0000\n"
11+"PO-Revision-Date: 2016-04-01 17:32+0000\n"
1212"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
1313"Language-Team: Ukrainian <uk@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
20−"X-Generator: Launchpad (build 17958)\n"
19+"X-Launchpad-Export-Date: 2016-04-02 06:24+0000\n"
20+"X-Generator: Launchpad (build 17972)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -190,11 +190,11 @@ msgstr "Додати до вибраного"
190190
191191#: qml/Dash/FiltersPopover.qml:60
192192msgid "Refine your results"
193−msgstr ""
193+msgstr "Покращіть результати"
194194
195195#: qml/Dash/FiltersPopover.qml:69
196196msgid "Reset"
197−msgstr ""
197+msgstr "Скинути"
198198
199199#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200200msgid "See less"
@@ -211,11 +211,11 @@ msgstr "Пошук"
211211
212212#: qml/Dash/PageHeaderExtraPanel.qml:55
213213msgid "Recent Searches"
214−msgstr ""
214+msgstr "Останні пошуки"
215215
216216#: qml/Dash/PageHeaderExtraPanel.qml:66
217217msgid "Clear All"
218−msgstr ""
218+msgstr "Очистити все"
219219
220220#: qml/Dash/Previews/PreviewActionCombo.qml:35
221221msgid "More..."
@@ -437,51 +437,54 @@ msgstr "Зворотний виклик"
437437
438438#: qml/Stages/SideStage.qml:76
439439msgid "Drag using 3 fingers any application from one window to the other"
440−msgstr ""
440+msgstr "Пересувайте будь-який додаток за допомогою трьох пальців"
441441
442442#: qml/Tutorial/TutorialBottom.qml:78
443443msgid "Swipe up to add a contact"
444−msgstr ""
444+msgstr "Проведіть догори, щоб додати контакт"
445445
446446#: qml/Tutorial/TutorialBottom.qml:80
447447msgid "Swipe up for favorite calculations"
448−msgstr ""
448+msgstr "Проведіть вгору, щоб побачити список вибраних обчислень"
449449
450450#: qml/Tutorial/TutorialBottom.qml:82
451451msgid "Swipe up for recent calls"
452−msgstr ""
452+msgstr "Проведіть догори, щоб побачити останні набрані номери"
453453
454454#: qml/Tutorial/TutorialBottom.qml:84
455455msgid "Swipe up to create a message"
456−msgstr ""
456+msgstr "Проведіть догори, щоб написати нове повідомлення"
457457
458458#: qml/Tutorial/TutorialBottom.qml:85
459459msgid "Swipe up to manage the app"
460−msgstr ""
460+msgstr "Проведіть пальцем догори, щоб керувати додатком"
461461
462462#: qml/Tutorial/TutorialLeft.qml:47
463463msgid "Swipe from the left edge to open the launcher"
464−msgstr ""
464+msgstr "Проведіть від лівого краю екрану, щоб відкрити меню запуску"
465465
466466#: qml/Tutorial/TutorialLeftLong.qml:47
467467msgid "Long swipe from the left edge to open the Today scope"
468−msgstr ""
468+msgstr "Довге проведення від лівого краю відкриває область «Сьогодні»"
469469
470470#: qml/Tutorial/TutorialRight.qml:54
471471msgid "Hover your mouse on the right edge to view your open apps"
472−msgstr ""
472+msgstr "Наведіть вказівник на правий кут, щоб побачити відкриті застосунки"
473473
474474#: qml/Tutorial/TutorialRight.qml:55
475475msgid "Short or long swipe from the right edge to view your open apps"
476476msgstr ""
477+"Коротке або довге проведення від правого краю відкриває перегляд списку "
478+"відкритих програм"
477479
478480#: qml/Tutorial/TutorialTop.qml:53
479481msgid "Swipe from the top right edge to open the notification bar"
480482msgstr ""
483+"Проведіть пальцем від верхнього правого краю для відкриття панелі сповіщень"
481484
482485#: qml/Tutorial/TutorialTop.qml:54
483486msgid "Swipe from the top edge to open the notification bar"
484−msgstr ""
487+msgstr "Проведіть пальцем від верхнього краю для відкриття панелі сповіщень"
485488
486489#: qml/Wizard/Page.qml:54
487490msgctxt "Button: Go back one page in the Wizard"
@@ -490,7 +493,7 @@ msgstr "Назад"
490493
491494#: qml/Wizard/Pages/10-welcome.qml:27
492495msgid "Language"
493−msgstr ""
496+msgstr "Мова"
494497
495498#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
496499#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -499,7 +502,7 @@ msgstr ""
499502#: qml/Wizard/Pages/passcode-desktop.qml:124
500503#: qml/Wizard/Pages/password-set.qml:141
501504msgid "Next"
502−msgstr ""
505+msgstr "Наступне"
503506
504507#: qml/Wizard/Pages/30-wifi.qml:29
505508msgid "Connect to Wi‑Fi"
@@ -507,15 +510,15 @@ msgstr "З’єднатися із Wi‑Fi"
507510
508511#: qml/Wizard/Pages/30-wifi.qml:130
509512msgid "Connected"
510−msgstr ""
513+msgstr "Під’єднано"
511514
512515#: qml/Wizard/Pages/30-wifi.qml:163
513516msgid "Available Wi-Fi networks"
514−msgstr ""
517+msgstr "Доступні мережі Wi-Fi"
515518
516519#: qml/Wizard/Pages/30-wifi.qml:164
517520msgid "No available Wi-Fi networks"
518−msgstr ""
521+msgstr "Не доступні мережі Wi-Fi"
519522
520523#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
521524#: qml/Wizard/Pages/sim.qml:101
@@ -524,98 +527,101 @@ msgstr "Пропустити"
524527
525528#: qml/Wizard/Pages/40-location.qml:27
526529msgid "Location Services"
527−msgstr ""
530+msgstr "Сервіс Геолокації"
528531
529532#: qml/Wizard/Pages/40-location.qml:83
530533msgid ""
531534"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
532535"(recommended)"
533536msgstr ""
537+"Використовувати анонімно GPS, точки доступу Wi-Fi та мобільну мережу для "
538+"визначення місцерозташування (рекомендовано)"
534539
535540#: qml/Wizard/Pages/40-location.qml:105
536541#, qt-format
537542msgid "By selecting this option you agree to the Nokia HERE %1."
538−msgstr ""
543+msgstr "Обравши цю опцію, Ви погоджуєтеся з Nokia HERE %1"
539544
540545#: qml/Wizard/Pages/40-location.qml:106
541546msgctxt "part of: Nokia HERE terms and conditions"
542547msgid "terms and conditions"
543−msgstr ""
548+msgstr "правила та обмеження"
544549
545550#: qml/Wizard/Pages/40-location.qml:160
546551msgid "GPS only"
547−msgstr ""
552+msgstr "Лише GPS"
548553
549554#: qml/Wizard/Pages/40-location.qml:214
550555msgid "Don't use my location"
551−msgstr ""
556+msgstr "Не використовувати визначення положення"
552557
553558#: qml/Wizard/Pages/40-location.qml:260
554559msgid "You can change it later in System Settings."
555−msgstr ""
560+msgstr "Ви можете змінити його пізніше в налаштуваннях системи."
556561
557562#: qml/Wizard/Pages/50-timezone.qml:29
558563msgid "Time Zone"
559−msgstr ""
564+msgstr "Часовий пояс"
560565
561566#: qml/Wizard/Pages/50-timezone.qml:178
562567msgid "Enter your city"
563−msgstr ""
568+msgstr "Уведіь Ваше місто"
564569
565570#: qml/Wizard/Pages/60-account.qml:24
566571msgid "Personalize Your Device"
567−msgstr ""
572+msgstr "Персоналізація Пристрою"
568573
569574#: qml/Wizard/Pages/60-account.qml:48
570575msgid "Preferred Name"
571−msgstr ""
576+msgstr "Бажане ім’я"
572577
573578#: qml/Wizard/Pages/70-passwd-type.qml:39
574579msgid "Lock Screen"
575−msgstr ""
580+msgstr "Заблокувати екран"
576581
577582#: qml/Wizard/Pages/70-passwd-type.qml:101
578583msgctxt "Label: Type of security method"
579584msgid "Create new password"
580−msgstr ""
585+msgstr "Створити новий пароль"
581586
582587#: qml/Wizard/Pages/70-passwd-type.qml:103
583588msgctxt "Label: Type of security method"
584589msgid "Create passcode (numbers only)"
585−msgstr ""
590+msgstr "Створити парольний код (лише цифри)"
586591
587592#: qml/Wizard/Pages/70-passwd-type.qml:105
588593msgctxt "Label: Type of security method"
589594msgid "No lock code"
590−msgstr ""
595+msgstr "Без коду розблокування"
591596
592597#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
593598msgid "Privacy Policy"
594−msgstr ""
599+msgstr "Правила конфіденційності"
595600
596601#: qml/Wizard/Pages/75-report-check.qml:26
597602msgid "Help Us Improve"
598−msgstr ""
603+msgstr "Допоможіть нам покращити"
599604
600605#: qml/Wizard/Pages/75-report-check.qml:59
601606msgid "Improve system performance by sending us crashes and error reports."
602607msgstr ""
608+"Допоможіть нам покращити систему, відіславши нам звіт про помилки пристрою."
603609
604610#: qml/Wizard/Pages/75-report-check.qml:60
605611msgid "Privacy policy"
606−msgstr ""
612+msgstr "Правила конфіденційності"
607613
608614#: qml/Wizard/Pages/80-finished.qml:89
609615msgid "Welcome to Ubuntu"
610−msgstr ""
616+msgstr "Ласкаво просимо до Ubuntu"
611617
612618#: qml/Wizard/Pages/80-finished.qml:104
613619msgid "You are ready to use your device now"
614−msgstr ""
620+msgstr "Тепер пристрій готовий до використання"
615621
616622#: qml/Wizard/Pages/80-finished.qml:124
617623msgid "Get Started"
618−msgstr ""
624+msgstr "Починаючи роботу"
619625
620626#: qml/Wizard/Pages/here-terms.qml:25
621627msgid "Terms & Conditions"
@@ -623,7 +629,7 @@ msgstr "Умови користування"
623629
624630#: qml/Wizard/Pages/here-terms.qml:69
625631msgid "Your device uses positioning technologies provided by HERE."
626−msgstr ""
632+msgstr "Ваш пристрій використовує HERE для визначення місцезнаходження"
627633
628634#: qml/Wizard/Pages/here-terms.qml:81
629635msgid ""
@@ -631,21 +637,29 @@ msgid ""
631637"collects information about nearby cell towers and Wi-Fi hotspots around your "
632638"current location whenever your position is being found."
633639msgstr ""
640+"Для надання послуг із позиціювання та покращення якості інших послуг HERE "
641+"збирає інформацію щодо розташованих поблизу із вами станцій мобільного "
642+"зв’язку та точок доступу Wi-Fi під час визначення вашого поточного "
643+"розташування."
634644
635645#: qml/Wizard/Pages/here-terms.qml:93
636646msgid ""
637647"The information collected is used to analyze the service and to improve the "
638648"use of service, but not to identify you personally."
639649msgstr ""
650+"Збирана інформація використовується для аналізу та поліпшення сервісу, а не "
651+"для ідентифікації Вашої особи."
640652
641653#: qml/Wizard/Pages/here-terms.qml:106
642654#, qt-format
643655msgid "By continuing, you agree to the HERE platform %1 and %2."
644656msgstr ""
657+"Продовження роботи зі службою означатиме, що ви згодні із %1 і %2 платформи "
658+"HERE."
645659
646660#: qml/Wizard/Pages/here-terms.qml:107
647661msgid "Service Terms"
648−msgstr ""
662+msgstr "Умовами надання послуг"
649663
650664#: qml/Wizard/Pages/passcode-confirm.qml:43
651665#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -654,69 +668,69 @@ msgstr "Підтвердіть код-пароль"
654668
655669#: qml/Wizard/Pages/passcode-confirm.qml:45
656670msgid "Incorrect passcode."
657−msgstr ""
671+msgstr "Невірний код."
658672
659673#: qml/Wizard/Pages/passcode-confirm.qml:45
660674msgctxt "Enter the passcode again"
661675msgid "Please re-enter."
662−msgstr ""
676+msgstr "Уведіть поновій."
663677
664678#: qml/Wizard/Pages/passcode-desktop.qml:30
665679msgid "Lock Screen Passcode"
666−msgstr ""
680+msgstr "Код блокування екрану"
667681
668682#: qml/Wizard/Pages/passcode-desktop.qml:56
669683msgid "Enter 4 numbers to setup your passcode"
670−msgstr ""
684+msgstr "Уведіть код блокування із 4 цифр"
671685
672686#: qml/Wizard/Pages/passcode-desktop.qml:65
673687#: qml/Wizard/Pages/passcode-set.qml:54
674688msgid "Choose passcode"
675−msgstr ""
689+msgstr "Виберіть код-пароль"
676690
677691#: qml/Wizard/Pages/passcode-desktop.qml:105
678692msgid "Passcode too short"
679−msgstr ""
693+msgstr "Код закороткий"
680694
681695#: qml/Wizard/Pages/passcode-desktop.qml:107
682696msgid "Passcodes match"
683−msgstr ""
697+msgstr "Коди збігаються"
684698
685699#: qml/Wizard/Pages/passcode-desktop.qml:109
686700msgid "Passcodes do not match"
687−msgstr ""
701+msgstr "Коди не збігаються"
688702
689703#: qml/Wizard/Pages/passcode-set.qml:62
690704msgid "Passcode must be 4 characters long"
691−msgstr ""
705+msgstr "Код повинен містити 4 символи"
692706
693707#: qml/Wizard/Pages/password-set.qml:30
694708msgid "Lock Screen Password"
695−msgstr ""
709+msgstr "Пароль блокування екрану"
696710
697711#: qml/Wizard/Pages/password-set.qml:61
698712msgid "Enter at least 8 characters"
699−msgstr ""
713+msgstr "Уведіть не менше 8 символів"
700714
701715#: qml/Wizard/Pages/password-set.qml:73
702716msgid "Choose password"
703−msgstr ""
717+msgstr "Виберіть пароль"
704718
705719#: qml/Wizard/Pages/password-set.qml:103
706720msgid "Confirm password"
707−msgstr ""
721+msgstr "Схваліть пароль"
708722
709723#: qml/Wizard/Pages/sim.qml:27
710724msgid "No SIM card installed"
711−msgstr ""
725+msgstr "SIM-картка не вставлена"
712726
713727#: qml/Wizard/Pages/sim.qml:54
714728msgid "SIM card added"
715−msgstr ""
729+msgstr "Додана SIM-картка"
716730
717731#: qml/Wizard/Pages/sim.qml:55
718732msgid "You must restart the device to access the mobile network."
719−msgstr ""
733+msgstr "Необхідно перезапустити пристрій для доступу до мобільної мережі."
720734
721735#: qml/Wizard/Pages/sim.qml:59
722736msgid "Restart"
@@ -725,34 +739,35 @@ msgstr "Перезапуск"
725739#: qml/Wizard/Pages/sim.qml:78
726740msgid "You won’t be able to make calls or use text messaging without a SIM."
727741msgstr ""
742+"Без SIM-картки неможливо телефонувати або відправляти текстові повідомлення."
728743
729744#: qml/Wizard/Pages/sim.qml:90
730745msgid "To proceed with no SIM tap Skip."
731−msgstr ""
746+msgstr "Щоб продовжити без SIM картки, натисніть кнопку \"Пропустити\""
732747
733748#: qml/Wizard/PasswordMeter.qml:87
734749msgid "Passwords match"
735−msgstr ""
750+msgstr "Паролі збігаються"
736751
737752#: qml/Wizard/PasswordMeter.qml:89
738753msgid "Passwords do not match"
739−msgstr ""
754+msgstr "Паролі не збігаються"
740755
741756#: qml/Wizard/PasswordMeter.qml:93
742757msgid "Strong password"
743−msgstr ""
758+msgstr "Сильний пароль"
744759
745760#: qml/Wizard/PasswordMeter.qml:95
746761msgid "Fair password"
747−msgstr ""
762+msgstr "Задовільний пароль"
748763
749764#: qml/Wizard/PasswordMeter.qml:97
750765msgid "Weak password"
751−msgstr ""
766+msgstr "Слабкий пароль"
752767
753768#: qml/Wizard/PasswordMeter.qml:99
754769msgid "Very weak password"
755−msgstr ""
770+msgstr "Дуже слабкий пароль"
756771
757772#~ msgid "Confirm"
758773#~ msgstr "Підтвердити"
@@ -1071,12 +1086,3 @@ msgstr ""
10711086
10721087#~ msgid "Call back"
10731088#~ msgstr "Зворотний виклик"
1074−
1075−#~ msgid "Your device is now ready to use."
1076−#~ msgstr "Пристрій готовий до використання."
1077−
1078−#~ msgid "Welcome to your Ubuntu device."
1079−#~ msgstr "Вітаємо у вашому пристрої Ubuntu."
1080−
1081−#~ msgid "Please select how you’d like to unlock your device."
1082−#~ msgstr "Будь ласка, виберіть спосіб розблокування вашого пристрою."
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+2
@@ -64,6 +64,7 @@ void tst_FloatingFlickable::tapGoesThrough()
6464
6565void tst_FloatingFlickable::flickChangesContentX()
6666{
67+ QSKIP("This fails due to bug #1564571");
6768 FloatingFlickable *floatingFlickable =
6869 m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
6970 QVERIFY(floatingFlickable != nullptr);
@@ -91,6 +92,7 @@ void tst_FloatingFlickable::flickChangesContentX()
9192
9293void tst_FloatingFlickable::flickChangesContentY()
9394{
95+ QSKIP("This fails due to bug #1564571");
9496 FloatingFlickable *floatingFlickable =
9597 m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
9698 QVERIFY(floatingFlickable != nullptr);
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+3−2
@@ -70,8 +70,6 @@ Rectangle {
7070 when: windowShown
7171
7272 property Item overlay: findChild(imageGallery.rootItem, "overlay")
73− property Item overlayCloseButton: findChild(overlay, "overlayCloseButton")
74− property Item overlayListView: findChild(overlay, "overlayListView")
7573
7674 function cleanup() {
7775 overlay.hide();
@@ -87,6 +85,7 @@ Rectangle {
8785 }
8886
8987 function test_overlayOpenClose() {
88+ var overlayCloseButton = findChild(overlay, "overlayCloseButton");
9089 var image0 = findChild(imageGallery, "previewImage0");
9190 mouseClick(image0);
9291 tryCompare(overlay, "visible", true);
@@ -97,6 +96,7 @@ Rectangle {
9796 }
9897
9998 function test_overlayShowHideHeader() {
99+ var overlayCloseButton = findChild(overlay, "overlayCloseButton");
100100 var image0 = findChild(imageGallery, "previewImage0");
101101 mouseClick(image0);
102102 tryCompare(overlay, "visible", true);
@@ -117,6 +117,7 @@ Rectangle {
117117 }
118118
119119 function test_overlayOpenCorrectImage(data) {
120+ var overlayListView = findChild(overlay, "overlayListView");
120121 var image = findChild(imageGallery, "previewImage" + data.index);
121122 mouseClick(image);
122123 tryCompare(overlay, "visible", true);
tests/qmltests/Dash/tst_Card.qml+10−10
@@ -217,16 +217,16 @@ Rectangle {
217217
218218 when: windowShown
219219
220− property Item title: findChild(card, "titleLabel")
221− property Item subtitle: findChild(card, "subtitleLabel")
222− property var headerRow: findChild(card, "outerRow")
223− property var art: findChild(card, "artShape")
224− property Item artImage: findChild(card, "artImage")
225− property Item summary: findChild(card, "summaryLabel")
226− property Item background: findChild(card, "background")
227− property Item backgroundLoader: findChild(card, "backgroundLoader")
228− property Item backgroundImage: findChild(card, "backgroundImage")
229− property Item mascotImage: findChild(card, "mascotImage");
220+ property Item title: findChild(loader, "titleLabel")
221+ property Item subtitle: findChild(loader, "subtitleLabel")
222+ property var headerRow: findChild(loader, "outerRow")
223+ property var art: findChild(loader, "artShape")
224+ property Item artImage: findChild(loader, "artImage")
225+ property Item summary: findChild(loader, "summaryLabel")
226+ property Item background: findChild(loader, "background")
227+ property Item backgroundLoader: findChild(loader, "backgroundLoader")
228+ property Item backgroundImage: findChild(loader, "backgroundImage")
229+ property Item mascotImage: findChild(loader, "mascotImage");
230230
231231 function init() {
232232 cardTool.components = Qt.binding(function() { return Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components']; });