git.iko.soy/unity8
on xenial help sign in
merge trunk
commitbc6930d74aac5433ba59d38b7a8fe424c2cfde45 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 31 Mar 2016, 16:21 (11 years ago) parentd7db780fbb130c
26 files changed+630−451
compare with xenial
unifiedsplit
debian/changelog+20 plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+12−2 po/en_AU.po+82−73 po/en_GB.po+80−82 po/es.po+11−20 po/fa.po+21−10 po/fr.po+69−57 po/nb.po+84−81 po/pl.po+3−11 po/sk.po+81−79 po/sv.po+1−1 qml/Components/Lockscreen.qml+2−2 qml/Greeter/Greeter.qml+1−1 qml/Stages/DesktopStage.qml+3 qml/Tutorial/TutorialRight.qml+2−1 tests/plugins/AccountsService/CMakeLists.txt+2−1 tests/plugins/AccountsService/PropertiesServer.cpp+36−7 tests/plugins/AccountsService/PropertiesServer.h+7 tests/plugins/AccountsService/client.cpp+46−12 tests/plugins/AccountsService/interfaces.xml+13 tests/plugins/AccountsService/types.h+25 tests/plugins/IntegratedLightDM/integrated.cpp+5−8 tests/qmltests/Greeter/tst_Greeter.qml+1 tests/qmltests/Greeter/tst_NarrowView.qml+3−1 tests/qmltests/Tutorial/tst_Tutorial.qml+17−1 tests/qmltests/tst_Shell.qml+3−1
debian/changelog+20
@@ -1,3 +1,23 @@
1+unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium
2+
3+ [ Albert Astals Cid ]
4+ * Use tutorialLeftLoader instead of tutorialLeft
5+
6+ [ CI Train Bot ]
7+ * Update translation template
8+
9+ [ Lukáš Tinkl ]
10+ * Fix the last chance popup colors/theme
11+
12+ [ Michael Terry ]
13+ * Adjust text for desktop right edge tutorial to be accurate. (LP:
14+ #1563103)
15+ * Fix OOBE wizard not setting your name. (LP: #1562872)
16+ * Fix showing "Retry" in password prompt when turning on screen in
17+ tablet mode.
18+
19+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 30 Mar 2016 07:46:51 +0000
20+
121unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
222
323 [ Michael Terry ]
plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+12−2
@@ -57,8 +57,18 @@ QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString
5757{
5858 QDBusInterface *iface = getUserInterface(user);
5959 if (iface != nullptr && iface->isValid()) {
60− // The value needs to be carefully wrapped
61− return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));
60+ if (interface == QStringLiteral("org.freedesktop.Accounts.User")) {
61+ // Standard AccountsService properties use special set methods.
62+ // It will not let you use the usual DBus property setters.
63+ QDBusInterface accountsIface(iface->service(),
64+ iface->path(),
65+ interface,
66+ iface->connection());
67+ return accountsIface.asyncCall(QStringLiteral("Set") + property, value);
68+ } else {
69+ // The value needs to be carefully wrapped
70+ return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));
71+ }
6272 }
6373 return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));
6474}
po/en_AU.po+82−73
@@ -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: 2016-02-12 23:22+0000\n"
11+"PO-Revision-Date: 2016-03-27 10:09+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@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-03-28 05:45+0000\n"
19+"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -139,7 +139,7 @@ msgstr "Apps may have unsaved data:"
139139msgctxt ""
140140"Re-dock means connect the device again to an external screen/mouse/keyboard"
141141msgid "Re-dock, save your work and close these apps to continue."
142−msgstr ""
142+msgstr "Re-dock, save your work and close these apps to continue."
143143
144144#: qml/Components/ModeSwitchWarningDialog.qml:63
145145msgid "Or force close now (unsaved data will be lost)."
@@ -182,11 +182,11 @@ msgstr "Add to Favourites"
182182
183183#: qml/Dash/FiltersPopover.qml:60
184184msgid "Refine your results"
185−msgstr ""
185+msgstr "Refine your results"
186186
187187#: qml/Dash/FiltersPopover.qml:69
188188msgid "Reset"
189−msgstr ""
189+msgstr "Reset"
190190
191191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
192192msgid "See less"
@@ -203,11 +203,11 @@ msgstr "Search"
203203
204204#: qml/Dash/PageHeaderExtraPanel.qml:55
205205msgid "Recent Searches"
206−msgstr ""
206+msgstr "Recent Searches"
207207
208208#: qml/Dash/PageHeaderExtraPanel.qml:66
209209msgid "Clear All"
210−msgstr ""
210+msgstr "Clear All"
211211
212212#: qml/Dash/Previews/PreviewActionCombo.qml:35
213213msgid "More..."
@@ -263,6 +263,8 @@ msgid ""
263263"Your device is now connected to an external display. Use this screen as a "
264264"touch pad to interact with the pointer."
265265msgstr ""
266+"Your device is now connected to an external display. Use this screen as a "
267+"touch pad to interact with the pointer."
266268
267269#: qml/Greeter/CoverPage.qml:118
268270msgid "Unlock"
@@ -424,51 +426,51 @@ msgstr "Call back"
424426
425427#: qml/Stages/SideStage.qml:76
426428msgid "Drag using 3 fingers any application from one window to the other"
427−msgstr ""
429+msgstr "Drag using 3 fingers any application from one window to the other"
428430
429431#: qml/Tutorial/TutorialBottom.qml:78
430432msgid "Swipe up to add a contact"
431−msgstr ""
433+msgstr "Swipe up to add a contact"
432434
433435#: qml/Tutorial/TutorialBottom.qml:80
434436msgid "Swipe up for favorite calculations"
435−msgstr ""
437+msgstr "Swipe up for favourite calculations"
436438
437439#: qml/Tutorial/TutorialBottom.qml:82
438440msgid "Swipe up for recent calls"
439−msgstr ""
441+msgstr "Swipe up for recent calls"
440442
441443#: qml/Tutorial/TutorialBottom.qml:84
442444msgid "Swipe up to create a message"
443−msgstr ""
445+msgstr "Swipe up to create a message"
444446
445447#: qml/Tutorial/TutorialBottom.qml:85
446448msgid "Swipe up to manage the app"
447−msgstr ""
449+msgstr "Swipe up to manage the app"
448450
449451#: qml/Tutorial/TutorialLeft.qml:47
450452msgid "Swipe from the left edge to open the launcher"
451−msgstr ""
453+msgstr "Swipe from the left edge to open the launcher"
452454
453455#: qml/Tutorial/TutorialLeftLong.qml:47
454456msgid "Long swipe from the left edge to open the Today scope"
455−msgstr ""
457+msgstr "Long swipe from the left edge to open the Today scope"
456458
457459#: qml/Tutorial/TutorialRight.qml:54
458460msgid "Hover your mouse on the right edge to view your open apps"
459−msgstr ""
461+msgstr "Hover your mouse on the right edge to view your open apps"
460462
461463#: qml/Tutorial/TutorialRight.qml:55
462464msgid "Short or long swipe from the right edge to view your open apps"
463−msgstr ""
465+msgstr "Short or long swipe from the right edge to view your open apps"
464466
465467#: qml/Tutorial/TutorialTop.qml:53
466468msgid "Swipe from the top right edge to open the notification bar"
467−msgstr ""
469+msgstr "Swipe from the top right edge to open the notification bar"
468470
469471#: qml/Tutorial/TutorialTop.qml:54
470472msgid "Swipe from the top edge to open the notification bar"
471−msgstr ""
473+msgstr "Swipe from the top edge to open the notification bar"
472474
473475#: qml/Wizard/Page.qml:54
474476msgctxt "Button: Go back one page in the Wizard"
@@ -477,7 +479,7 @@ msgstr "Back"
477479
478480#: qml/Wizard/Pages/10-welcome.qml:27
479481msgid "Language"
480−msgstr ""
482+msgstr "Language"
481483
482484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
483485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -486,7 +488,7 @@ msgstr ""
486488#: qml/Wizard/Pages/passcode-desktop.qml:124
487489#: qml/Wizard/Pages/password-set.qml:141
488490msgid "Next"
489−msgstr ""
491+msgstr "Next"
490492
491493#: qml/Wizard/Pages/30-wifi.qml:29
492494msgid "Connect to Wi‑Fi"
@@ -494,15 +496,15 @@ msgstr "Connect to Wi‑Fi"
494496
495497#: qml/Wizard/Pages/30-wifi.qml:130
496498msgid "Connected"
497−msgstr ""
499+msgstr "Connected"
498500
499501#: qml/Wizard/Pages/30-wifi.qml:163
500502msgid "Available Wi-Fi networks"
501−msgstr ""
503+msgstr "Available Wi-Fi networks"
502504
503505#: qml/Wizard/Pages/30-wifi.qml:164
504506msgid "No available Wi-Fi networks"
505−msgstr ""
507+msgstr "No available Wi-Fi networks"
506508
507509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
508510#: qml/Wizard/Pages/sim.qml:101
@@ -511,98 +513,100 @@ msgstr "Skip"
511513
512514#: qml/Wizard/Pages/40-location.qml:27
513515msgid "Location Services"
514−msgstr ""
516+msgstr "Location Services"
515517
516518#: qml/Wizard/Pages/40-location.qml:83
517519msgid ""
518520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
519521"(recommended)"
520522msgstr ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
521525
522526#: qml/Wizard/Pages/40-location.qml:105
523527#, qt-format
524528msgid "By selecting this option you agree to the Nokia HERE %1."
525−msgstr ""
529+msgstr "By selecting this option you agree to the Nokia HERE %1."
526530
527531#: qml/Wizard/Pages/40-location.qml:106
528532msgctxt "part of: Nokia HERE terms and conditions"
529533msgid "terms and conditions"
530−msgstr ""
534+msgstr "terms and conditions"
531535
532536#: qml/Wizard/Pages/40-location.qml:160
533537msgid "GPS only"
534−msgstr ""
538+msgstr "GPS only"
535539
536540#: qml/Wizard/Pages/40-location.qml:214
537541msgid "Don't use my location"
538−msgstr ""
542+msgstr "Don't use my location"
539543
540544#: qml/Wizard/Pages/40-location.qml:260
541545msgid "You can change it later in System Settings."
542−msgstr ""
546+msgstr "You can change it later in System Settings."
543547
544548#: qml/Wizard/Pages/50-timezone.qml:29
545549msgid "Time Zone"
546−msgstr ""
550+msgstr "Time Zone"
547551
548552#: qml/Wizard/Pages/50-timezone.qml:178
549553msgid "Enter your city"
550−msgstr ""
554+msgstr "Enter your city"
551555
552556#: qml/Wizard/Pages/60-account.qml:24
553557msgid "Personalize Your Device"
554−msgstr ""
558+msgstr "Personalise Your Device"
555559
556560#: qml/Wizard/Pages/60-account.qml:48
557561msgid "Preferred Name"
558−msgstr ""
562+msgstr "Preferred Name"
559563
560564#: qml/Wizard/Pages/70-passwd-type.qml:39
561565msgid "Lock Screen"
562−msgstr ""
566+msgstr "Lock Screen"
563567
564568#: qml/Wizard/Pages/70-passwd-type.qml:101
565569msgctxt "Label: Type of security method"
566570msgid "Create new password"
567−msgstr ""
571+msgstr "Create new password"
568572
569573#: qml/Wizard/Pages/70-passwd-type.qml:103
570574msgctxt "Label: Type of security method"
571575msgid "Create passcode (numbers only)"
572−msgstr ""
576+msgstr "Create passcode (numbers only)"
573577
574578#: qml/Wizard/Pages/70-passwd-type.qml:105
575579msgctxt "Label: Type of security method"
576580msgid "No lock code"
577−msgstr ""
581+msgstr "No lock code"
578582
579583#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
580584msgid "Privacy Policy"
581−msgstr ""
585+msgstr "Privacy Policy"
582586
583587#: qml/Wizard/Pages/75-report-check.qml:26
584588msgid "Help Us Improve"
585−msgstr ""
589+msgstr "Help Us Improve"
586590
587591#: qml/Wizard/Pages/75-report-check.qml:59
588592msgid "Improve system performance by sending us crashes and error reports."
589−msgstr ""
593+msgstr "Improve system performance by sending us crashes and error reports."
590594
591595#: qml/Wizard/Pages/75-report-check.qml:60
592596msgid "Privacy policy"
593−msgstr ""
597+msgstr "Privacy policy"
594598
595599#: qml/Wizard/Pages/80-finished.qml:89
596600msgid "Welcome to Ubuntu"
597−msgstr ""
601+msgstr "Welcome to Ubuntu"
598602
599603#: qml/Wizard/Pages/80-finished.qml:104
600604msgid "You are ready to use your device now"
601−msgstr ""
605+msgstr "You are ready to use your device now"
602606
603607#: qml/Wizard/Pages/80-finished.qml:124
604608msgid "Get Started"
605−msgstr ""
609+msgstr "Get Started"
606610
607611#: qml/Wizard/Pages/here-terms.qml:25
608612msgid "Terms & Conditions"
@@ -610,7 +614,7 @@ msgstr "Terms & Conditions"
610614
611615#: qml/Wizard/Pages/here-terms.qml:69
612616msgid "Your device uses positioning technologies provided by HERE."
613−msgstr ""
617+msgstr "Your device uses positioning technologies provided by HERE."
614618
615619#: qml/Wizard/Pages/here-terms.qml:81
616620msgid ""
@@ -618,21 +622,26 @@ msgid ""
618622"collects information about nearby cell towers and Wi-Fi hotspots around your "
619623"current location whenever your position is being found."
620624msgstr ""
625+"To provide you with positioning services and to improve their quality, HERE "
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
621628
622629#: qml/Wizard/Pages/here-terms.qml:93
623630msgid ""
624631"The information collected is used to analyze the service and to improve the "
625632"use of service, but not to identify you personally."
626633msgstr ""
634+"The information collected is used to analyse the service and to improve the "
635+"use of service, but not to identify you personally."
627636
628637#: qml/Wizard/Pages/here-terms.qml:106
629638#, qt-format
630639msgid "By continuing, you agree to the HERE platform %1 and %2."
631−msgstr ""
640+msgstr "By continuing, you agree to the HERE platform %1 and %2."
632641
633642#: qml/Wizard/Pages/here-terms.qml:107
634643msgid "Service Terms"
635−msgstr ""
644+msgstr "Service Terms"
636645
637646#: qml/Wizard/Pages/passcode-confirm.qml:43
638647#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -641,69 +650,69 @@ msgstr "Confirm passcode"
641650
642651#: qml/Wizard/Pages/passcode-confirm.qml:45
643652msgid "Incorrect passcode."
644−msgstr ""
653+msgstr "Incorrect passcode."
645654
646655#: qml/Wizard/Pages/passcode-confirm.qml:45
647656msgctxt "Enter the passcode again"
648657msgid "Please re-enter."
649−msgstr ""
658+msgstr "Please re-enter."
650659
651660#: qml/Wizard/Pages/passcode-desktop.qml:30
652661msgid "Lock Screen Passcode"
653−msgstr ""
662+msgstr "Lock Screen Passcode"
654663
655664#: qml/Wizard/Pages/passcode-desktop.qml:56
656665msgid "Enter 4 numbers to setup your passcode"
657−msgstr ""
666+msgstr "Enter 4 numbers to setup your passcode"
658667
659668#: qml/Wizard/Pages/passcode-desktop.qml:65
660669#: qml/Wizard/Pages/passcode-set.qml:54
661670msgid "Choose passcode"
662−msgstr ""
671+msgstr "Choose passcode"
663672
664673#: qml/Wizard/Pages/passcode-desktop.qml:105
665674msgid "Passcode too short"
666−msgstr ""
675+msgstr "Passcode too short"
667676
668677#: qml/Wizard/Pages/passcode-desktop.qml:107
669678msgid "Passcodes match"
670−msgstr ""
679+msgstr "Passcodes match"
671680
672681#: qml/Wizard/Pages/passcode-desktop.qml:109
673682msgid "Passcodes do not match"
674−msgstr ""
683+msgstr "Passcodes do not match"
675684
676685#: qml/Wizard/Pages/passcode-set.qml:62
677686msgid "Passcode must be 4 characters long"
678−msgstr ""
687+msgstr "Passcode must be 4 characters long"
679688
680689#: qml/Wizard/Pages/password-set.qml:30
681690msgid "Lock Screen Password"
682−msgstr ""
691+msgstr "Lock Screen Password"
683692
684693#: qml/Wizard/Pages/password-set.qml:61
685694msgid "Enter at least 8 characters"
686−msgstr ""
695+msgstr "Enter at least 8 characters"
687696
688697#: qml/Wizard/Pages/password-set.qml:73
689698msgid "Choose password"
690−msgstr ""
699+msgstr "Choose password"
691700
692701#: qml/Wizard/Pages/password-set.qml:103
693702msgid "Confirm password"
694−msgstr ""
703+msgstr "Confirm password"
695704
696705#: qml/Wizard/Pages/sim.qml:27
697706msgid "No SIM card installed"
698−msgstr ""
707+msgstr "No SIM card installed"
699708
700709#: qml/Wizard/Pages/sim.qml:54
701710msgid "SIM card added"
702−msgstr ""
711+msgstr "SIM card added"
703712
704713#: qml/Wizard/Pages/sim.qml:55
705714msgid "You must restart the device to access the mobile network."
706−msgstr ""
715+msgstr "You must restart the device to access the mobile network."
707716
708717#: qml/Wizard/Pages/sim.qml:59
709718msgid "Restart"
@@ -711,35 +720,35 @@ msgstr "Restart"
711720
712721#: qml/Wizard/Pages/sim.qml:78
713722msgid "You won’t be able to make calls or use text messaging without a SIM."
714−msgstr ""
723+msgstr "You won’t be able to make calls or use text messaging without a SIM."
715724
716725#: qml/Wizard/Pages/sim.qml:90
717726msgid "To proceed with no SIM tap Skip."
718−msgstr ""
727+msgstr "To proceed with no SIM tap Skip."
719728
720729#: qml/Wizard/PasswordMeter.qml:87
721730msgid "Passwords match"
722−msgstr ""
731+msgstr "Passwords match"
723732
724733#: qml/Wizard/PasswordMeter.qml:89
725734msgid "Passwords do not match"
726−msgstr ""
735+msgstr "Passwords do not match"
727736
728737#: qml/Wizard/PasswordMeter.qml:93
729738msgid "Strong password"
730−msgstr ""
739+msgstr "Strong password"
731740
732741#: qml/Wizard/PasswordMeter.qml:95
733742msgid "Fair password"
734−msgstr ""
743+msgstr "Fair password"
735744
736745#: qml/Wizard/PasswordMeter.qml:97
737746msgid "Weak password"
738−msgstr ""
747+msgstr "Weak password"
739748
740749#: qml/Wizard/PasswordMeter.qml:99
741750msgid "Very weak password"
742−msgstr ""
751+msgstr "Very weak password"
743752
744753#~ msgid "Confirm"
745754#~ msgstr "Confirm"
po/en_GB.po+80−82
@@ -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-04-23 12:59+0000\n"
12−"Last-Translator: Andi Chandler <Unknown>\n"
11+"PO-Revision-Date: 2016-03-30 11:54+0000\n"
12+"Last-Translator: James Tait <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@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-03-31 05:49+0000\n"
19+"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -182,11 +182,11 @@ msgstr "Add to Favourites"
182182
183183#: qml/Dash/FiltersPopover.qml:60
184184msgid "Refine your results"
185−msgstr ""
185+msgstr "Refine your results"
186186
187187#: qml/Dash/FiltersPopover.qml:69
188188msgid "Reset"
189−msgstr ""
189+msgstr "Reset"
190190
191191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
192192msgid "See less"
@@ -203,11 +203,11 @@ msgstr "Search"
203203
204204#: qml/Dash/PageHeaderExtraPanel.qml:55
205205msgid "Recent Searches"
206−msgstr ""
206+msgstr "Recent Searches"
207207
208208#: qml/Dash/PageHeaderExtraPanel.qml:66
209209msgid "Clear All"
210−msgstr ""
210+msgstr "Clear All"
211211
212212#: qml/Dash/Previews/PreviewActionCombo.qml:35
213213msgid "More..."
@@ -426,51 +426,51 @@ msgstr "Call back"
426426
427427#: qml/Stages/SideStage.qml:76
428428msgid "Drag using 3 fingers any application from one window to the other"
429−msgstr ""
429+msgstr "Drag using 3 fingers any application from one window to the other"
430430
431431#: qml/Tutorial/TutorialBottom.qml:78
432432msgid "Swipe up to add a contact"
433−msgstr ""
433+msgstr "Swipe up to add a contact"
434434
435435#: qml/Tutorial/TutorialBottom.qml:80
436436msgid "Swipe up for favorite calculations"
437−msgstr ""
437+msgstr "Swipe up for favourite calculations"
438438
439439#: qml/Tutorial/TutorialBottom.qml:82
440440msgid "Swipe up for recent calls"
441−msgstr ""
441+msgstr "Swipe up for recent calls"
442442
443443#: qml/Tutorial/TutorialBottom.qml:84
444444msgid "Swipe up to create a message"
445−msgstr ""
445+msgstr "Swipe up to create a message"
446446
447447#: qml/Tutorial/TutorialBottom.qml:85
448448msgid "Swipe up to manage the app"
449−msgstr ""
449+msgstr "Swipe up to manage the app"
450450
451451#: qml/Tutorial/TutorialLeft.qml:47
452452msgid "Swipe from the left edge to open the launcher"
453−msgstr ""
453+msgstr "Swipe from the left edge to open the launcher"
454454
455455#: qml/Tutorial/TutorialLeftLong.qml:47
456456msgid "Long swipe from the left edge to open the Today scope"
457−msgstr ""
457+msgstr "Long swipe from the left edge to open the Today scope"
458458
459459#: qml/Tutorial/TutorialRight.qml:54
460460msgid "Hover your mouse on the right edge to view your open apps"
461−msgstr ""
461+msgstr "Hover your mouse on the right edge to view your open apps"
462462
463463#: qml/Tutorial/TutorialRight.qml:55
464464msgid "Short or long swipe from the right edge to view your open apps"
465−msgstr ""
465+msgstr "Short or long swipe from the right edge to view your open apps"
466466
467467#: qml/Tutorial/TutorialTop.qml:53
468468msgid "Swipe from the top right edge to open the notification bar"
469−msgstr ""
469+msgstr "Swipe from the top right edge to open the notification bar"
470470
471471#: qml/Tutorial/TutorialTop.qml:54
472472msgid "Swipe from the top edge to open the notification bar"
473−msgstr ""
473+msgstr "Swipe from the top edge to open the notification bar"
474474
475475#: qml/Wizard/Page.qml:54
476476msgctxt "Button: Go back one page in the Wizard"
@@ -479,7 +479,7 @@ msgstr "Back"
479479
480480#: qml/Wizard/Pages/10-welcome.qml:27
481481msgid "Language"
482−msgstr ""
482+msgstr "Language"
483483
484484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
485485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -488,7 +488,7 @@ msgstr ""
488488#: qml/Wizard/Pages/passcode-desktop.qml:124
489489#: qml/Wizard/Pages/password-set.qml:141
490490msgid "Next"
491−msgstr ""
491+msgstr "Next"
492492
493493#: qml/Wizard/Pages/30-wifi.qml:29
494494msgid "Connect to Wi‑Fi"
@@ -496,15 +496,15 @@ msgstr "Connect to Wi‑Fi"
496496
497497#: qml/Wizard/Pages/30-wifi.qml:130
498498msgid "Connected"
499−msgstr ""
499+msgstr "Connected"
500500
501501#: qml/Wizard/Pages/30-wifi.qml:163
502502msgid "Available Wi-Fi networks"
503−msgstr ""
503+msgstr "Available Wi-Fi networks"
504504
505505#: qml/Wizard/Pages/30-wifi.qml:164
506506msgid "No available Wi-Fi networks"
507−msgstr ""
507+msgstr "No available Wi-Fi networks"
508508
509509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
510510#: qml/Wizard/Pages/sim.qml:101
@@ -513,98 +513,100 @@ msgstr "Skip"
513513
514514#: qml/Wizard/Pages/40-location.qml:27
515515msgid "Location Services"
516−msgstr ""
516+msgstr "Location Services"
517517
518518#: qml/Wizard/Pages/40-location.qml:83
519519msgid ""
520520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
521521"(recommended)"
522522msgstr ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
523525
524526#: qml/Wizard/Pages/40-location.qml:105
525527#, qt-format
526528msgid "By selecting this option you agree to the Nokia HERE %1."
527−msgstr ""
529+msgstr "By selecting this option you agree to the Nokia HERE %1."
528530
529531#: qml/Wizard/Pages/40-location.qml:106
530532msgctxt "part of: Nokia HERE terms and conditions"
531533msgid "terms and conditions"
532−msgstr ""
534+msgstr "terms and conditions"
533535
534536#: qml/Wizard/Pages/40-location.qml:160
535537msgid "GPS only"
536−msgstr ""
538+msgstr "GPS only"
537539
538540#: qml/Wizard/Pages/40-location.qml:214
539541msgid "Don't use my location"
540−msgstr ""
542+msgstr "Don't use my location"
541543
542544#: qml/Wizard/Pages/40-location.qml:260
543545msgid "You can change it later in System Settings."
544−msgstr ""
546+msgstr "You can change it later in System Settings."
545547
546548#: qml/Wizard/Pages/50-timezone.qml:29
547549msgid "Time Zone"
548−msgstr ""
550+msgstr "Time Zone"
549551
550552#: qml/Wizard/Pages/50-timezone.qml:178
551553msgid "Enter your city"
552−msgstr ""
554+msgstr "Enter your city"
553555
554556#: qml/Wizard/Pages/60-account.qml:24
555557msgid "Personalize Your Device"
556−msgstr ""
558+msgstr "Personalise Your Device"
557559
558560#: qml/Wizard/Pages/60-account.qml:48
559561msgid "Preferred Name"
560−msgstr ""
562+msgstr "Preferred Name"
561563
562564#: qml/Wizard/Pages/70-passwd-type.qml:39
563565msgid "Lock Screen"
564−msgstr ""
566+msgstr "Lock Screen"
565567
566568#: qml/Wizard/Pages/70-passwd-type.qml:101
567569msgctxt "Label: Type of security method"
568570msgid "Create new password"
569−msgstr ""
571+msgstr "Create new password"
570572
571573#: qml/Wizard/Pages/70-passwd-type.qml:103
572574msgctxt "Label: Type of security method"
573575msgid "Create passcode (numbers only)"
574−msgstr ""
576+msgstr "Create passcode (numbers only)"
575577
576578#: qml/Wizard/Pages/70-passwd-type.qml:105
577579msgctxt "Label: Type of security method"
578580msgid "No lock code"
579−msgstr ""
581+msgstr "No lock code"
580582
581583#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
582584msgid "Privacy Policy"
583−msgstr ""
585+msgstr "Privacy Policy"
584586
585587#: qml/Wizard/Pages/75-report-check.qml:26
586588msgid "Help Us Improve"
587−msgstr ""
589+msgstr "Help Us Improve"
588590
589591#: qml/Wizard/Pages/75-report-check.qml:59
590592msgid "Improve system performance by sending us crashes and error reports."
591−msgstr ""
593+msgstr "Improve system performance by sending us crashes and error reports."
592594
593595#: qml/Wizard/Pages/75-report-check.qml:60
594596msgid "Privacy policy"
595−msgstr ""
597+msgstr "Privacy policy"
596598
597599#: qml/Wizard/Pages/80-finished.qml:89
598600msgid "Welcome to Ubuntu"
599−msgstr ""
601+msgstr "Welcome to Ubuntu"
600602
601603#: qml/Wizard/Pages/80-finished.qml:104
602604msgid "You are ready to use your device now"
603−msgstr ""
605+msgstr "You are ready to use your device now"
604606
605607#: qml/Wizard/Pages/80-finished.qml:124
606608msgid "Get Started"
607−msgstr ""
609+msgstr "Get Started"
608610
609611#: qml/Wizard/Pages/here-terms.qml:25
610612msgid "Terms & Conditions"
@@ -612,7 +614,7 @@ msgstr "Terms & Conditions"
612614
613615#: qml/Wizard/Pages/here-terms.qml:69
614616msgid "Your device uses positioning technologies provided by HERE."
615−msgstr ""
617+msgstr "Your device uses positioning technologies provided by HERE."
616618
617619#: qml/Wizard/Pages/here-terms.qml:81
618620msgid ""
@@ -620,21 +622,26 @@ msgid ""
620622"collects information about nearby cell towers and Wi-Fi hotspots around your "
621623"current location whenever your position is being found."
622624msgstr ""
625+"To provide you with positioning services and to improve their quality, HERE "
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
623628
624629#: qml/Wizard/Pages/here-terms.qml:93
625630msgid ""
626631"The information collected is used to analyze the service and to improve the "
627632"use of service, but not to identify you personally."
628633msgstr ""
634+"The information collected is used to analyse the service and to improve the "
635+"use of service, but not to identify you personally."
629636
630637#: qml/Wizard/Pages/here-terms.qml:106
631638#, qt-format
632639msgid "By continuing, you agree to the HERE platform %1 and %2."
633−msgstr ""
640+msgstr "By continuing, you agree to the HERE platform %1 and %2."
634641
635642#: qml/Wizard/Pages/here-terms.qml:107
636643msgid "Service Terms"
637−msgstr ""
644+msgstr "Service Terms"
638645
639646#: qml/Wizard/Pages/passcode-confirm.qml:43
640647#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -643,69 +650,69 @@ msgstr "Confirm passcode"
643650
644651#: qml/Wizard/Pages/passcode-confirm.qml:45
645652msgid "Incorrect passcode."
646−msgstr ""
653+msgstr "Incorrect passcode."
647654
648655#: qml/Wizard/Pages/passcode-confirm.qml:45
649656msgctxt "Enter the passcode again"
650657msgid "Please re-enter."
651−msgstr ""
658+msgstr "Please re-enter."
652659
653660#: qml/Wizard/Pages/passcode-desktop.qml:30
654661msgid "Lock Screen Passcode"
655−msgstr ""
662+msgstr "Lock Screen Passcode"
656663
657664#: qml/Wizard/Pages/passcode-desktop.qml:56
658665msgid "Enter 4 numbers to setup your passcode"
659−msgstr ""
666+msgstr "Enter 4 numbers to setup your passcode"
660667
661668#: qml/Wizard/Pages/passcode-desktop.qml:65
662669#: qml/Wizard/Pages/passcode-set.qml:54
663670msgid "Choose passcode"
664−msgstr ""
671+msgstr "Choose passcode"
665672
666673#: qml/Wizard/Pages/passcode-desktop.qml:105
667674msgid "Passcode too short"
668−msgstr ""
675+msgstr "Passcode too short"
669676
670677#: qml/Wizard/Pages/passcode-desktop.qml:107
671678msgid "Passcodes match"
672−msgstr ""
679+msgstr "Passcodes match"
673680
674681#: qml/Wizard/Pages/passcode-desktop.qml:109
675682msgid "Passcodes do not match"
676−msgstr ""
683+msgstr "Passcodes do not match"
677684
678685#: qml/Wizard/Pages/passcode-set.qml:62
679686msgid "Passcode must be 4 characters long"
680−msgstr ""
687+msgstr "Passcode must be 4 characters long"
681688
682689#: qml/Wizard/Pages/password-set.qml:30
683690msgid "Lock Screen Password"
684−msgstr ""
691+msgstr "Lock Screen Password"
685692
686693#: qml/Wizard/Pages/password-set.qml:61
687694msgid "Enter at least 8 characters"
688−msgstr ""
695+msgstr "Enter at least 8 characters"
689696
690697#: qml/Wizard/Pages/password-set.qml:73
691698msgid "Choose password"
692−msgstr ""
699+msgstr "Choose password"
693700
694701#: qml/Wizard/Pages/password-set.qml:103
695702msgid "Confirm password"
696−msgstr ""
703+msgstr "Confirm password"
697704
698705#: qml/Wizard/Pages/sim.qml:27
699706msgid "No SIM card installed"
700−msgstr ""
707+msgstr "No SIM card installed"
701708
702709#: qml/Wizard/Pages/sim.qml:54
703710msgid "SIM card added"
704−msgstr ""
711+msgstr "SIM card added"
705712
706713#: qml/Wizard/Pages/sim.qml:55
707714msgid "You must restart the device to access the mobile network."
708−msgstr ""
715+msgstr "You must restart the device to access the mobile network."
709716
710717#: qml/Wizard/Pages/sim.qml:59
711718msgid "Restart"
@@ -713,35 +720,35 @@ msgstr "Restart"
713720
714721#: qml/Wizard/Pages/sim.qml:78
715722msgid "You won’t be able to make calls or use text messaging without a SIM."
716−msgstr ""
723+msgstr "You won’t be able to make calls or use text messaging without a SIM."
717724
718725#: qml/Wizard/Pages/sim.qml:90
719726msgid "To proceed with no SIM tap Skip."
720−msgstr ""
727+msgstr "To proceed with no SIM tap Skip."
721728
722729#: qml/Wizard/PasswordMeter.qml:87
723730msgid "Passwords match"
724−msgstr ""
731+msgstr "Passwords match"
725732
726733#: qml/Wizard/PasswordMeter.qml:89
727734msgid "Passwords do not match"
728−msgstr ""
735+msgstr "Passwords do not match"
729736
730737#: qml/Wizard/PasswordMeter.qml:93
731738msgid "Strong password"
732−msgstr ""
739+msgstr "Strong password"
733740
734741#: qml/Wizard/PasswordMeter.qml:95
735742msgid "Fair password"
736−msgstr ""
743+msgstr "Fair password"
737744
738745#: qml/Wizard/PasswordMeter.qml:97
739746msgid "Weak password"
740−msgstr ""
747+msgstr "Weak password"
741748
742749#: qml/Wizard/PasswordMeter.qml:99
743750msgid "Very weak password"
744−msgstr ""
751+msgstr "Very weak password"
745752
746753#~ msgid "Confirm"
747754#~ msgstr "Confirm"
@@ -1054,12 +1061,3 @@ msgstr ""
10541061
10551062#~ msgid "Call back"
10561063#~ msgstr "Call back"
1057−
1058−#~ msgid "Welcome to your Ubuntu device."
1059−#~ msgstr "Welcome to your Ubuntu device."
1060−
1061−#~ msgid "Please select how you’d like to unlock your device."
1062−#~ msgstr "Please select how you would like to unlock your device."
1063−
1064−#~ msgid "Your device is now ready to use."
1065−#~ msgstr "Your device is now ready to use."
po/es.po+11−20
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2016-03-25 00:37+0000\n"
12−"Last-Translator: Víctor R. Ruiz <Unknown>\n"
11+"PO-Revision-Date: 2016-03-25 12:02+0000\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
1313"Language-Team: Spanish <es@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-25 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-26 05:44+0000\n"
1919"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -191,7 +191,7 @@ msgstr "Refinar resultados"
191191
192192#: qml/Dash/FiltersPopover.qml:69
193193msgid "Reset"
194−msgstr "Reiniciar"
194+msgstr "Restablecer"
195195
196196#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
197197msgid "See less"
@@ -253,7 +253,7 @@ msgstr "Activar datos de ubicación"
253253
254254#: qml/Dash/ScopesList.qml:67
255255msgid "Manage"
256−msgstr "Administrar"
256+msgstr "Gestionar"
257257
258258#: qml/Dash/ScopesList.qml:113
259259msgid "Home"
@@ -545,7 +545,7 @@ msgstr "términos y condiciones"
545545
546546#: qml/Wizard/Pages/40-location.qml:160
547547msgid "GPS only"
548−msgstr "Sólo GPS"
548+msgstr "Solo GPS"
549549
550550#: qml/Wizard/Pages/40-location.qml:214
551551msgid "Don't use my location"
@@ -553,11 +553,11 @@ msgstr "No usar mi ubicación"
553553
554554#: qml/Wizard/Pages/40-location.qml:260
555555msgid "You can change it later in System Settings."
556−msgstr "Puede cambiarlo luego en Configuración del sistema"
556+msgstr "Puede cambiarlo luego en Configuración del sistema."
557557
558558#: qml/Wizard/Pages/50-timezone.qml:29
559559msgid "Time Zone"
560−msgstr "Zona horaria"
560+msgstr "Huso horario"
561561
562562#: qml/Wizard/Pages/50-timezone.qml:178
563563msgid "Enter your city"
@@ -578,12 +578,12 @@ msgstr "Bloquear pantalla"
578578#: qml/Wizard/Pages/70-passwd-type.qml:101
579579msgctxt "Label: Type of security method"
580580msgid "Create new password"
581−msgstr "Crear nueva contraseña"
581+msgstr "Crear contraseña nueva"
582582
583583#: qml/Wizard/Pages/70-passwd-type.qml:103
584584msgctxt "Label: Type of security method"
585585msgid "Create passcode (numbers only)"
586−msgstr "Crear código (sólo dígitos)"
586+msgstr "Crear código (solo dígitos)"
587587
588588#: qml/Wizard/Pages/70-passwd-type.qml:105
589589msgctxt "Label: Type of security method"
@@ -608,7 +608,7 @@ msgstr "Política de privacidad"
608608
609609#: qml/Wizard/Pages/80-finished.qml:89
610610msgid "Welcome to Ubuntu"
611−msgstr "Bienvenido a Ubuntu"
611+msgstr "Le damos la bienvenida a Ubuntu"
612612
613613#: qml/Wizard/Pages/80-finished.qml:104
614614msgid "You are ready to use your device now"
@@ -1075,12 +1075,3 @@ msgstr "Contraseña muy débil"
10751075
10761076#~ msgid "Call back"
10771077#~ msgstr "Devolver llamada"
1078−
1079−#~ msgid "Welcome to your Ubuntu device."
1080−#~ msgstr "Bienvenido a su dispositivo Ubuntu."
1081−
1082−#~ msgid "Please select how you’d like to unlock your device."
1083−#~ msgstr "Por favor, seleccione cómo desea desbloquear el dispositivo."
1084−
1085−#~ msgid "Your device is now ready to use."
1086−#~ msgstr "El dispositivo está listo para su uso."
po/fa.po+21−10
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity8\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: 2016-03-24 16:02+0000\n"
11+"PO-Revision-Date: 2016-03-30 14:29+0000\n"
1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
1313"Language-Team: Persian <fa@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=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2016-03-25 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-31 05:49+0000\n"
1919"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -140,6 +140,7 @@ msgctxt ""
140140"Re-dock means connect the device again to an external screen/mouse/keyboard"
141141msgid "Re-dock, save your work and close these apps to continue."
142142msgstr ""
143+"برای ادامه، دوباره متّصل کرده، کارتان را ذخیره کنید و این کاره‌ها را ببندید."
143144
144145#: qml/Components/ModeSwitchWarningDialog.qml:63
145146msgid "Or force close now (unsaved data will be lost)."
@@ -182,7 +183,7 @@ msgstr "افزودن به برگزیده‌ها"
182183
183184#: qml/Dash/FiltersPopover.qml:60
184185msgid "Refine your results"
185−msgstr ""
186+msgstr "نتایجتان را بهبود دهید"
186187
187188#: qml/Dash/FiltersPopover.qml:69
188189msgid "Reset"
@@ -263,6 +264,8 @@ msgid ""
263264"Your device is now connected to an external display. Use this screen as a "
264265"touch pad to interact with the pointer."
265266msgstr ""
267+"افزاره‌تان هم‌تکنون به یک نمایشگر خارجی وصل شده است. از این صفحه به عنوان یک "
268+"صفحه‌لمسی برای کارکردن با نشانگر استفاده کنید."
266269
267270#: qml/Greeter/CoverPage.qml:118
268271msgid "Unlock"
@@ -421,7 +424,7 @@ msgstr "پاسخ تماس"
421424
422425#: qml/Stages/SideStage.qml:76
423426msgid "Drag using 3 fingers any application from one window to the other"
424−msgstr ""
427+msgstr "هر پنجره‌ای را با کشیدن سه‌انگشت از پنجره‌ای به ینجرهٔ دیگر ببرید"
425428
426429#: qml/Tutorial/TutorialBottom.qml:78
427430msgid "Swipe up to add a contact"
@@ -515,6 +518,8 @@ msgid ""
515518"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
516519"(recommended)"
517520msgstr ""
521+"برای تشخیص موقعیّت، به صورت ناشناس از جی‌پی‌اس، نقطه‌های داغ وای‌فای و "
522+"شبکه‌های تلفن همراه استفاده شود (توصیه شده)"
518523
519524#: qml/Wizard/Pages/40-location.qml:105
520525#, qt-format
@@ -583,7 +588,7 @@ msgstr "کمک به بهبود"
583588
584589#: qml/Wizard/Pages/75-report-check.qml:59
585590msgid "Improve system performance by sending us crashes and error reports."
586−msgstr ""
591+msgstr "کارایی سامانه با ارسال گزارش‌های خطا بهبود دهید."
587592
588593#: qml/Wizard/Pages/75-report-check.qml:60
589594msgid "Privacy policy"
@@ -608,6 +613,7 @@ msgstr "شرایط و ضوابط"
608613#: qml/Wizard/Pages/here-terms.qml:69
609614msgid "Your device uses positioning technologies provided by HERE."
610615msgstr ""
616+"افزاره‌تان از فن‌آوری‌های موقعیّت‌یابی فراهم‌شده توسّط HERE استفاده مي‌کند."
611617
612618#: qml/Wizard/Pages/here-terms.qml:81
613619msgid ""
@@ -615,17 +621,22 @@ msgid ""
615621"collects information about nearby cell towers and Wi-Fi hotspots around your "
616622"current location whenever your position is being found."
617623msgstr ""
624+"به منظور فراهم کردن خدمات موقعیّت‌یابی و بهبود کیفیت آن‌ها، به هنگام پیدا "
625+"شدن موقعیتتان، HERE اطّلاعاتی دربارهٔ برج‌های تلفن همراه نزدیک و نقطه‌های "
626+"داغ وای‌فای اطراف موقعیّت فعلیتان را حمع‌آوری می‌کند."
618627
619628#: qml/Wizard/Pages/here-terms.qml:93
620629msgid ""
621630"The information collected is used to analyze the service and to improve the "
622631"use of service, but not to identify you personally."
623632msgstr ""
633+"اطّلاعات جمع‌آوری شده برای تحلیل خدمت و بهبود استفاده از آن، و نه برای تشخیص "
634+"شخص شما استفاده می‌شوند"
624635
625636#: qml/Wizard/Pages/here-terms.qml:106
626637#, qt-format
627638msgid "By continuing, you agree to the HERE platform %1 and %2."
628−msgstr ""
639+msgstr "با ادامه، با %1 و %2 بن‌سازهٔ HERE موافقت می‌کنید."
629640
630641#: qml/Wizard/Pages/here-terms.qml:107
631642msgid "Service Terms"
@@ -726,19 +737,19 @@ msgstr "گذرواژه‌ها مطابق نیستند"
726737
727738#: qml/Wizard/PasswordMeter.qml:93
728739msgid "Strong password"
729−msgstr ""
740+msgstr "گذرواژهٔ قوی"
730741
731742#: qml/Wizard/PasswordMeter.qml:95
732743msgid "Fair password"
733−msgstr ""
744+msgstr "گذرواژهٔ معتدل"
734745
735746#: qml/Wizard/PasswordMeter.qml:97
736747msgid "Weak password"
737−msgstr ""
748+msgstr "گذرواژهٔ ضعیف"
738749
739750#: qml/Wizard/PasswordMeter.qml:99
740751msgid "Very weak password"
741−msgstr ""
752+msgstr "گذرواژهٔ خیلی ضعیف"
742753
743754#~ msgid "Right edge"
744755#~ msgstr "لبه‌ی راست"
po/fr.po+69−57
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2016-03-24 22:32+0000\n"
11+"PO-Revision-Date: 2016-03-26 13:06+0000\n"
1212"Last-Translator: Jean-Marc <Unknown>\n"
1313"Language-Team: French <fr@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-25 05:54+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-27 05:47+0000\n"
1919"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -215,7 +215,7 @@ msgstr "Recherches récentes"
215215
216216#: qml/Dash/PageHeaderExtraPanel.qml:66
217217msgid "Clear All"
218−msgstr ""
218+msgstr "Tout effacer"
219219
220220#: qml/Dash/Previews/PreviewActionCombo.qml:35
221221msgid "More..."
@@ -446,11 +446,11 @@ msgstr "Faites glisser vers le haut pour ajouter un contact"
446446
447447#: qml/Tutorial/TutorialBottom.qml:80
448448msgid "Swipe up for favorite calculations"
449−msgstr ""
449+msgstr "Faites glisser vers le haut pour afficher les calculs favoris"
450450
451451#: qml/Tutorial/TutorialBottom.qml:82
452452msgid "Swipe up for recent calls"
453−msgstr ""
453+msgstr "Faites glisser vers le haut pour afficher les appels récents"
454454
455455#: qml/Tutorial/TutorialBottom.qml:84
456456msgid "Swipe up to create a message"
@@ -462,27 +462,36 @@ msgstr "Faites glisser vers le haut pour gérer l'application"
462462
463463#: qml/Tutorial/TutorialLeft.qml:47
464464msgid "Swipe from the left edge to open the launcher"
465−msgstr ""
465+msgstr "Faites glisser à partir du bord gauche pour ouvrir le lanceur"
466466
467467#: qml/Tutorial/TutorialLeftLong.qml:47
468468msgid "Long swipe from the left edge to open the Today scope"
469469msgstr ""
470+"Faites glisser à partir du bord gauche jusqu'au bord droit pour ouvrir le "
471+"moteur de recherche Aujourd'hui"
470472
471473#: qml/Tutorial/TutorialRight.qml:54
472474msgid "Hover your mouse on the right edge to view your open apps"
473475msgstr ""
476+"Passez votre souris sur le bord droit pour voir vos applications ouvertes"
474477
475478#: qml/Tutorial/TutorialRight.qml:55
476479msgid "Short or long swipe from the right edge to view your open apps"
477480msgstr ""
481+"Faites glisser brièvement ou longuement à partir du bord droit pour voir vos "
482+"applications ouvertes"
478483
479484#: qml/Tutorial/TutorialTop.qml:53
480485msgid "Swipe from the top right edge to open the notification bar"
481486msgstr ""
487+"Faites glisser à partir du bord supérieur droit pour ouvrir la barre de "
488+"notifications"
482489
483490#: qml/Tutorial/TutorialTop.qml:54
484491msgid "Swipe from the top edge to open the notification bar"
485492msgstr ""
493+"Faites glisser à partir du bord supérieur pour ouvrir la barre de "
494+"notifications"
486495
487496#: qml/Wizard/Page.qml:54
488497msgctxt "Button: Go back one page in the Wizard"
@@ -491,7 +500,7 @@ msgstr "Précédent"
491500
492501#: qml/Wizard/Pages/10-welcome.qml:27
493502msgid "Language"
494−msgstr ""
503+msgstr "Langue"
495504
496505#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
497506#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -532,6 +541,8 @@ msgid ""
532541"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
533542"(recommended)"
534543msgstr ""
544+"Utiliser le GPS, les points d'accès Wi-Fi et le réseau mobile de manière "
545+"anonyme afin de détecter la position (recommandé)"
535546
536547#: qml/Wizard/Pages/40-location.qml:105
537548#, qt-format
@@ -545,7 +556,7 @@ msgstr "conditions générales d'utilisation"
545556
546557#: qml/Wizard/Pages/40-location.qml:160
547558msgid "GPS only"
548−msgstr ""
559+msgstr "GPS uniquement"
549560
550561#: qml/Wizard/Pages/40-location.qml:214
551562msgid "Don't use my location"
@@ -553,7 +564,7 @@ msgstr "Ne pas utiliser ma position"
553564
554565#: qml/Wizard/Pages/40-location.qml:260
555566msgid "You can change it later in System Settings."
556−msgstr ""
567+msgstr "Vous pouvez le modifier ultérieurement dans les Paramètres système."
557568
558569#: qml/Wizard/Pages/50-timezone.qml:29
559570msgid "Time Zone"
@@ -561,34 +572,34 @@ msgstr "Fuseau horaire"
561572
562573#: qml/Wizard/Pages/50-timezone.qml:178
563574msgid "Enter your city"
564−msgstr ""
575+msgstr "Saisir votre ville"
565576
566577#: qml/Wizard/Pages/60-account.qml:24
567578msgid "Personalize Your Device"
568−msgstr ""
579+msgstr "Personnaliser votre appareil"
569580
570581#: qml/Wizard/Pages/60-account.qml:48
571582msgid "Preferred Name"
572−msgstr ""
583+msgstr "Nom préferé"
573584
574585#: qml/Wizard/Pages/70-passwd-type.qml:39
575586msgid "Lock Screen"
576−msgstr ""
587+msgstr "Verrouiller l'écran"
577588
578589#: qml/Wizard/Pages/70-passwd-type.qml:101
579590msgctxt "Label: Type of security method"
580591msgid "Create new password"
581−msgstr ""
592+msgstr "Créer un nouveau mot de passe"
582593
583594#: qml/Wizard/Pages/70-passwd-type.qml:103
584595msgctxt "Label: Type of security method"
585596msgid "Create passcode (numbers only)"
586−msgstr ""
597+msgstr "Créer un code (chiffres uniquement)"
587598
588599#: qml/Wizard/Pages/70-passwd-type.qml:105
589600msgctxt "Label: Type of security method"
590601msgid "No lock code"
591−msgstr ""
602+msgstr "Aucun code de verrouillage"
592603
593604#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
594605msgid "Privacy Policy"
@@ -596,27 +607,29 @@ msgstr "Politique de confidentialité"
596607
597608#: qml/Wizard/Pages/75-report-check.qml:26
598609msgid "Help Us Improve"
599−msgstr ""
610+msgstr "Aidez-nous à améliorer"
600611
601612#: qml/Wizard/Pages/75-report-check.qml:59
602613msgid "Improve system performance by sending us crashes and error reports."
603614msgstr ""
615+"Améliorez les performances du système en nous envoyant les rapports d'erreur "
616+"et en nous signalant les anomalies."
604617
605618#: qml/Wizard/Pages/75-report-check.qml:60
606619msgid "Privacy policy"
607−msgstr ""
620+msgstr "Politique relative à la vie privée"
608621
609622#: qml/Wizard/Pages/80-finished.qml:89
610623msgid "Welcome to Ubuntu"
611−msgstr ""
624+msgstr "Bienvenue sur Ubuntu"
612625
613626#: qml/Wizard/Pages/80-finished.qml:104
614627msgid "You are ready to use your device now"
615−msgstr ""
628+msgstr "Vous êtes prêt à utiliser votre appareil maintenant"
616629
617630#: qml/Wizard/Pages/80-finished.qml:124
618631msgid "Get Started"
619−msgstr ""
632+msgstr "Commencer"
620633
621634#: qml/Wizard/Pages/here-terms.qml:25
622635msgid "Terms & Conditions"
@@ -625,6 +638,7 @@ msgstr "Conditions générales d'utilisation"
625638#: qml/Wizard/Pages/here-terms.qml:69
626639msgid "Your device uses positioning technologies provided by HERE."
627640msgstr ""
641+"Votre appareil utilise des technologies de localisation fournies par HERE."
628642
629643#: qml/Wizard/Pages/here-terms.qml:81
630644msgid ""
@@ -632,21 +646,28 @@ msgid ""
632646"collects information about nearby cell towers and Wi-Fi hotspots around your "
633647"current location whenever your position is being found."
634648msgstr ""
649+"Afin de vous offrir des services de localisation et d'améliorer leur "
650+"qualité, HERE collecte des informations sur les tours cellulaires à "
651+"proximité et les points d'accès Wi-Fi autour de votre emplacement actuel "
652+"chaque fois que votre position est trouvée."
635653
636654#: qml/Wizard/Pages/here-terms.qml:93
637655msgid ""
638656"The information collected is used to analyze the service and to improve the "
639657"use of service, but not to identify you personally."
640658msgstr ""
659+"Les informations recueillies sont utilisées pour analyser le service et pour "
660+"améliorer l'utilisation du service mais pas pour vous identifier "
661+"personnellement."
641662
642663#: qml/Wizard/Pages/here-terms.qml:106
643664#, qt-format
644665msgid "By continuing, you agree to the HERE platform %1 and %2."
645−msgstr ""
666+msgstr "En continuant, nous acceptez la %1 et les %2 de la plateforme HERE."
646667
647668#: qml/Wizard/Pages/here-terms.qml:107
648669msgid "Service Terms"
649−msgstr ""
670+msgstr "Conditions de service"
650671
651672#: qml/Wizard/Pages/passcode-confirm.qml:43
652673#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -655,69 +676,69 @@ msgstr "Confirmez votre code"
655676
656677#: qml/Wizard/Pages/passcode-confirm.qml:45
657678msgid "Incorrect passcode."
658−msgstr ""
679+msgstr "Code incorrect."
659680
660681#: qml/Wizard/Pages/passcode-confirm.qml:45
661682msgctxt "Enter the passcode again"
662683msgid "Please re-enter."
663−msgstr ""
684+msgstr "Veuillez ressaisir."
664685
665686#: qml/Wizard/Pages/passcode-desktop.qml:30
666687msgid "Lock Screen Passcode"
667−msgstr ""
688+msgstr "Code de verrouillage d'écran"
668689
669690#: qml/Wizard/Pages/passcode-desktop.qml:56
670691msgid "Enter 4 numbers to setup your passcode"
671−msgstr ""
692+msgstr "Saisissez 4 chiffres pour définir votre code"
672693
673694#: qml/Wizard/Pages/passcode-desktop.qml:65
674695#: qml/Wizard/Pages/passcode-set.qml:54
675696msgid "Choose passcode"
676−msgstr ""
697+msgstr "Choisissez un code"
677698
678699#: qml/Wizard/Pages/passcode-desktop.qml:105
679700msgid "Passcode too short"
680−msgstr ""
701+msgstr "Code trop court"
681702
682703#: qml/Wizard/Pages/passcode-desktop.qml:107
683704msgid "Passcodes match"
684−msgstr ""
705+msgstr "Les codes correspondent"
685706
686707#: qml/Wizard/Pages/passcode-desktop.qml:109
687708msgid "Passcodes do not match"
688−msgstr ""
709+msgstr "Les codes ne correspondent pas"
689710
690711#: qml/Wizard/Pages/passcode-set.qml:62
691712msgid "Passcode must be 4 characters long"
692−msgstr ""
713+msgstr "Le code doit contenir au moins 4 caractères"
693714
694715#: qml/Wizard/Pages/password-set.qml:30
695716msgid "Lock Screen Password"
696−msgstr ""
717+msgstr "Mot de passe de verrouillage de l'écran"
697718
698719#: qml/Wizard/Pages/password-set.qml:61
699720msgid "Enter at least 8 characters"
700−msgstr ""
721+msgstr "Saisissez au moins 8 caractères"
701722
702723#: qml/Wizard/Pages/password-set.qml:73
703724msgid "Choose password"
704−msgstr ""
725+msgstr "Choisissez un mot de passe"
705726
706727#: qml/Wizard/Pages/password-set.qml:103
707728msgid "Confirm password"
708−msgstr ""
729+msgstr "Confirmez le mot de passe"
709730
710731#: qml/Wizard/Pages/sim.qml:27
711732msgid "No SIM card installed"
712−msgstr ""
733+msgstr "Aucune carte SIM installée"
713734
714735#: qml/Wizard/Pages/sim.qml:54
715736msgid "SIM card added"
716−msgstr ""
737+msgstr "Carte SIM ajoutée"
717738
718739#: qml/Wizard/Pages/sim.qml:55
719740msgid "You must restart the device to access the mobile network."
720−msgstr ""
741+msgstr "Vous devez redémarrer l'appareil pour accéder au réseau mobile."
721742
722743#: qml/Wizard/Pages/sim.qml:59
723744msgid "Restart"
@@ -726,34 +747,36 @@ msgstr "Redémarrer"
726747#: qml/Wizard/Pages/sim.qml:78
727748msgid "You won’t be able to make calls or use text messaging without a SIM."
728749msgstr ""
750+"Vous ne serez pas en mesure de passer des appels ou d'envoyer des messages "
751+"sans carte SIM."
729752
730753#: qml/Wizard/Pages/sim.qml:90
731754msgid "To proceed with no SIM tap Skip."
732−msgstr ""
755+msgstr "Pour poursuivre sans carte SIM, appuyez sur « Ignorer »"
733756
734757#: qml/Wizard/PasswordMeter.qml:87
735758msgid "Passwords match"
736−msgstr ""
759+msgstr "Les mots de passe correspondent"
737760
738761#: qml/Wizard/PasswordMeter.qml:89
739762msgid "Passwords do not match"
740−msgstr ""
763+msgstr "Les mots de passe ne correspondent pas"
741764
742765#: qml/Wizard/PasswordMeter.qml:93
743766msgid "Strong password"
744−msgstr ""
767+msgstr "Mot de passe fort"
745768
746769#: qml/Wizard/PasswordMeter.qml:95
747770msgid "Fair password"
748−msgstr ""
771+msgstr "Mot de passe acceptable"
749772
750773#: qml/Wizard/PasswordMeter.qml:97
751774msgid "Weak password"
752−msgstr ""
775+msgstr "Mot de passe faible"
753776
754777#: qml/Wizard/PasswordMeter.qml:99
755778msgid "Very weak password"
756−msgstr ""
779+msgstr "Mot de passe très faible"
757780
758781#~ msgid "Skip intro"
759782#~ msgstr "Passer l'intro"
@@ -1079,14 +1102,3 @@ msgstr ""
10791102
10801103#~ msgid "Call back"
10811104#~ msgstr "Rappeler"
1082−
1083−#~ msgid "Please select how you’d like to unlock your device."
1084−#~ msgstr ""
1085−#~ "Veuillez sélectionner la façon dont vous souhaitez déverrouiller votre "
1086−#~ "appareil."
1087−
1088−#~ msgid "Welcome to your Ubuntu device."
1089−#~ msgstr "Bienvenue sur votre appareil Ubuntu."
1090−
1091−#~ msgid "Your device is now ready to use."
1092−#~ msgstr "Votre appareil est maintenant prêt à être utilisé."
po/nb.po+84−81
@@ -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-07-05 19:44+0000\n"
12−"Last-Translator: Mathias Bynke <Unknown>\n"
11+"PO-Revision-Date: 2016-03-29 08:56+0000\n"
12+"Last-Translator: Åka Sikrom <Unknown>\n"
1313"Language-Team: Norwegian Bokmal <nb@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-03-30 06:25+0000\n"
19+"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -142,6 +142,8 @@ msgctxt ""
142142"Re-dock means connect the device again to an external screen/mouse/keyboard"
143143msgid "Re-dock, save your work and close these apps to continue."
144144msgstr ""
145+"Koble enheten til strøm, lagre arbeidet ditt og lukk disse programmene for å "
146+"fortsette."
145147
146148#: qml/Components/ModeSwitchWarningDialog.qml:63
147149msgid "Or force close now (unsaved data will be lost)."
@@ -184,11 +186,11 @@ msgstr "Legg til i favoritter"
184186
185187#: qml/Dash/FiltersPopover.qml:60
186188msgid "Refine your results"
187−msgstr ""
189+msgstr "Filtrer søketreff"
188190
189191#: qml/Dash/FiltersPopover.qml:69
190192msgid "Reset"
191−msgstr ""
193+msgstr "Tilbakestill"
192194
193195#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
194196msgid "See less"
@@ -205,11 +207,11 @@ msgstr "Søk"
205207
206208#: qml/Dash/PageHeaderExtraPanel.qml:55
207209msgid "Recent Searches"
208−msgstr ""
210+msgstr "Nylige søk"
209211
210212#: qml/Dash/PageHeaderExtraPanel.qml:66
211213msgid "Clear All"
212−msgstr ""
214+msgstr "Tøm alt"
213215
214216#: qml/Dash/Previews/PreviewActionCombo.qml:35
215217msgid "More..."
@@ -265,6 +267,8 @@ msgid ""
265267"Your device is now connected to an external display. Use this screen as a "
266268"touch pad to interact with the pointer."
267269msgstr ""
270+"Enheten er nå koblet til en ekstern skjerm. Bruk denne skjermen som en "
271+"pekeplate for å styre pekeren."
268272
269273#: qml/Greeter/CoverPage.qml:118
270274msgid "Unlock"
@@ -426,51 +430,51 @@ msgstr "Ring tilbake"
426430
427431#: qml/Stages/SideStage.qml:76
428432msgid "Drag using 3 fingers any application from one window to the other"
429−msgstr ""
433+msgstr "Dra et program fra et vindu til et annet med 3 fingre"
430434
431435#: qml/Tutorial/TutorialBottom.qml:78
432436msgid "Swipe up to add a contact"
433−msgstr ""
437+msgstr "Dra opp for å legge til en kontakt"
434438
435439#: qml/Tutorial/TutorialBottom.qml:80
436440msgid "Swipe up for favorite calculations"
437−msgstr ""
441+msgstr "Dra opp for å se favoritt-utregninger"
438442
439443#: qml/Tutorial/TutorialBottom.qml:82
440444msgid "Swipe up for recent calls"
441−msgstr ""
445+msgstr "Dra opp for å se nylige anrop"
442446
443447#: qml/Tutorial/TutorialBottom.qml:84
444448msgid "Swipe up to create a message"
445−msgstr ""
449+msgstr "Dra opp for å lage en melding"
446450
447451#: qml/Tutorial/TutorialBottom.qml:85
448452msgid "Swipe up to manage the app"
449−msgstr ""
453+msgstr "Dra opp for å håndtere programmet"
450454
451455#: qml/Tutorial/TutorialLeft.qml:47
452456msgid "Swipe from the left edge to open the launcher"
453−msgstr ""
457+msgstr "Dra fra venstre kant for å åpne oppstarteren"
454458
455459#: qml/Tutorial/TutorialLeftLong.qml:47
456460msgid "Long swipe from the left edge to open the Today scope"
457−msgstr ""
461+msgstr "Dra langt fra venstre kant for å åpne virkefeltet «I dag»"
458462
459463#: qml/Tutorial/TutorialRight.qml:54
460464msgid "Hover your mouse on the right edge to view your open apps"
461−msgstr ""
465+msgstr "Hold musepekeren over høyre kant for å vise åpne programmer"
462466
463467#: qml/Tutorial/TutorialRight.qml:55
464468msgid "Short or long swipe from the right edge to view your open apps"
465−msgstr ""
469+msgstr "Dra fra høyre kant for å vise åpne programmer"
466470
467471#: qml/Tutorial/TutorialTop.qml:53
468472msgid "Swipe from the top right edge to open the notification bar"
469−msgstr ""
473+msgstr "Dra fra øvre høyre hjørne for å åpne varslingslinja"
470474
471475#: qml/Tutorial/TutorialTop.qml:54
472476msgid "Swipe from the top edge to open the notification bar"
473−msgstr ""
477+msgstr "Dra fra øvre kant for å åpne varslingslinja"
474478
475479#: qml/Wizard/Page.qml:54
476480msgctxt "Button: Go back one page in the Wizard"
@@ -479,7 +483,7 @@ msgstr "Tilbake"
479483
480484#: qml/Wizard/Pages/10-welcome.qml:27
481485msgid "Language"
482−msgstr ""
486+msgstr "Språk"
483487
484488#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
485489#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -488,7 +492,7 @@ msgstr ""
488492#: qml/Wizard/Pages/passcode-desktop.qml:124
489493#: qml/Wizard/Pages/password-set.qml:141
490494msgid "Next"
491−msgstr ""
495+msgstr "Neste"
492496
493497#: qml/Wizard/Pages/30-wifi.qml:29
494498msgid "Connect to Wi‑Fi"
@@ -496,15 +500,15 @@ msgstr "Koble til trådløst nettverk"
496500
497501#: qml/Wizard/Pages/30-wifi.qml:130
498502msgid "Connected"
499−msgstr ""
503+msgstr "Koblet til"
500504
501505#: qml/Wizard/Pages/30-wifi.qml:163
502506msgid "Available Wi-Fi networks"
503−msgstr ""
507+msgstr "Tilgjengelige trådløse nettverk"
504508
505509#: qml/Wizard/Pages/30-wifi.qml:164
506510msgid "No available Wi-Fi networks"
507−msgstr ""
511+msgstr "Intet trådløst nettverk tilgjengelig"
508512
509513#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
510514#: qml/Wizard/Pages/sim.qml:101
@@ -513,98 +517,101 @@ msgstr "Hopp over"
513517
514518#: qml/Wizard/Pages/40-location.qml:27
515519msgid "Location Services"
516−msgstr ""
520+msgstr "Posisjonstjenester"
517521
518522#: qml/Wizard/Pages/40-location.qml:83
519523msgid ""
520524"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
521525"(recommended)"
522526msgstr ""
527+"Bruk GPS, åpne trådløse nettverk og mobilnett for å regne ut posisjon "
528+"anonymt (anbefales)"
523529
524530#: qml/Wizard/Pages/40-location.qml:105
525531#, qt-format
526532msgid "By selecting this option you agree to the Nokia HERE %1."
527−msgstr ""
533+msgstr "Ved å velge dette godtar du %1 for Nokia HERE."
528534
529535#: qml/Wizard/Pages/40-location.qml:106
530536msgctxt "part of: Nokia HERE terms and conditions"
531537msgid "terms and conditions"
532−msgstr ""
538+msgstr "bruksvilkår"
533539
534540#: qml/Wizard/Pages/40-location.qml:160
535541msgid "GPS only"
536−msgstr ""
542+msgstr "Bare GPS"
537543
538544#: qml/Wizard/Pages/40-location.qml:214
539545msgid "Don't use my location"
540−msgstr ""
546+msgstr "Ikke bruk posisjon"
541547
542548#: qml/Wizard/Pages/40-location.qml:260
543549msgid "You can change it later in System Settings."
544−msgstr ""
550+msgstr "Du kan endre dette senere i systemoppsettet."
545551
546552#: qml/Wizard/Pages/50-timezone.qml:29
547553msgid "Time Zone"
548−msgstr ""
554+msgstr "Tidssone"
549555
550556#: qml/Wizard/Pages/50-timezone.qml:178
551557msgid "Enter your city"
552−msgstr ""
558+msgstr "Skriv inn by"
553559
554560#: qml/Wizard/Pages/60-account.qml:24
555561msgid "Personalize Your Device"
556−msgstr ""
562+msgstr "Tilpass enhet"
557563
558564#: qml/Wizard/Pages/60-account.qml:48
559565msgid "Preferred Name"
560−msgstr ""
566+msgstr "Foretrukket navn"
561567
562568#: qml/Wizard/Pages/70-passwd-type.qml:39
563569msgid "Lock Screen"
564−msgstr ""
570+msgstr "Låseskjerm"
565571
566572#: qml/Wizard/Pages/70-passwd-type.qml:101
567573msgctxt "Label: Type of security method"
568574msgid "Create new password"
569−msgstr ""
575+msgstr "Lag nytt passord"
570576
571577#: qml/Wizard/Pages/70-passwd-type.qml:103
572578msgctxt "Label: Type of security method"
573579msgid "Create passcode (numbers only)"
574−msgstr ""
580+msgstr "Lag kode (kun tall)"
575581
576582#: qml/Wizard/Pages/70-passwd-type.qml:105
577583msgctxt "Label: Type of security method"
578584msgid "No lock code"
579−msgstr ""
585+msgstr "Ingen låsekode"
580586
581587#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
582588msgid "Privacy Policy"
583−msgstr ""
589+msgstr "Personvernregler"
584590
585591#: qml/Wizard/Pages/75-report-check.qml:26
586592msgid "Help Us Improve"
587−msgstr ""
593+msgstr "Hjelp oss med å bli bedre"
588594
589595#: qml/Wizard/Pages/75-report-check.qml:59
590596msgid "Improve system performance by sending us crashes and error reports."
591597msgstr ""
598+"Send oss kræsj- og feilrapporter og hjelp oss med å gjøre systemet bedre."
592599
593600#: qml/Wizard/Pages/75-report-check.qml:60
594601msgid "Privacy policy"
595−msgstr ""
602+msgstr "Personvernregler"
596603
597604#: qml/Wizard/Pages/80-finished.qml:89
598605msgid "Welcome to Ubuntu"
599−msgstr ""
606+msgstr "Velkommen til Ubuntu"
600607
601608#: qml/Wizard/Pages/80-finished.qml:104
602609msgid "You are ready to use your device now"
603−msgstr ""
610+msgstr "Enheten er nå klar til bruk"
604611
605612#: qml/Wizard/Pages/80-finished.qml:124
606613msgid "Get Started"
607−msgstr ""
614+msgstr "Kom i gang"
608615
609616#: qml/Wizard/Pages/here-terms.qml:25
610617msgid "Terms & Conditions"
@@ -612,7 +619,7 @@ msgstr "Brukervilkår"
612619
613620#: qml/Wizard/Pages/here-terms.qml:69
614621msgid "Your device uses positioning technologies provided by HERE."
615−msgstr ""
622+msgstr "Enheten bruker posisjonsteknologi via tjenesten HERE."
616623
617624#: qml/Wizard/Pages/here-terms.qml:81
618625msgid ""
@@ -620,21 +627,26 @@ msgid ""
620627"collects information about nearby cell towers and Wi-Fi hotspots around your "
621628"current location whenever your position is being found."
622629msgstr ""
630+"Tjenesten HERE samler inn informasjon om mobiltårn og åpne trådløse nettverk "
631+"i nærheten av enheten når du bruker posisjonsbasere tjenester."
623632
624633#: qml/Wizard/Pages/here-terms.qml:93
625634msgid ""
626635"The information collected is used to analyze the service and to improve the "
627636"use of service, but not to identify you personally."
628637msgstr ""
638+"Informasjonen som samles inn blir brukt til å analysere tjenesten og "
639+"forbedre brukskvaliteten. Den blir ikke brukt til å identifisere deg "
640+"personlig."
629641
630642#: qml/Wizard/Pages/here-terms.qml:106
631643#, qt-format
632644msgid "By continuing, you agree to the HERE platform %1 and %2."
633−msgstr ""
645+msgstr "Hvis du fortsetter, samtykker du til %1 og %2 for tjenesten HERE."
634646
635647#: qml/Wizard/Pages/here-terms.qml:107
636648msgid "Service Terms"
637−msgstr ""
649+msgstr "tjenestevilkår"
638650
639651#: qml/Wizard/Pages/passcode-confirm.qml:43
640652#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -643,69 +655,69 @@ msgstr "Bekreft kode"
643655
644656#: qml/Wizard/Pages/passcode-confirm.qml:45
645657msgid "Incorrect passcode."
646−msgstr ""
658+msgstr "Feil kode."
647659
648660#: qml/Wizard/Pages/passcode-confirm.qml:45
649661msgctxt "Enter the passcode again"
650662msgid "Please re-enter."
651−msgstr ""
663+msgstr "Tast koden på nytt"
652664
653665#: qml/Wizard/Pages/passcode-desktop.qml:30
654666msgid "Lock Screen Passcode"
655−msgstr ""
667+msgstr "Låseskjerm-kode"
656668
657669#: qml/Wizard/Pages/passcode-desktop.qml:56
658670msgid "Enter 4 numbers to setup your passcode"
659−msgstr ""
671+msgstr "Skriv inn 4 sifre som skal brukes som kode"
660672
661673#: qml/Wizard/Pages/passcode-desktop.qml:65
662674#: qml/Wizard/Pages/passcode-set.qml:54
663675msgid "Choose passcode"
664−msgstr ""
676+msgstr "Velg kode"
665677
666678#: qml/Wizard/Pages/passcode-desktop.qml:105
667679msgid "Passcode too short"
668−msgstr ""
680+msgstr "Koden er for kort"
669681
670682#: qml/Wizard/Pages/passcode-desktop.qml:107
671683msgid "Passcodes match"
672−msgstr ""
684+msgstr "Kodene stemmer"
673685
674686#: qml/Wizard/Pages/passcode-desktop.qml:109
675687msgid "Passcodes do not match"
676−msgstr ""
688+msgstr "Kodene er ulike"
677689
678690#: qml/Wizard/Pages/passcode-set.qml:62
679691msgid "Passcode must be 4 characters long"
680−msgstr ""
692+msgstr "Koden må bestå av 4 sifre"
681693
682694#: qml/Wizard/Pages/password-set.qml:30
683695msgid "Lock Screen Password"
684−msgstr ""
696+msgstr "Låseskjerm-passord"
685697
686698#: qml/Wizard/Pages/password-set.qml:61
687699msgid "Enter at least 8 characters"
688−msgstr ""
700+msgstr "Skriv inn minst 8 tegn"
689701
690702#: qml/Wizard/Pages/password-set.qml:73
691703msgid "Choose password"
692−msgstr ""
704+msgstr "Velg passord"
693705
694706#: qml/Wizard/Pages/password-set.qml:103
695707msgid "Confirm password"
696−msgstr ""
708+msgstr "Bekreft passord"
697709
698710#: qml/Wizard/Pages/sim.qml:27
699711msgid "No SIM card installed"
700−msgstr ""
712+msgstr "Ingen SIM-kort installert"
701713
702714#: qml/Wizard/Pages/sim.qml:54
703715msgid "SIM card added"
704−msgstr ""
716+msgstr "SIM-kort satt inn"
705717
706718#: qml/Wizard/Pages/sim.qml:55
707719msgid "You must restart the device to access the mobile network."
708−msgstr ""
720+msgstr "Du må starte enheten på nytt for å få tilgang til mobilnett."
709721
710722#: qml/Wizard/Pages/sim.qml:59
711723msgid "Restart"
@@ -713,35 +725,35 @@ msgstr "Start på nytt"
713725
714726#: qml/Wizard/Pages/sim.qml:78
715727msgid "You won’t be able to make calls or use text messaging without a SIM."
716−msgstr ""
728+msgstr "Du kan ikke ringe eller bruke tekstmeldinger uten et SIM-kort."
717729
718730#: qml/Wizard/Pages/sim.qml:90
719731msgid "To proceed with no SIM tap Skip."
720−msgstr ""
732+msgstr "Trykk «Hopp over» for å fortsette uten SIM-kort"
721733
722734#: qml/Wizard/PasswordMeter.qml:87
723735msgid "Passwords match"
724−msgstr ""
736+msgstr "Passordene stemmer"
725737
726738#: qml/Wizard/PasswordMeter.qml:89
727739msgid "Passwords do not match"
728−msgstr ""
740+msgstr "Passordene er ulike"
729741
730742#: qml/Wizard/PasswordMeter.qml:93
731743msgid "Strong password"
732−msgstr ""
744+msgstr "Sterkt passord"
733745
734746#: qml/Wizard/PasswordMeter.qml:95
735747msgid "Fair password"
736−msgstr ""
748+msgstr "Middels sterkt passord"
737749
738750#: qml/Wizard/PasswordMeter.qml:97
739751msgid "Weak password"
740−msgstr ""
752+msgstr "Svakt passord"
741753
742754#: qml/Wizard/PasswordMeter.qml:99
743755msgid "Very weak password"
744−msgstr ""
756+msgstr "Veldig svakt passord"
745757
746758#~ msgid "Confirm"
747759#~ msgstr "Bekreft"
@@ -1051,12 +1063,3 @@ msgstr ""
10511063
10521064#~ msgid "Tomorrow %H:%M"
10531065#~ msgstr "I morgen %H:%M"
1054−
1055−#~ msgid "Welcome to your Ubuntu device."
1056−#~ msgstr "Velkommen til Ubuntu-enheten din."
1057−
1058−#~ msgid "Please select how you’d like to unlock your device."
1059−#~ msgstr "Velg hvordan du vil låse opp enheten."
1060−
1061−#~ msgid "Your device is now ready to use."
1062−#~ msgstr "Enheten er nå klar til bruk."
po/pl.po+3−11
@@ -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: 2016-03-24 22:47+0000\n"
11+"PO-Revision-Date: 2016-03-28 20:45+0000\n"
1212"Last-Translator: Krzysztof Tataradziński <Unknown>\n"
1313"Language-Team: Polish <pl@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
1818"|| n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2016-03-25 05:55+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-29 05:41+0000\n"
2020"X-Generator: Launchpad (build 17967)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -430,6 +430,7 @@ msgstr "Oddzwoń"
430430#: qml/Stages/SideStage.qml:76
431431msgid "Drag using 3 fingers any application from one window to the other"
432432msgstr ""
433+"Przeciągnij 3 palcami jakąkolwiek aplikację z jednego okna do drugiego"
433434
434435#: qml/Tutorial/TutorialBottom.qml:78
435436msgid "Swipe up to add a contact"
@@ -1048,12 +1049,3 @@ msgstr ""
10481049
10491050#~ msgid "Call back"
10501051#~ msgstr "Oddzwoń"
1051−
1052−#~ msgid "Welcome to your Ubuntu device."
1053−#~ msgstr "Witaj w swoim urządzeniu Ubuntu."
1054−
1055−#~ msgid "Please select how you’d like to unlock your device."
1056−#~ msgstr "Prosimy wybrać sposób, w jaki chcesz odblokować swoje urządzenie."
1057−
1058−#~ msgid "Your device is now ready to use."
1059−#~ msgstr "Twoje urządzenie jest już gotowe do użytku."
po/sk.po+81−79
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\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: 2016-03-14 06:07+0000\n"
11+"PO-Revision-Date: 2016-03-26 15:29+0000\n"
1212"Last-Translator: P_E_T_O <Unknown>\n"
1313"Language-Team: Slovak <sk@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=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\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-03-27 05:47+0000\n"
19+"X-Generator: Launchpad (build 17967)\n"
2020"Language: sk\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -189,11 +189,11 @@ msgstr "Pridať k obľúbeným"
189189
190190#: qml/Dash/FiltersPopover.qml:60
191191msgid "Refine your results"
192−msgstr ""
192+msgstr "Spresniť výsledky"
193193
194194#: qml/Dash/FiltersPopover.qml:69
195195msgid "Reset"
196−msgstr ""
196+msgstr "Resetovať"
197197
198198#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
199199msgid "See less"
@@ -210,11 +210,11 @@ msgstr "Hľadať"
210210
211211#: qml/Dash/PageHeaderExtraPanel.qml:55
212212msgid "Recent Searches"
213−msgstr ""
213+msgstr "Nedávne vyhľadávania"
214214
215215#: qml/Dash/PageHeaderExtraPanel.qml:66
216216msgid "Clear All"
217−msgstr ""
217+msgstr "Vymazať všetko"
218218
219219#: qml/Dash/Previews/PreviewActionCombo.qml:35
220220msgid "More..."
@@ -437,50 +437,53 @@ msgstr "Zavolať naspäť"
437437#: qml/Stages/SideStage.qml:76
438438msgid "Drag using 3 fingers any application from one window to the other"
439439msgstr ""
440+"Potiahnite pomocou 3 prstov ľubovoľnú aplikáciu z jedného okna do druhého"
440441
441442#: qml/Tutorial/TutorialBottom.qml:78
442443msgid "Swipe up to add a contact"
443−msgstr ""
444+msgstr "Potiahnuť dohora pre pridanie kontaktu"
444445
445446#: qml/Tutorial/TutorialBottom.qml:80
446447msgid "Swipe up for favorite calculations"
447−msgstr ""
448+msgstr "Potiahnuť dohora pre obľúbené výpočty"
448449
449450#: qml/Tutorial/TutorialBottom.qml:82
450451msgid "Swipe up for recent calls"
451−msgstr ""
452+msgstr "Potiahnuť dohora pre nedávne hovory"
452453
453454#: qml/Tutorial/TutorialBottom.qml:84
454455msgid "Swipe up to create a message"
455−msgstr ""
456+msgstr "Potiahnuť dohora pre vytvorenie správy"
456457
457458#: qml/Tutorial/TutorialBottom.qml:85
458459msgid "Swipe up to manage the app"
459−msgstr ""
460+msgstr "Potiahnuť dohora pre spravovanie aplikácie"
460461
461462#: qml/Tutorial/TutorialLeft.qml:47
462463msgid "Swipe from the left edge to open the launcher"
463−msgstr ""
464+msgstr "Potiahnite od ľavého okraja pre otvorenie spúšťača"
464465
465466#: qml/Tutorial/TutorialLeftLong.qml:47
466467msgid "Long swipe from the left edge to open the Today scope"
467−msgstr ""
468+msgstr "Dlhé potiahnutie od ľavého okraja pre otvorenie scope Dnes"
468469
469470#: qml/Tutorial/TutorialRight.qml:54
470471msgid "Hover your mouse on the right edge to view your open apps"
471−msgstr ""
472+msgstr "Prejdite myšou od pravého okraja pre zobrazenie otvorených aplikácií"
472473
473474#: qml/Tutorial/TutorialRight.qml:55
474475msgid "Short or long swipe from the right edge to view your open apps"
475476msgstr ""
477+"Krátke alebo dlhé potiahnutie od pravého okraja pre zobrazenie otvorených "
478+"aplikácií"
476479
477480#: qml/Tutorial/TutorialTop.qml:53
478481msgid "Swipe from the top right edge to open the notification bar"
479−msgstr ""
482+msgstr "Potiahnite od ľavého horného okraja pre otvorenie notifikačnej lišty"
480483
481484#: qml/Tutorial/TutorialTop.qml:54
482485msgid "Swipe from the top edge to open the notification bar"
483−msgstr ""
486+msgstr "Potiahnite od horného okraja pre otvorenie notifikačnej lišty"
484487
485488#: qml/Wizard/Page.qml:54
486489msgctxt "Button: Go back one page in the Wizard"
@@ -489,7 +492,7 @@ msgstr "Naspäť"
489492
490493#: qml/Wizard/Pages/10-welcome.qml:27
491494msgid "Language"
492−msgstr ""
495+msgstr "Jazyk"
493496
494497#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
495498#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -498,7 +501,7 @@ msgstr ""
498501#: qml/Wizard/Pages/passcode-desktop.qml:124
499502#: qml/Wizard/Pages/password-set.qml:141
500503msgid "Next"
501−msgstr ""
504+msgstr "Nasledujúca"
502505
503506#: qml/Wizard/Pages/30-wifi.qml:29
504507msgid "Connect to Wi‑Fi"
@@ -506,15 +509,15 @@ msgstr "Pripojiť k Wifi"
506509
507510#: qml/Wizard/Pages/30-wifi.qml:130
508511msgid "Connected"
509−msgstr ""
512+msgstr "Pripojené"
510513
511514#: qml/Wizard/Pages/30-wifi.qml:163
512515msgid "Available Wi-Fi networks"
513−msgstr ""
516+msgstr "Dostupné Wifi siete"
514517
515518#: qml/Wizard/Pages/30-wifi.qml:164
516519msgid "No available Wi-Fi networks"
517−msgstr ""
520+msgstr "Žiadne dostupné Wifi siete"
518521
519522#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
520523#: qml/Wizard/Pages/sim.qml:101
@@ -523,98 +526,100 @@ msgstr "Preskočiť"
523526
524527#: qml/Wizard/Pages/40-location.qml:27
525528msgid "Location Services"
526−msgstr ""
529+msgstr "Služby určovania polohy"
527530
528531#: qml/Wizard/Pages/40-location.qml:83
529532msgid ""
530533"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
531534"(recommended)"
532535msgstr ""
536+"Používa GPS, Wifi hotspot a mobilný signál na anonymné zistenie polohy "
537+"(odporúčané)"
533538
534539#: qml/Wizard/Pages/40-location.qml:105
535540#, qt-format
536541msgid "By selecting this option you agree to the Nokia HERE %1."
537−msgstr ""
542+msgstr "Vybraním tejto možnosti súhlasíte s Nokia HERE %1."
538543
539544#: qml/Wizard/Pages/40-location.qml:106
540545msgctxt "part of: Nokia HERE terms and conditions"
541546msgid "terms and conditions"
542−msgstr ""
547+msgstr "podmienky"
543548
544549#: qml/Wizard/Pages/40-location.qml:160
545550msgid "GPS only"
546−msgstr ""
551+msgstr "Len GPS"
547552
548553#: qml/Wizard/Pages/40-location.qml:214
549554msgid "Don't use my location"
550−msgstr ""
555+msgstr "Nepoužívať moju polohu"
551556
552557#: qml/Wizard/Pages/40-location.qml:260
553558msgid "You can change it later in System Settings."
554−msgstr ""
559+msgstr "Môžete to zmeniť neskôr v Systémových nastaveniach."
555560
556561#: qml/Wizard/Pages/50-timezone.qml:29
557562msgid "Time Zone"
558−msgstr ""
563+msgstr "Časové pásmo"
559564
560565#: qml/Wizard/Pages/50-timezone.qml:178
561566msgid "Enter your city"
562−msgstr ""
567+msgstr "Zadajte svoje mesto"
563568
564569#: qml/Wizard/Pages/60-account.qml:24
565570msgid "Personalize Your Device"
566−msgstr ""
571+msgstr "Prispôsobte svoje zariadenie"
567572
568573#: qml/Wizard/Pages/60-account.qml:48
569574msgid "Preferred Name"
570−msgstr ""
575+msgstr "Preferované meno"
571576
572577#: qml/Wizard/Pages/70-passwd-type.qml:39
573578msgid "Lock Screen"
574−msgstr ""
579+msgstr "Uzamknutie obrazovky"
575580
576581#: qml/Wizard/Pages/70-passwd-type.qml:101
577582msgctxt "Label: Type of security method"
578583msgid "Create new password"
579−msgstr ""
584+msgstr "Vytvoriť nové heslo"
580585
581586#: qml/Wizard/Pages/70-passwd-type.qml:103
582587msgctxt "Label: Type of security method"
583588msgid "Create passcode (numbers only)"
584−msgstr ""
589+msgstr "Vytvoriť heslo (len čísla)"
585590
586591#: qml/Wizard/Pages/70-passwd-type.qml:105
587592msgctxt "Label: Type of security method"
588593msgid "No lock code"
589−msgstr ""
594+msgstr "Bez uzamykacieho kódu"
590595
591596#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
592597msgid "Privacy Policy"
593−msgstr ""
598+msgstr "Ochrana osobných údajov"
594599
595600#: qml/Wizard/Pages/75-report-check.qml:26
596601msgid "Help Us Improve"
597−msgstr ""
602+msgstr "Pomôžte nám vylepšiť"
598603
599604#: qml/Wizard/Pages/75-report-check.qml:59
600605msgid "Improve system performance by sending us crashes and error reports."
601−msgstr ""
606+msgstr "Zvýšiť výkon systému odosielaním pádov a chybových hlásení."
602607
603608#: qml/Wizard/Pages/75-report-check.qml:60
604609msgid "Privacy policy"
605−msgstr ""
610+msgstr "Ochrana osobných údajov"
606611
607612#: qml/Wizard/Pages/80-finished.qml:89
608613msgid "Welcome to Ubuntu"
609−msgstr ""
614+msgstr "Vitajte v Ubuntu"
610615
611616#: qml/Wizard/Pages/80-finished.qml:104
612617msgid "You are ready to use your device now"
613−msgstr ""
618+msgstr "Ste pripravený používať vaše zariadenie"
614619
615620#: qml/Wizard/Pages/80-finished.qml:124
616621msgid "Get Started"
617−msgstr ""
622+msgstr "Začať"
618623
619624#: qml/Wizard/Pages/here-terms.qml:25
620625msgid "Terms & Conditions"
@@ -622,7 +627,7 @@ msgstr "Všeobecné obchodné podmienky"
622627
623628#: qml/Wizard/Pages/here-terms.qml:69
624629msgid "Your device uses positioning technologies provided by HERE."
625−msgstr ""
630+msgstr "Zariadenie používa lokalizačné technológie poskytované HERE."
626631
627632#: qml/Wizard/Pages/here-terms.qml:81
628633msgid ""
@@ -630,21 +635,26 @@ msgid ""
630635"collects information about nearby cell towers and Wi-Fi hotspots around your "
631636"current location whenever your position is being found."
632637msgstr ""
638+"Aby sme mohli poskytovať lokalizačné služby a zlepšovať ich kvalitu, HERE "
639+"zhromažďuje informácie o vysielačoch mobilných sietí a WiFi hotspotov v "
640+"okolí vašej aktuálnej polohy."
633641
634642#: qml/Wizard/Pages/here-terms.qml:93
635643msgid ""
636644"The information collected is used to analyze the service and to improve the "
637645"use of service, but not to identify you personally."
638646msgstr ""
647+"Zhromaždené informácie sa používajú na analýzu služieb a zlepšovanie "
648+"využívania služieb, nie na vašu osobnú identifikáciu."
639649
640650#: qml/Wizard/Pages/here-terms.qml:106
641651#, qt-format
642652msgid "By continuing, you agree to the HERE platform %1 and %2."
643−msgstr ""
653+msgstr "Pokračovaním súhlasíte s platformou HERE %1 a %2."
644654
645655#: qml/Wizard/Pages/here-terms.qml:107
646656msgid "Service Terms"
647−msgstr ""
657+msgstr "Servisné podmienky"
648658
649659#: qml/Wizard/Pages/passcode-confirm.qml:43
650660#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -653,105 +663,106 @@ msgstr "Potvrdiť heslo"
653663
654664#: qml/Wizard/Pages/passcode-confirm.qml:45
655665msgid "Incorrect passcode."
656−msgstr ""
666+msgstr "Nesprávne heslo."
657667
658668#: qml/Wizard/Pages/passcode-confirm.qml:45
659669msgctxt "Enter the passcode again"
660670msgid "Please re-enter."
661−msgstr ""
671+msgstr "Zadajte znova."
662672
663673#: qml/Wizard/Pages/passcode-desktop.qml:30
664674msgid "Lock Screen Passcode"
665−msgstr ""
675+msgstr "Heslo uzamykacej obrazovky"
666676
667677#: qml/Wizard/Pages/passcode-desktop.qml:56
668678msgid "Enter 4 numbers to setup your passcode"
669−msgstr ""
679+msgstr "Zadajte 4 čísla pre nastavenie hesla"
670680
671681#: qml/Wizard/Pages/passcode-desktop.qml:65
672682#: qml/Wizard/Pages/passcode-set.qml:54
673683msgid "Choose passcode"
674−msgstr ""
684+msgstr "Zvoliť heslo"
675685
676686#: qml/Wizard/Pages/passcode-desktop.qml:105
677687msgid "Passcode too short"
678−msgstr ""
688+msgstr "Heslo príliš krátke"
679689
680690#: qml/Wizard/Pages/passcode-desktop.qml:107
681691msgid "Passcodes match"
682−msgstr ""
692+msgstr "Zhoda hesiel"
683693
684694#: qml/Wizard/Pages/passcode-desktop.qml:109
685695msgid "Passcodes do not match"
686−msgstr ""
696+msgstr "Heslá sa nezhodujú"
687697
688698#: qml/Wizard/Pages/passcode-set.qml:62
689699msgid "Passcode must be 4 characters long"
690−msgstr ""
700+msgstr "Heslo musí mať 4 znaky"
691701
692702#: qml/Wizard/Pages/password-set.qml:30
693703msgid "Lock Screen Password"
694−msgstr ""
704+msgstr "Heslo uzamykacej obrazovky"
695705
696706#: qml/Wizard/Pages/password-set.qml:61
697707msgid "Enter at least 8 characters"
698−msgstr ""
708+msgstr "Zadajte najmenej 8 znakov"
699709
700710#: qml/Wizard/Pages/password-set.qml:73
701711msgid "Choose password"
702−msgstr ""
712+msgstr "Zvoliť heslo"
703713
704714#: qml/Wizard/Pages/password-set.qml:103
705715msgid "Confirm password"
706−msgstr ""
716+msgstr "Potvrdiť heslo"
707717
708718#: qml/Wizard/Pages/sim.qml:27
709719msgid "No SIM card installed"
710−msgstr ""
720+msgstr "Žiadna SIM karta nainštalovaná"
711721
712722#: qml/Wizard/Pages/sim.qml:54
713723msgid "SIM card added"
714−msgstr ""
724+msgstr "Vložená SIM karta"
715725
716726#: qml/Wizard/Pages/sim.qml:55
717727msgid "You must restart the device to access the mobile network."
718−msgstr ""
728+msgstr "Musíte reštartovať zariadenie pre prístup k mobilnej sieti."
719729
720730#: qml/Wizard/Pages/sim.qml:59
721731msgid "Restart"
722−msgstr ""
732+msgstr "Reštart"
723733
724734#: qml/Wizard/Pages/sim.qml:78
725735msgid "You won’t be able to make calls or use text messaging without a SIM."
726736msgstr ""
737+"Bez SIM karty nebudete môcť telefonovať alebo používať textové správy."
727738
728739#: qml/Wizard/Pages/sim.qml:90
729740msgid "To proceed with no SIM tap Skip."
730−msgstr ""
741+msgstr "Pre pokračovanie bez SIM karty stlačte Preskočiť."
731742
732743#: qml/Wizard/PasswordMeter.qml:87
733744msgid "Passwords match"
734−msgstr ""
745+msgstr "Heslá sa zhodujú"
735746
736747#: qml/Wizard/PasswordMeter.qml:89
737748msgid "Passwords do not match"
738−msgstr ""
749+msgstr "Heslá sa nezhodujú"
739750
740751#: qml/Wizard/PasswordMeter.qml:93
741752msgid "Strong password"
742−msgstr ""
753+msgstr "Heslo je silné"
743754
744755#: qml/Wizard/PasswordMeter.qml:95
745756msgid "Fair password"
746−msgstr ""
757+msgstr "Heslo je prijateľné"
747758
748759#: qml/Wizard/PasswordMeter.qml:97
749760msgid "Weak password"
750−msgstr ""
761+msgstr "Heslo je slabé"
751762
752763#: qml/Wizard/PasswordMeter.qml:99
753764msgid "Very weak password"
754−msgstr ""
765+msgstr "Heslo je veľmi slabé"
755766
756767#~ msgctxt "Title: Reboot/Shut down dialog"
757768#~ msgid "Shut down"
@@ -816,9 +827,6 @@ msgstr ""
816827#~ msgid "Hi!"
817828#~ msgstr "Ahoj!"
818829
819−#~ msgid "Welcome to your Ubuntu device."
820−#~ msgstr "Vitajte vo svojom Ubuntu zariadení."
821−
822830#~ msgid "Let’s get started."
823831#~ msgstr "Začíname."
824832
@@ -834,9 +842,6 @@ msgstr ""
834842#~ msgid "Lock security"
835843#~ msgstr "Bezpečnosť uzamknutia"
836844
837−#~ msgid "Please select how you’d like to unlock your device."
838−#~ msgstr "Prosím vyberte, ako by ste chceli odblokovať zariadenie."
839−
840845#~ msgctxt "Label: Type of security method"
841846#~ msgid "Swipe"
842847#~ msgstr "Potiahnuť"
@@ -915,9 +920,6 @@ msgstr ""
915920#~ msgid "Nice work!"
916921#~ msgstr "Dobrá práca!"
917922
918−#~ msgid "Your device is now ready to use."
919−#~ msgstr "Vaše zariadenie je teraz pripravené."
920−
921923#~ msgid "Finish"
922924#~ msgstr "Dokončiť"
923925
po/sv.po+1−1
@@ -15,7 +15,7 @@ msgstr ""
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-25 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-26 05:44+0000\n"
1919"X-Generator: Launchpad (build 17967)\n"
2020"Language: sv\n"
2121
qml/Components/Lockscreen.qml+2−2
@@ -253,10 +253,10 @@ Showable {
253253
254254 Component {
255255 id: infoPopupComponent
256− Dialog {
256+ ShellDialog {
257257 id: dialog
258258 objectName: "infoPopup"
259− modal: true
259+ property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
260260
261261 Button {
262262 objectName: "infoPopupOkButton"
qml/Greeter/Greeter.qml+1−1
@@ -61,7 +61,7 @@ Showable {
6161
6262 function forceShow() {
6363 showNow();
64− loader.item.reset();
64+ d.selectUser(d.currentIndex, true);
6565 }
6666
6767 function notifyAppFocused(appId) {
qml/Stages/DesktopStage.qml+3
@@ -36,6 +36,9 @@ AbstractStage {
3636 }
3737 }
3838
39+ // Used by TutorialRight
40+ property bool spreadShown: spread.state == "altTab"
41+
3942 mainApp: ApplicationManager.focusedApplicationId
4043 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
4144 : null
qml/Tutorial/TutorialRight.qml+2−1
@@ -47,11 +47,12 @@ TutorialPage {
4747 anchors.right: root.right
4848 anchors.rightMargin: units.gu(2)
4949 anchors.verticalCenter: root.verticalCenter
50+ rotation: usageScenario === "desktop" ? 180 : 0
5051 }
5152
5253 label {
5354 text: root.usageScenario === "desktop" ?
54− i18n.tr("Hover your mouse on the right edge to view your open apps") :
55+ i18n.tr("Push your mouse against the right edge to view your open apps") :
5556 i18n.tr("Short or long swipe from the right edge to view your open apps")
5657 anchors.right: arrow.left
5758 anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
tests/plugins/AccountsService/CMakeLists.txt+2−1
@@ -5,7 +5,7 @@ else()
55endif()
66macro(make_dbus_class NAME INTERFACE)
77 if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)
8− execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})
8+ execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -i types.h -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})
99 endif()
1010endmacro(make_dbus_class)
1111
@@ -20,6 +20,7 @@ make_dbus_class(UscInput com.canonical.Unity.Input)
2020
2121include_directories(
2222 ${CMAKE_CURRENT_BINARY_DIR}
23+ ${CMAKE_CURRENT_SOURCE_DIR}
2324 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
2425 )
2526
tests/plugins/AccountsService/PropertiesServer.cpp+36−7
@@ -25,9 +25,7 @@
2525#include <QDBusMessage>
2626#include <QDBusMetaType>
2727
28−using StringMap = QMap<QString,QString>;
29−using StringMapList = QList<StringMap>;
30−Q_DECLARE_METATYPE(StringMapList)
28+#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")
3129
3230PropertiesServer::PropertiesServer(QObject *parent)
3331 : QObject(parent)
@@ -62,6 +60,38 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co
6260{
6361 QVariant newValue = variant.variant();
6462
63+ if (interface == IFACE_ACCOUNTS_USER) {
64+ sendErrorReply(QDBusError::InvalidArgs, QStringLiteral("Property is not writable"));
65+ return;
66+ }
67+
68+ internalSet(interface, property, newValue);
69+}
70+
71+void PropertiesServer::SetBackgroundFile(const QString &backgroundFile)
72+{
73+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("BackgroundFile"), backgroundFile);
74+}
75+
76+void PropertiesServer::SetEmail(const QString &email)
77+{
78+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("Email"), email);
79+}
80+
81+void PropertiesServer::SetInputSources(const StringMapList &inputSources)
82+{
83+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("InputSources"), QVariant::fromValue(inputSources));
84+}
85+
86+void PropertiesServer::SetRealName(const QString &realName)
87+{
88+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("RealName"), realName);
89+}
90+
91+void PropertiesServer::internalSet(const QString &interface, const QString &property, const QVariant &variant)
92+{
93+ QVariant newValue = variant;
94+
6595 if (m_properties[interface].contains(property)) {
6696 QVariant& oldValue = m_properties[interface][property];
6797 if (oldValue != newValue) {
@@ -69,14 +99,12 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co
6999 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&
70100 property == QStringLiteral("LauncherItems")) {
71101 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));
72− } else if (interface == "org.freedesktop.Accounts.User" && property == "InputSources") {
73− newValue = QVariant::fromValue(qdbus_cast<StringMapList>(newValue.value<QDBusArgument>()));
74102 }
75103
76104 oldValue = newValue;
77105
78106 // Special case for user properties.
79− if (interface == "org.freedesktop.Accounts.User") {
107+ if (interface == IFACE_ACCOUNTS_USER) {
80108 Q_EMIT Changed();
81109 } else {
82110 QVariantMap propertyChanges;
@@ -108,6 +136,7 @@ void PropertiesServer::Reset()
108136 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;
109137 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
110138 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";
111− m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";
139+ m_properties["org.freedesktop.Accounts.User"]["Email"] = "";
112140 m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());
141+ m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";
113142}
tests/plugins/AccountsService/PropertiesServer.h+7
@@ -24,6 +24,7 @@
2424#include <QDBusVariant>
2525#include <QObject>
2626#include <QString>
27+#include "types.h"
2728
2829class PropertiesServer: public QObject, protected QDBusContext
2930{
@@ -36,6 +37,10 @@ public Q_SLOTS:
3637 QDBusVariant Get(const QString &interface, const QString &property) const;
3738 QVariantMap GetAll(const QString &interface) const;
3839 void Set(const QString &interface, const QString &property, const QDBusVariant &variant);
40+ void SetBackgroundFile(const QString &backgroundFile);
41+ void SetEmail(const QString &email);
42+ void SetInputSources(const StringMapList &inputSources);
43+ void SetRealName(const QString &realName);
3944
4045 // mock only.
4146 void Reset();
@@ -45,6 +50,8 @@ Q_SIGNALS:
4550 void Changed();
4651
4752private:
53+ void internalSet(const QString &interface, const QString &property, const QVariant &variant);
54+
4855 QHash<QString, QVariantMap> m_properties;
4956};
5057
tests/plugins/AccountsService/client.cpp+46−12
@@ -19,16 +19,13 @@
1919
2020#include "AccountsService.h"
2121#include "AccountsServiceDBusAdaptor.h"
22+#include "types.h"
2223#include <QSignalSpy>
2324#include <QTest>
2425#include <QDebug>
2526#include <QDBusReply>
2627#include <QDBusMetaType>
2728
28−using StringMap = QMap<QString,QString>;
29−using StringMapList = QList<StringMap>;
30−Q_DECLARE_METATYPE(StringMapList)
31−
3229template <class T>
3330QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
3431
@@ -263,10 +260,13 @@ private Q_SLOTS:
263260 AccountsService session(this, QTest::currentTestFunction());
264261
265262 QCOMPARE(session.backgroundFile(), QString());
266− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
267− "org.freedesktop.Accounts.User",
268− "BackgroundFile",
269− dbusVariant("/test/BackgroundFile")));
263+
264+ QDBusInterface accountsIface(m_userInterface->service(),
265+ m_userInterface->path(),
266+ "org.freedesktop.Accounts.User");
267+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetBackgroundFile",
268+ "/test/BackgroundFile"));
269+
270270 QTRY_COMPARE(session.backgroundFile(), QString("/test/BackgroundFile"));
271271 }
272272
@@ -311,6 +311,39 @@ private Q_SLOTS:
311311 QCOMPARE(arguments.at(0).toInt(), 0);
312312 }
313313
314+ void testSetRealName()
315+ {
316+ AccountsService session(this, QTest::currentTestFunction());
317+
318+ // Just confirm that we can't set normal way
319+ auto message = m_userInterface->call("Set",
320+ "org.freedesktop.Accounts.User",
321+ "RealName",
322+ dbusVariant("Stallman"));
323+ QCOMPARE(message.type(), QDBusMessage::ErrorMessage);
324+ QCOMPARE(message.errorName(), QStringLiteral("org.freedesktop.DBus.Error.InvalidArgs"));
325+
326+ message = m_userInterface->call("Get",
327+ "org.freedesktop.Accounts.User",
328+ "RealName");
329+ QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
330+ auto response = message.arguments().first().value<QDBusVariant>().variant().toString();
331+ QCOMPARE(response, QStringLiteral(""));
332+
333+ // Now try it via our AS wrapper and confirm it did get through, unlike above
334+ session.setRealName("Stallman");
335+
336+ QCOMPARE(session.realName(), QStringLiteral("Stallman"));
337+
338+ message = m_userInterface->call("Get",
339+ "org.freedesktop.Accounts.User",
340+ "RealName");
341+ QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
342+ response = message.arguments().first().value<QDBusVariant>().variant().toString();
343+ QCOMPARE(response, QStringLiteral("Stallman"));
344+
345+ }
346+
314347 void testAsynchronousChangeForKeymaps()
315348 {
316349 AccountsService session(this, QTest::currentTestFunction());
@@ -325,10 +358,11 @@ private Q_SLOTS:
325358 map2.insert("xkb", "fr");
326359 inputSources.append(map2);
327360
328− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
329− "org.freedesktop.Accounts.User",
330− "InputSources",
331− QVariant::fromValue(QDBusVariant(QVariant::fromValue(inputSources)))));
361+ QDBusInterface accountsIface(m_userInterface->service(),
362+ m_userInterface->path(),
363+ "org.freedesktop.Accounts.User");
364+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetInputSources",
365+ QVariant::fromValue(inputSources)));
332366 QStringList result = {"cz+qwerty", "fr"};
333367 QTRY_COMPARE(session.keymaps(), result);
334368 }
tests/plugins/AccountsService/interfaces.xml+13
@@ -42,6 +42,19 @@
4242 <interface name="com.ubuntu.location.providers.here.AccountsService" />
4343 <interface name="org.freedesktop.Accounts.User">
4444 <signal name="Changed" />
45+ <method name="SetBackgroundFile">
46+ <arg name="backgroundFile" type="s" direction="in" />
47+ </method>
48+ <method name="SetEmail">
49+ <arg name="email" type="s" direction="in" />
50+ </method>
51+ <method name="SetInputSources">
52+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="StringMapList"/>
53+ <arg name="inputSources" type="aa{ss}" direction="in" />
54+ </method>
55+ <method name="SetRealName">
56+ <arg name="realName" type="s" direction="in" />
57+ </method>
4558 </interface>
4659 <interface name="com.canonical.unity.AccountsService.Private" />
4760
tests/plugins/AccountsService/types.hnew file+25
@@ -0,0 +1,25 @@
1+/*
2+ * Copyright 2016 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * version 3 along with this program. If not, see
15+ * <http://www.gnu.org/licenses/>
16+ */
17+
18+#ifndef UNITY_ASMOCKTYPES_H
19+#define UNITY_ASMOCKTYPES_H
20+
21+using StringMap = QMap<QString,QString>;
22+using StringMapList = QList<StringMap>;
23+Q_DECLARE_METATYPE(StringMapList)
24+
25+#endif
tests/plugins/IntegratedLightDM/integrated.cpp+5−8
@@ -66,14 +66,11 @@ private Q_SLOTS:
6666 QCOMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
6767 QStringLiteral(""));
6868
69− // The real AccountsService doesn't let you set via dbus properties. You
70− // have to call SetRealName instead (so that they can protect the call
71− // via policykit). But our test server does let us.
72− QVariant wrapped = QVariant::fromValue(QDBusVariant(QStringLiteral("Test User")));
73− QDBusReply<void> reply = m_user->call(QStringLiteral("Set"),
74− QStringLiteral("org.freedesktop.Accounts.User"),
75− QStringLiteral("RealName"),
76− wrapped);
69+ QDBusInterface accountsIface(m_user->service(),
70+ m_user->path(),
71+ "org.freedesktop.Accounts.User");
72+ QDBusReply<void> reply = accountsIface.call(QStringLiteral("SetRealName"),
73+ QStringLiteral("Test User"));
7774 QVERIFY(reply.isValid());
7875
7976 QTRY_COMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
tests/qmltests/Greeter/tst_Greeter.qml+1
@@ -551,6 +551,7 @@ Item {
551551
552552 LightDM.Greeter.showGreeter();
553553 compare(viewResetSpy.count, 1);
554+ tryCompare(viewShowPromptSpy, "count", 1);
554555 }
555556 }
556557}
tests/qmltests/Greeter/tst_NarrowView.qml+3−1
@@ -27,6 +27,8 @@ Item {
2727 width: units.gu(90)
2828 height: units.gu(80)
2929
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
3032 Row {
3133 anchors.fill: parent
3234 Loader {
@@ -61,7 +63,7 @@ Item {
6163
6264 Rectangle {
6365 id: controls
64− color: "white"
66+ color: theme.palette.normal.background
6567 width: units.gu(40)
6668 height: parent.height
6769
tests/qmltests/Tutorial/tst_Tutorial.qml+17−1
@@ -408,7 +408,7 @@ Rectangle {
408408 ApplicationManager.startApplication("gallery-app");
409409
410410 var launcher = findChild(shell, "launcher");
411− var tutorialLeft = findChild(shell, "tutorialLeft");
411+ var tutorialLeft = findChild(shell, "tutorialLeftLoader");
412412 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
413413
414414 tryCompare(tutorialLeft, "shown", false);
@@ -764,6 +764,22 @@ Rectangle {
764764 tryCompare(tutorialRightLoader, "shown", true);
765765 }
766766
767+ function test_desktopTutorialRightFinish() {
768+ loadShell("desktop");
769+
770+ var tutorialRight = findChild(shell, "tutorialRight");
771+ ApplicationManager.startApplication("dialer-app");
772+ ApplicationManager.startApplication("camera-app");
773+ tryCompare(tutorialRight, "shown", true);
774+
775+ var stage = findChild(shell, "stage");
776+ mouseMove(shell, shell.width, shell.height / 2);
777+ stage.pushRightEdge(units.gu(8));
778+ tryCompare(tutorialRight, "shown", false);
779+
780+ tryCompare(AccountsService, "demoEdges", false);
781+ }
782+
767783 function test_oskDoesNotHideTutorial() {
768784 var tutorialLeft = findChild(shell, "tutorialLeft");
769785 verify(tutorialLeft.shown);
tests/qmltests/tst_Shell.qml+3−1
@@ -1140,7 +1140,9 @@ Rectangle {
11401140
11411141 showGreeter();
11421142
1143− tryCompare(sessionSpy, "count", 1);
1143+ var greeter = findChild(shell, "greeter");
1144+ verify(!greeter.locked);
1145+ verify(sessionSpy.count > 0);
11441146 }
11451147
11461148 function test_fullscreen() {