git.iko.soy/unity8
on xenial help sign in
merge trunk
bc6930dLukáš Tinkl
debian/changelog+20
compare with xenial
unifiedsplit
@@ -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+
1unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
21unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
2
22
3 [ Michael Terry ]
23 [ Michael Terry ]
plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+12−2
@@ -57,8 +57,18 @@ QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString
57{
57{
58 QDBusInterface *iface = getUserInterface(user);
58 QDBusInterface *iface = getUserInterface(user);
59 if (iface != nullptr && iface->isValid()) {
59 if (iface != nullptr && iface->isValid()) {
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 {
60− // The value needs to be carefully wrapped
69+ // The value needs to be carefully wrapped
61− return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));
70+ return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));
71+ }
62 }
72 }
63 return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));
73 return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));
64}
74}
po/en_AU.po+82−73
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"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"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-28 05:45+0000\n"
19−"X-Generator: Launchpad (build 17958)\n"
19+"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -139,7 +139,7 @@ msgstr "Apps may have unsaved data:"
139msgctxt ""
139msgctxt ""
140"Re-dock means connect the device again to an external screen/mouse/keyboard"
140"Re-dock means connect the device again to an external screen/mouse/keyboard"
141msgid "Re-dock, save your work and close these apps to continue."
141msgid "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."
143
143
144#: qml/Components/ModeSwitchWarningDialog.qml:63
144#: qml/Components/ModeSwitchWarningDialog.qml:63
145msgid "Or force close now (unsaved data will be lost)."
145msgid "Or force close now (unsaved data will be lost)."
@@ -182,11 +182,11 @@ msgstr "Add to Favourites"
182
182
183#: qml/Dash/FiltersPopover.qml:60
183#: qml/Dash/FiltersPopover.qml:60
184msgid "Refine your results"
184msgid "Refine your results"
185−msgstr ""
185+msgstr "Refine your results"
186
186
187#: qml/Dash/FiltersPopover.qml:69
187#: qml/Dash/FiltersPopover.qml:69
188msgid "Reset"
188msgid "Reset"
189−msgstr ""
189+msgstr "Reset"
190
190
191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
192msgid "See less"
192msgid "See less"
@@ -203,11 +203,11 @@ msgstr "Search"
203
203
204#: qml/Dash/PageHeaderExtraPanel.qml:55
204#: qml/Dash/PageHeaderExtraPanel.qml:55
205msgid "Recent Searches"
205msgid "Recent Searches"
206−msgstr ""
206+msgstr "Recent Searches"
207
207
208#: qml/Dash/PageHeaderExtraPanel.qml:66
208#: qml/Dash/PageHeaderExtraPanel.qml:66
209msgid "Clear All"
209msgid "Clear All"
210−msgstr ""
210+msgstr "Clear All"
211
211
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
213msgid "More..."
@@ -263,6 +263,8 @@ msgid ""
263"Your device is now connected to an external display. Use this screen as a "
263"Your device is now connected to an external display. Use this screen as a "
264"touch pad to interact with the pointer."
264"touch pad to interact with the pointer."
265msgstr ""
265msgstr ""
266+"Your device is now connected to an external display. Use this screen as a "
267+"touch pad to interact with the pointer."
266
268
267#: qml/Greeter/CoverPage.qml:118
269#: qml/Greeter/CoverPage.qml:118
268msgid "Unlock"
270msgid "Unlock"
@@ -424,51 +426,51 @@ msgstr "Call back"
424
426
425#: qml/Stages/SideStage.qml:76
427#: qml/Stages/SideStage.qml:76
426msgid "Drag using 3 fingers any application from one window to the other"
428msgid "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"
428
430
429#: qml/Tutorial/TutorialBottom.qml:78
431#: qml/Tutorial/TutorialBottom.qml:78
430msgid "Swipe up to add a contact"
432msgid "Swipe up to add a contact"
431−msgstr ""
433+msgstr "Swipe up to add a contact"
432
434
433#: qml/Tutorial/TutorialBottom.qml:80
435#: qml/Tutorial/TutorialBottom.qml:80
434msgid "Swipe up for favorite calculations"
436msgid "Swipe up for favorite calculations"
435−msgstr ""
437+msgstr "Swipe up for favourite calculations"
436
438
437#: qml/Tutorial/TutorialBottom.qml:82
439#: qml/Tutorial/TutorialBottom.qml:82
438msgid "Swipe up for recent calls"
440msgid "Swipe up for recent calls"
439−msgstr ""
441+msgstr "Swipe up for recent calls"
440
442
441#: qml/Tutorial/TutorialBottom.qml:84
443#: qml/Tutorial/TutorialBottom.qml:84
442msgid "Swipe up to create a message"
444msgid "Swipe up to create a message"
443−msgstr ""
445+msgstr "Swipe up to create a message"
444
446
445#: qml/Tutorial/TutorialBottom.qml:85
447#: qml/Tutorial/TutorialBottom.qml:85
446msgid "Swipe up to manage the app"
448msgid "Swipe up to manage the app"
447−msgstr ""
449+msgstr "Swipe up to manage the app"
448
450
449#: qml/Tutorial/TutorialLeft.qml:47
451#: qml/Tutorial/TutorialLeft.qml:47
450msgid "Swipe from the left edge to open the launcher"
452msgid "Swipe from the left edge to open the launcher"
451−msgstr ""
453+msgstr "Swipe from the left edge to open the launcher"
452
454
453#: qml/Tutorial/TutorialLeftLong.qml:47
455#: qml/Tutorial/TutorialLeftLong.qml:47
454msgid "Long swipe from the left edge to open the Today scope"
456msgid "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"
456
458
457#: qml/Tutorial/TutorialRight.qml:54
459#: qml/Tutorial/TutorialRight.qml:54
458msgid "Hover your mouse on the right edge to view your open apps"
460msgid "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"
460
462
461#: qml/Tutorial/TutorialRight.qml:55
463#: qml/Tutorial/TutorialRight.qml:55
462msgid "Short or long swipe from the right edge to view your open apps"
464msgid "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"
464
466
465#: qml/Tutorial/TutorialTop.qml:53
467#: qml/Tutorial/TutorialTop.qml:53
466msgid "Swipe from the top right edge to open the notification bar"
468msgid "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"
468
470
469#: qml/Tutorial/TutorialTop.qml:54
471#: qml/Tutorial/TutorialTop.qml:54
470msgid "Swipe from the top edge to open the notification bar"
472msgid "Swipe from the top edge to open the notification bar"
471−msgstr ""
473+msgstr "Swipe from the top edge to open the notification bar"
472
474
473#: qml/Wizard/Page.qml:54
475#: qml/Wizard/Page.qml:54
474msgctxt "Button: Go back one page in the Wizard"
476msgctxt "Button: Go back one page in the Wizard"
@@ -477,7 +479,7 @@ msgstr "Back"
477
479
478#: qml/Wizard/Pages/10-welcome.qml:27
480#: qml/Wizard/Pages/10-welcome.qml:27
479msgid "Language"
481msgid "Language"
480−msgstr ""
482+msgstr "Language"
481
483
482#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
483#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -486,7 +488,7 @@ msgstr ""
486#: qml/Wizard/Pages/passcode-desktop.qml:124
488#: qml/Wizard/Pages/passcode-desktop.qml:124
487#: qml/Wizard/Pages/password-set.qml:141
489#: qml/Wizard/Pages/password-set.qml:141
488msgid "Next"
490msgid "Next"
489−msgstr ""
491+msgstr "Next"
490
492
491#: qml/Wizard/Pages/30-wifi.qml:29
493#: qml/Wizard/Pages/30-wifi.qml:29
492msgid "Connect to Wi‑Fi"
494msgid "Connect to Wi‑Fi"
@@ -494,15 +496,15 @@ msgstr "Connect to Wi‑Fi"
494
496
495#: qml/Wizard/Pages/30-wifi.qml:130
497#: qml/Wizard/Pages/30-wifi.qml:130
496msgid "Connected"
498msgid "Connected"
497−msgstr ""
499+msgstr "Connected"
498
500
499#: qml/Wizard/Pages/30-wifi.qml:163
501#: qml/Wizard/Pages/30-wifi.qml:163
500msgid "Available Wi-Fi networks"
502msgid "Available Wi-Fi networks"
501−msgstr ""
503+msgstr "Available Wi-Fi networks"
502
504
503#: qml/Wizard/Pages/30-wifi.qml:164
505#: qml/Wizard/Pages/30-wifi.qml:164
504msgid "No available Wi-Fi networks"
506msgid "No available Wi-Fi networks"
505−msgstr ""
507+msgstr "No available Wi-Fi networks"
506
508
507#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
508#: qml/Wizard/Pages/sim.qml:101
510#: qml/Wizard/Pages/sim.qml:101
@@ -511,98 +513,100 @@ msgstr "Skip"
511
513
512#: qml/Wizard/Pages/40-location.qml:27
514#: qml/Wizard/Pages/40-location.qml:27
513msgid "Location Services"
515msgid "Location Services"
514−msgstr ""
516+msgstr "Location Services"
515
517
516#: qml/Wizard/Pages/40-location.qml:83
518#: qml/Wizard/Pages/40-location.qml:83
517msgid ""
519msgid ""
518"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
519"(recommended)"
521"(recommended)"
520msgstr ""
522msgstr ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
521
525
522#: qml/Wizard/Pages/40-location.qml:105
526#: qml/Wizard/Pages/40-location.qml:105
523#, qt-format
527#, qt-format
524msgid "By selecting this option you agree to the Nokia HERE %1."
528msgid "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."
526
530
527#: qml/Wizard/Pages/40-location.qml:106
531#: qml/Wizard/Pages/40-location.qml:106
528msgctxt "part of: Nokia HERE terms and conditions"
532msgctxt "part of: Nokia HERE terms and conditions"
529msgid "terms and conditions"
533msgid "terms and conditions"
530−msgstr ""
534+msgstr "terms and conditions"
531
535
532#: qml/Wizard/Pages/40-location.qml:160
536#: qml/Wizard/Pages/40-location.qml:160
533msgid "GPS only"
537msgid "GPS only"
534−msgstr ""
538+msgstr "GPS only"
535
539
536#: qml/Wizard/Pages/40-location.qml:214
540#: qml/Wizard/Pages/40-location.qml:214
537msgid "Don't use my location"
541msgid "Don't use my location"
538−msgstr ""
542+msgstr "Don't use my location"
539
543
540#: qml/Wizard/Pages/40-location.qml:260
544#: qml/Wizard/Pages/40-location.qml:260
541msgid "You can change it later in System Settings."
545msgid "You can change it later in System Settings."
542−msgstr ""
546+msgstr "You can change it later in System Settings."
543
547
544#: qml/Wizard/Pages/50-timezone.qml:29
548#: qml/Wizard/Pages/50-timezone.qml:29
545msgid "Time Zone"
549msgid "Time Zone"
546−msgstr ""
550+msgstr "Time Zone"
547
551
548#: qml/Wizard/Pages/50-timezone.qml:178
552#: qml/Wizard/Pages/50-timezone.qml:178
549msgid "Enter your city"
553msgid "Enter your city"
550−msgstr ""
554+msgstr "Enter your city"
551
555
552#: qml/Wizard/Pages/60-account.qml:24
556#: qml/Wizard/Pages/60-account.qml:24
553msgid "Personalize Your Device"
557msgid "Personalize Your Device"
554−msgstr ""
558+msgstr "Personalise Your Device"
555
559
556#: qml/Wizard/Pages/60-account.qml:48
560#: qml/Wizard/Pages/60-account.qml:48
557msgid "Preferred Name"
561msgid "Preferred Name"
558−msgstr ""
562+msgstr "Preferred Name"
559
563
560#: qml/Wizard/Pages/70-passwd-type.qml:39
564#: qml/Wizard/Pages/70-passwd-type.qml:39
561msgid "Lock Screen"
565msgid "Lock Screen"
562−msgstr ""
566+msgstr "Lock Screen"
563
567
564#: qml/Wizard/Pages/70-passwd-type.qml:101
568#: qml/Wizard/Pages/70-passwd-type.qml:101
565msgctxt "Label: Type of security method"
569msgctxt "Label: Type of security method"
566msgid "Create new password"
570msgid "Create new password"
567−msgstr ""
571+msgstr "Create new password"
568
572
569#: qml/Wizard/Pages/70-passwd-type.qml:103
573#: qml/Wizard/Pages/70-passwd-type.qml:103
570msgctxt "Label: Type of security method"
574msgctxt "Label: Type of security method"
571msgid "Create passcode (numbers only)"
575msgid "Create passcode (numbers only)"
572−msgstr ""
576+msgstr "Create passcode (numbers only)"
573
577
574#: qml/Wizard/Pages/70-passwd-type.qml:105
578#: qml/Wizard/Pages/70-passwd-type.qml:105
575msgctxt "Label: Type of security method"
579msgctxt "Label: Type of security method"
576msgid "No lock code"
580msgid "No lock code"
577−msgstr ""
581+msgstr "No lock code"
578
582
579#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
583#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
580msgid "Privacy Policy"
584msgid "Privacy Policy"
581−msgstr ""
585+msgstr "Privacy Policy"
582
586
583#: qml/Wizard/Pages/75-report-check.qml:26
587#: qml/Wizard/Pages/75-report-check.qml:26
584msgid "Help Us Improve"
588msgid "Help Us Improve"
585−msgstr ""
589+msgstr "Help Us Improve"
586
590
587#: qml/Wizard/Pages/75-report-check.qml:59
591#: qml/Wizard/Pages/75-report-check.qml:59
588msgid "Improve system performance by sending us crashes and error reports."
592msgid "Improve system performance by sending us crashes and error reports."
589−msgstr ""
593+msgstr "Improve system performance by sending us crashes and error reports."
590
594
591#: qml/Wizard/Pages/75-report-check.qml:60
595#: qml/Wizard/Pages/75-report-check.qml:60
592msgid "Privacy policy"
596msgid "Privacy policy"
593−msgstr ""
597+msgstr "Privacy policy"
594
598
595#: qml/Wizard/Pages/80-finished.qml:89
599#: qml/Wizard/Pages/80-finished.qml:89
596msgid "Welcome to Ubuntu"
600msgid "Welcome to Ubuntu"
597−msgstr ""
601+msgstr "Welcome to Ubuntu"
598
602
599#: qml/Wizard/Pages/80-finished.qml:104
603#: qml/Wizard/Pages/80-finished.qml:104
600msgid "You are ready to use your device now"
604msgid "You are ready to use your device now"
601−msgstr ""
605+msgstr "You are ready to use your device now"
602
606
603#: qml/Wizard/Pages/80-finished.qml:124
607#: qml/Wizard/Pages/80-finished.qml:124
604msgid "Get Started"
608msgid "Get Started"
605−msgstr ""
609+msgstr "Get Started"
606
610
607#: qml/Wizard/Pages/here-terms.qml:25
611#: qml/Wizard/Pages/here-terms.qml:25
608msgid "Terms & Conditions"
612msgid "Terms & Conditions"
@@ -610,7 +614,7 @@ msgstr "Terms & Conditions"
610
614
611#: qml/Wizard/Pages/here-terms.qml:69
615#: qml/Wizard/Pages/here-terms.qml:69
612msgid "Your device uses positioning technologies provided by HERE."
616msgid "Your device uses positioning technologies provided by HERE."
613−msgstr ""
617+msgstr "Your device uses positioning technologies provided by HERE."
614
618
615#: qml/Wizard/Pages/here-terms.qml:81
619#: qml/Wizard/Pages/here-terms.qml:81
616msgid ""
620msgid ""
@@ -618,21 +622,26 @@ msgid ""
618"collects information about nearby cell towers and Wi-Fi hotspots around your "
622"collects information about nearby cell towers and Wi-Fi hotspots around your "
619"current location whenever your position is being found."
623"current location whenever your position is being found."
620msgstr ""
624msgstr ""
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."
621
628
622#: qml/Wizard/Pages/here-terms.qml:93
629#: qml/Wizard/Pages/here-terms.qml:93
623msgid ""
630msgid ""
624"The information collected is used to analyze the service and to improve the "
631"The information collected is used to analyze the service and to improve the "
625"use of service, but not to identify you personally."
632"use of service, but not to identify you personally."
626msgstr ""
633msgstr ""
634+"The information collected is used to analyse the service and to improve the "
635+"use of service, but not to identify you personally."
627
636
628#: qml/Wizard/Pages/here-terms.qml:106
637#: qml/Wizard/Pages/here-terms.qml:106
629#, qt-format
638#, qt-format
630msgid "By continuing, you agree to the HERE platform %1 and %2."
639msgid "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."
632
641
633#: qml/Wizard/Pages/here-terms.qml:107
642#: qml/Wizard/Pages/here-terms.qml:107
634msgid "Service Terms"
643msgid "Service Terms"
635−msgstr ""
644+msgstr "Service Terms"
636
645
637#: qml/Wizard/Pages/passcode-confirm.qml:43
646#: qml/Wizard/Pages/passcode-confirm.qml:43
638#: qml/Wizard/Pages/passcode-desktop.qml:80
647#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -641,69 +650,69 @@ msgstr "Confirm passcode"
641
650
642#: qml/Wizard/Pages/passcode-confirm.qml:45
651#: qml/Wizard/Pages/passcode-confirm.qml:45
643msgid "Incorrect passcode."
652msgid "Incorrect passcode."
644−msgstr ""
653+msgstr "Incorrect passcode."
645
654
646#: qml/Wizard/Pages/passcode-confirm.qml:45
655#: qml/Wizard/Pages/passcode-confirm.qml:45
647msgctxt "Enter the passcode again"
656msgctxt "Enter the passcode again"
648msgid "Please re-enter."
657msgid "Please re-enter."
649−msgstr ""
658+msgstr "Please re-enter."
650
659
651#: qml/Wizard/Pages/passcode-desktop.qml:30
660#: qml/Wizard/Pages/passcode-desktop.qml:30
652msgid "Lock Screen Passcode"
661msgid "Lock Screen Passcode"
653−msgstr ""
662+msgstr "Lock Screen Passcode"
654
663
655#: qml/Wizard/Pages/passcode-desktop.qml:56
664#: qml/Wizard/Pages/passcode-desktop.qml:56
656msgid "Enter 4 numbers to setup your passcode"
665msgid "Enter 4 numbers to setup your passcode"
657−msgstr ""
666+msgstr "Enter 4 numbers to setup your passcode"
658
667
659#: qml/Wizard/Pages/passcode-desktop.qml:65
668#: qml/Wizard/Pages/passcode-desktop.qml:65
660#: qml/Wizard/Pages/passcode-set.qml:54
669#: qml/Wizard/Pages/passcode-set.qml:54
661msgid "Choose passcode"
670msgid "Choose passcode"
662−msgstr ""
671+msgstr "Choose passcode"
663
672
664#: qml/Wizard/Pages/passcode-desktop.qml:105
673#: qml/Wizard/Pages/passcode-desktop.qml:105
665msgid "Passcode too short"
674msgid "Passcode too short"
666−msgstr ""
675+msgstr "Passcode too short"
667
676
668#: qml/Wizard/Pages/passcode-desktop.qml:107
677#: qml/Wizard/Pages/passcode-desktop.qml:107
669msgid "Passcodes match"
678msgid "Passcodes match"
670−msgstr ""
679+msgstr "Passcodes match"
671
680
672#: qml/Wizard/Pages/passcode-desktop.qml:109
681#: qml/Wizard/Pages/passcode-desktop.qml:109
673msgid "Passcodes do not match"
682msgid "Passcodes do not match"
674−msgstr ""
683+msgstr "Passcodes do not match"
675
684
676#: qml/Wizard/Pages/passcode-set.qml:62
685#: qml/Wizard/Pages/passcode-set.qml:62
677msgid "Passcode must be 4 characters long"
686msgid "Passcode must be 4 characters long"
678−msgstr ""
687+msgstr "Passcode must be 4 characters long"
679
688
680#: qml/Wizard/Pages/password-set.qml:30
689#: qml/Wizard/Pages/password-set.qml:30
681msgid "Lock Screen Password"
690msgid "Lock Screen Password"
682−msgstr ""
691+msgstr "Lock Screen Password"
683
692
684#: qml/Wizard/Pages/password-set.qml:61
693#: qml/Wizard/Pages/password-set.qml:61
685msgid "Enter at least 8 characters"
694msgid "Enter at least 8 characters"
686−msgstr ""
695+msgstr "Enter at least 8 characters"
687
696
688#: qml/Wizard/Pages/password-set.qml:73
697#: qml/Wizard/Pages/password-set.qml:73
689msgid "Choose password"
698msgid "Choose password"
690−msgstr ""
699+msgstr "Choose password"
691
700
692#: qml/Wizard/Pages/password-set.qml:103
701#: qml/Wizard/Pages/password-set.qml:103
693msgid "Confirm password"
702msgid "Confirm password"
694−msgstr ""
703+msgstr "Confirm password"
695
704
696#: qml/Wizard/Pages/sim.qml:27
705#: qml/Wizard/Pages/sim.qml:27
697msgid "No SIM card installed"
706msgid "No SIM card installed"
698−msgstr ""
707+msgstr "No SIM card installed"
699
708
700#: qml/Wizard/Pages/sim.qml:54
709#: qml/Wizard/Pages/sim.qml:54
701msgid "SIM card added"
710msgid "SIM card added"
702−msgstr ""
711+msgstr "SIM card added"
703
712
704#: qml/Wizard/Pages/sim.qml:55
713#: qml/Wizard/Pages/sim.qml:55
705msgid "You must restart the device to access the mobile network."
714msgid "You must restart the device to access the mobile network."
706−msgstr ""
715+msgstr "You must restart the device to access the mobile network."
707
716
708#: qml/Wizard/Pages/sim.qml:59
717#: qml/Wizard/Pages/sim.qml:59
709msgid "Restart"
718msgid "Restart"
@@ -711,35 +720,35 @@ msgstr "Restart"
711
720
712#: qml/Wizard/Pages/sim.qml:78
721#: qml/Wizard/Pages/sim.qml:78
713msgid "You won’t be able to make calls or use text messaging without a SIM."
722msgid "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."
715
724
716#: qml/Wizard/Pages/sim.qml:90
725#: qml/Wizard/Pages/sim.qml:90
717msgid "To proceed with no SIM tap Skip."
726msgid "To proceed with no SIM tap Skip."
718−msgstr ""
727+msgstr "To proceed with no SIM tap Skip."
719
728
720#: qml/Wizard/PasswordMeter.qml:87
729#: qml/Wizard/PasswordMeter.qml:87
721msgid "Passwords match"
730msgid "Passwords match"
722−msgstr ""
731+msgstr "Passwords match"
723
732
724#: qml/Wizard/PasswordMeter.qml:89
733#: qml/Wizard/PasswordMeter.qml:89
725msgid "Passwords do not match"
734msgid "Passwords do not match"
726−msgstr ""
735+msgstr "Passwords do not match"
727
736
728#: qml/Wizard/PasswordMeter.qml:93
737#: qml/Wizard/PasswordMeter.qml:93
729msgid "Strong password"
738msgid "Strong password"
730−msgstr ""
739+msgstr "Strong password"
731
740
732#: qml/Wizard/PasswordMeter.qml:95
741#: qml/Wizard/PasswordMeter.qml:95
733msgid "Fair password"
742msgid "Fair password"
734−msgstr ""
743+msgstr "Fair password"
735
744
736#: qml/Wizard/PasswordMeter.qml:97
745#: qml/Wizard/PasswordMeter.qml:97
737msgid "Weak password"
746msgid "Weak password"
738−msgstr ""
747+msgstr "Weak password"
739
748
740#: qml/Wizard/PasswordMeter.qml:99
749#: qml/Wizard/PasswordMeter.qml:99
741msgid "Very weak password"
750msgid "Very weak password"
742−msgstr ""
751+msgstr "Very weak password"
743
752
744#~ msgid "Confirm"
753#~ msgid "Confirm"
745#~ msgstr "Confirm"
754#~ msgstr "Confirm"
po/en_GB.po+80−82
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2015-04-23 12:59+0000\n"
11+"PO-Revision-Date: 2016-03-30 11:54+0000\n"
12−"Last-Translator: Andi Chandler <Unknown>\n"
12+"Last-Translator: James Tait <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-31 05:49+0000\n"
19−"X-Generator: Launchpad (build 17958)\n"
19+"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -182,11 +182,11 @@ msgstr "Add to Favourites"
182
182
183#: qml/Dash/FiltersPopover.qml:60
183#: qml/Dash/FiltersPopover.qml:60
184msgid "Refine your results"
184msgid "Refine your results"
185−msgstr ""
185+msgstr "Refine your results"
186
186
187#: qml/Dash/FiltersPopover.qml:69
187#: qml/Dash/FiltersPopover.qml:69
188msgid "Reset"
188msgid "Reset"
189−msgstr ""
189+msgstr "Reset"
190
190
191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
191#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
192msgid "See less"
192msgid "See less"
@@ -203,11 +203,11 @@ msgstr "Search"
203
203
204#: qml/Dash/PageHeaderExtraPanel.qml:55
204#: qml/Dash/PageHeaderExtraPanel.qml:55
205msgid "Recent Searches"
205msgid "Recent Searches"
206−msgstr ""
206+msgstr "Recent Searches"
207
207
208#: qml/Dash/PageHeaderExtraPanel.qml:66
208#: qml/Dash/PageHeaderExtraPanel.qml:66
209msgid "Clear All"
209msgid "Clear All"
210−msgstr ""
210+msgstr "Clear All"
211
211
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
213msgid "More..."
@@ -426,51 +426,51 @@ msgstr "Call back"
426
426
427#: qml/Stages/SideStage.qml:76
427#: qml/Stages/SideStage.qml:76
428msgid "Drag using 3 fingers any application from one window to the other"
428msgid "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"
430
430
431#: qml/Tutorial/TutorialBottom.qml:78
431#: qml/Tutorial/TutorialBottom.qml:78
432msgid "Swipe up to add a contact"
432msgid "Swipe up to add a contact"
433−msgstr ""
433+msgstr "Swipe up to add a contact"
434
434
435#: qml/Tutorial/TutorialBottom.qml:80
435#: qml/Tutorial/TutorialBottom.qml:80
436msgid "Swipe up for favorite calculations"
436msgid "Swipe up for favorite calculations"
437−msgstr ""
437+msgstr "Swipe up for favourite calculations"
438
438
439#: qml/Tutorial/TutorialBottom.qml:82
439#: qml/Tutorial/TutorialBottom.qml:82
440msgid "Swipe up for recent calls"
440msgid "Swipe up for recent calls"
441−msgstr ""
441+msgstr "Swipe up for recent calls"
442
442
443#: qml/Tutorial/TutorialBottom.qml:84
443#: qml/Tutorial/TutorialBottom.qml:84
444msgid "Swipe up to create a message"
444msgid "Swipe up to create a message"
445−msgstr ""
445+msgstr "Swipe up to create a message"
446
446
447#: qml/Tutorial/TutorialBottom.qml:85
447#: qml/Tutorial/TutorialBottom.qml:85
448msgid "Swipe up to manage the app"
448msgid "Swipe up to manage the app"
449−msgstr ""
449+msgstr "Swipe up to manage the app"
450
450
451#: qml/Tutorial/TutorialLeft.qml:47
451#: qml/Tutorial/TutorialLeft.qml:47
452msgid "Swipe from the left edge to open the launcher"
452msgid "Swipe from the left edge to open the launcher"
453−msgstr ""
453+msgstr "Swipe from the left edge to open the launcher"
454
454
455#: qml/Tutorial/TutorialLeftLong.qml:47
455#: qml/Tutorial/TutorialLeftLong.qml:47
456msgid "Long swipe from the left edge to open the Today scope"
456msgid "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"
458
458
459#: qml/Tutorial/TutorialRight.qml:54
459#: qml/Tutorial/TutorialRight.qml:54
460msgid "Hover your mouse on the right edge to view your open apps"
460msgid "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"
462
462
463#: qml/Tutorial/TutorialRight.qml:55
463#: qml/Tutorial/TutorialRight.qml:55
464msgid "Short or long swipe from the right edge to view your open apps"
464msgid "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"
466
466
467#: qml/Tutorial/TutorialTop.qml:53
467#: qml/Tutorial/TutorialTop.qml:53
468msgid "Swipe from the top right edge to open the notification bar"
468msgid "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"
470
470
471#: qml/Tutorial/TutorialTop.qml:54
471#: qml/Tutorial/TutorialTop.qml:54
472msgid "Swipe from the top edge to open the notification bar"
472msgid "Swipe from the top edge to open the notification bar"
473−msgstr ""
473+msgstr "Swipe from the top edge to open the notification bar"
474
474
475#: qml/Wizard/Page.qml:54
475#: qml/Wizard/Page.qml:54
476msgctxt "Button: Go back one page in the Wizard"
476msgctxt "Button: Go back one page in the Wizard"
@@ -479,7 +479,7 @@ msgstr "Back"
479
479
480#: qml/Wizard/Pages/10-welcome.qml:27
480#: qml/Wizard/Pages/10-welcome.qml:27
481msgid "Language"
481msgid "Language"
482−msgstr ""
482+msgstr "Language"
483
483
484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -488,7 +488,7 @@ msgstr ""
488#: qml/Wizard/Pages/passcode-desktop.qml:124
488#: qml/Wizard/Pages/passcode-desktop.qml:124
489#: qml/Wizard/Pages/password-set.qml:141
489#: qml/Wizard/Pages/password-set.qml:141
490msgid "Next"
490msgid "Next"
491−msgstr ""
491+msgstr "Next"
492
492
493#: qml/Wizard/Pages/30-wifi.qml:29
493#: qml/Wizard/Pages/30-wifi.qml:29
494msgid "Connect to Wi‑Fi"
494msgid "Connect to Wi‑Fi"
@@ -496,15 +496,15 @@ msgstr "Connect to Wi‑Fi"
496
496
497#: qml/Wizard/Pages/30-wifi.qml:130
497#: qml/Wizard/Pages/30-wifi.qml:130
498msgid "Connected"
498msgid "Connected"
499−msgstr ""
499+msgstr "Connected"
500
500
501#: qml/Wizard/Pages/30-wifi.qml:163
501#: qml/Wizard/Pages/30-wifi.qml:163
502msgid "Available Wi-Fi networks"
502msgid "Available Wi-Fi networks"
503−msgstr ""
503+msgstr "Available Wi-Fi networks"
504
504
505#: qml/Wizard/Pages/30-wifi.qml:164
505#: qml/Wizard/Pages/30-wifi.qml:164
506msgid "No available Wi-Fi networks"
506msgid "No available Wi-Fi networks"
507−msgstr ""
507+msgstr "No available Wi-Fi networks"
508
508
509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
510#: qml/Wizard/Pages/sim.qml:101
510#: qml/Wizard/Pages/sim.qml:101
@@ -513,98 +513,100 @@ msgstr "Skip"
513
513
514#: qml/Wizard/Pages/40-location.qml:27
514#: qml/Wizard/Pages/40-location.qml:27
515msgid "Location Services"
515msgid "Location Services"
516−msgstr ""
516+msgstr "Location Services"
517
517
518#: qml/Wizard/Pages/40-location.qml:83
518#: qml/Wizard/Pages/40-location.qml:83
519msgid ""
519msgid ""
520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
521"(recommended)"
521"(recommended)"
522msgstr ""
522msgstr ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
523
525
524#: qml/Wizard/Pages/40-location.qml:105
526#: qml/Wizard/Pages/40-location.qml:105
525#, qt-format
527#, qt-format
526msgid "By selecting this option you agree to the Nokia HERE %1."
528msgid "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."
528
530
529#: qml/Wizard/Pages/40-location.qml:106
531#: qml/Wizard/Pages/40-location.qml:106
530msgctxt "part of: Nokia HERE terms and conditions"
532msgctxt "part of: Nokia HERE terms and conditions"
531msgid "terms and conditions"
533msgid "terms and conditions"
532−msgstr ""
534+msgstr "terms and conditions"
533
535
534#: qml/Wizard/Pages/40-location.qml:160
536#: qml/Wizard/Pages/40-location.qml:160
535msgid "GPS only"
537msgid "GPS only"
536−msgstr ""
538+msgstr "GPS only"
537
539
538#: qml/Wizard/Pages/40-location.qml:214
540#: qml/Wizard/Pages/40-location.qml:214
539msgid "Don't use my location"
541msgid "Don't use my location"
540−msgstr ""
542+msgstr "Don't use my location"
541
543
542#: qml/Wizard/Pages/40-location.qml:260
544#: qml/Wizard/Pages/40-location.qml:260
543msgid "You can change it later in System Settings."
545msgid "You can change it later in System Settings."
544−msgstr ""
546+msgstr "You can change it later in System Settings."
545
547
546#: qml/Wizard/Pages/50-timezone.qml:29
548#: qml/Wizard/Pages/50-timezone.qml:29
547msgid "Time Zone"
549msgid "Time Zone"
548−msgstr ""
550+msgstr "Time Zone"
549
551
550#: qml/Wizard/Pages/50-timezone.qml:178
552#: qml/Wizard/Pages/50-timezone.qml:178
551msgid "Enter your city"
553msgid "Enter your city"
552−msgstr ""
554+msgstr "Enter your city"
553
555
554#: qml/Wizard/Pages/60-account.qml:24
556#: qml/Wizard/Pages/60-account.qml:24
555msgid "Personalize Your Device"
557msgid "Personalize Your Device"
556−msgstr ""
558+msgstr "Personalise Your Device"
557
559
558#: qml/Wizard/Pages/60-account.qml:48
560#: qml/Wizard/Pages/60-account.qml:48
559msgid "Preferred Name"
561msgid "Preferred Name"
560−msgstr ""
562+msgstr "Preferred Name"
561
563
562#: qml/Wizard/Pages/70-passwd-type.qml:39
564#: qml/Wizard/Pages/70-passwd-type.qml:39
563msgid "Lock Screen"
565msgid "Lock Screen"
564−msgstr ""
566+msgstr "Lock Screen"
565
567
566#: qml/Wizard/Pages/70-passwd-type.qml:101
568#: qml/Wizard/Pages/70-passwd-type.qml:101
567msgctxt "Label: Type of security method"
569msgctxt "Label: Type of security method"
568msgid "Create new password"
570msgid "Create new password"
569−msgstr ""
571+msgstr "Create new password"
570
572
571#: qml/Wizard/Pages/70-passwd-type.qml:103
573#: qml/Wizard/Pages/70-passwd-type.qml:103
572msgctxt "Label: Type of security method"
574msgctxt "Label: Type of security method"
573msgid "Create passcode (numbers only)"
575msgid "Create passcode (numbers only)"
574−msgstr ""
576+msgstr "Create passcode (numbers only)"
575
577
576#: qml/Wizard/Pages/70-passwd-type.qml:105
578#: qml/Wizard/Pages/70-passwd-type.qml:105
577msgctxt "Label: Type of security method"
579msgctxt "Label: Type of security method"
578msgid "No lock code"
580msgid "No lock code"
579−msgstr ""
581+msgstr "No lock code"
580
582
581#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
583#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
582msgid "Privacy Policy"
584msgid "Privacy Policy"
583−msgstr ""
585+msgstr "Privacy Policy"
584
586
585#: qml/Wizard/Pages/75-report-check.qml:26
587#: qml/Wizard/Pages/75-report-check.qml:26
586msgid "Help Us Improve"
588msgid "Help Us Improve"
587−msgstr ""
589+msgstr "Help Us Improve"
588
590
589#: qml/Wizard/Pages/75-report-check.qml:59
591#: qml/Wizard/Pages/75-report-check.qml:59
590msgid "Improve system performance by sending us crashes and error reports."
592msgid "Improve system performance by sending us crashes and error reports."
591−msgstr ""
593+msgstr "Improve system performance by sending us crashes and error reports."
592
594
593#: qml/Wizard/Pages/75-report-check.qml:60
595#: qml/Wizard/Pages/75-report-check.qml:60
594msgid "Privacy policy"
596msgid "Privacy policy"
595−msgstr ""
597+msgstr "Privacy policy"
596
598
597#: qml/Wizard/Pages/80-finished.qml:89
599#: qml/Wizard/Pages/80-finished.qml:89
598msgid "Welcome to Ubuntu"
600msgid "Welcome to Ubuntu"
599−msgstr ""
601+msgstr "Welcome to Ubuntu"
600
602
601#: qml/Wizard/Pages/80-finished.qml:104
603#: qml/Wizard/Pages/80-finished.qml:104
602msgid "You are ready to use your device now"
604msgid "You are ready to use your device now"
603−msgstr ""
605+msgstr "You are ready to use your device now"
604
606
605#: qml/Wizard/Pages/80-finished.qml:124
607#: qml/Wizard/Pages/80-finished.qml:124
606msgid "Get Started"
608msgid "Get Started"
607−msgstr ""
609+msgstr "Get Started"
608
610
609#: qml/Wizard/Pages/here-terms.qml:25
611#: qml/Wizard/Pages/here-terms.qml:25
610msgid "Terms & Conditions"
612msgid "Terms & Conditions"
@@ -612,7 +614,7 @@ msgstr "Terms & Conditions"
612
614
613#: qml/Wizard/Pages/here-terms.qml:69
615#: qml/Wizard/Pages/here-terms.qml:69
614msgid "Your device uses positioning technologies provided by HERE."
616msgid "Your device uses positioning technologies provided by HERE."
615−msgstr ""
617+msgstr "Your device uses positioning technologies provided by HERE."
616
618
617#: qml/Wizard/Pages/here-terms.qml:81
619#: qml/Wizard/Pages/here-terms.qml:81
618msgid ""
620msgid ""
@@ -620,21 +622,26 @@ msgid ""
620"collects information about nearby cell towers and Wi-Fi hotspots around your "
622"collects information about nearby cell towers and Wi-Fi hotspots around your "
621"current location whenever your position is being found."
623"current location whenever your position is being found."
622msgstr ""
624msgstr ""
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."
623
628
624#: qml/Wizard/Pages/here-terms.qml:93
629#: qml/Wizard/Pages/here-terms.qml:93
625msgid ""
630msgid ""
626"The information collected is used to analyze the service and to improve the "
631"The information collected is used to analyze the service and to improve the "
627"use of service, but not to identify you personally."
632"use of service, but not to identify you personally."
628msgstr ""
633msgstr ""
634+"The information collected is used to analyse the service and to improve the "
635+"use of service, but not to identify you personally."
629
636
630#: qml/Wizard/Pages/here-terms.qml:106
637#: qml/Wizard/Pages/here-terms.qml:106
631#, qt-format
638#, qt-format
632msgid "By continuing, you agree to the HERE platform %1 and %2."
639msgid "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."
634
641
635#: qml/Wizard/Pages/here-terms.qml:107
642#: qml/Wizard/Pages/here-terms.qml:107
636msgid "Service Terms"
643msgid "Service Terms"
637−msgstr ""
644+msgstr "Service Terms"
638
645
639#: qml/Wizard/Pages/passcode-confirm.qml:43
646#: qml/Wizard/Pages/passcode-confirm.qml:43
640#: qml/Wizard/Pages/passcode-desktop.qml:80
647#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -643,69 +650,69 @@ msgstr "Confirm passcode"
643
650
644#: qml/Wizard/Pages/passcode-confirm.qml:45
651#: qml/Wizard/Pages/passcode-confirm.qml:45
645msgid "Incorrect passcode."
652msgid "Incorrect passcode."
646−msgstr ""
653+msgstr "Incorrect passcode."
647
654
648#: qml/Wizard/Pages/passcode-confirm.qml:45
655#: qml/Wizard/Pages/passcode-confirm.qml:45
649msgctxt "Enter the passcode again"
656msgctxt "Enter the passcode again"
650msgid "Please re-enter."
657msgid "Please re-enter."
651−msgstr ""
658+msgstr "Please re-enter."
652
659
653#: qml/Wizard/Pages/passcode-desktop.qml:30
660#: qml/Wizard/Pages/passcode-desktop.qml:30
654msgid "Lock Screen Passcode"
661msgid "Lock Screen Passcode"
655−msgstr ""
662+msgstr "Lock Screen Passcode"
656
663
657#: qml/Wizard/Pages/passcode-desktop.qml:56
664#: qml/Wizard/Pages/passcode-desktop.qml:56
658msgid "Enter 4 numbers to setup your passcode"
665msgid "Enter 4 numbers to setup your passcode"
659−msgstr ""
666+msgstr "Enter 4 numbers to setup your passcode"
660
667
661#: qml/Wizard/Pages/passcode-desktop.qml:65
668#: qml/Wizard/Pages/passcode-desktop.qml:65
662#: qml/Wizard/Pages/passcode-set.qml:54
669#: qml/Wizard/Pages/passcode-set.qml:54
663msgid "Choose passcode"
670msgid "Choose passcode"
664−msgstr ""
671+msgstr "Choose passcode"
665
672
666#: qml/Wizard/Pages/passcode-desktop.qml:105
673#: qml/Wizard/Pages/passcode-desktop.qml:105
667msgid "Passcode too short"
674msgid "Passcode too short"
668−msgstr ""
675+msgstr "Passcode too short"
669
676
670#: qml/Wizard/Pages/passcode-desktop.qml:107
677#: qml/Wizard/Pages/passcode-desktop.qml:107
671msgid "Passcodes match"
678msgid "Passcodes match"
672−msgstr ""
679+msgstr "Passcodes match"
673
680
674#: qml/Wizard/Pages/passcode-desktop.qml:109
681#: qml/Wizard/Pages/passcode-desktop.qml:109
675msgid "Passcodes do not match"
682msgid "Passcodes do not match"
676−msgstr ""
683+msgstr "Passcodes do not match"
677
684
678#: qml/Wizard/Pages/passcode-set.qml:62
685#: qml/Wizard/Pages/passcode-set.qml:62
679msgid "Passcode must be 4 characters long"
686msgid "Passcode must be 4 characters long"
680−msgstr ""
687+msgstr "Passcode must be 4 characters long"
681
688
682#: qml/Wizard/Pages/password-set.qml:30
689#: qml/Wizard/Pages/password-set.qml:30
683msgid "Lock Screen Password"
690msgid "Lock Screen Password"
684−msgstr ""
691+msgstr "Lock Screen Password"
685
692
686#: qml/Wizard/Pages/password-set.qml:61
693#: qml/Wizard/Pages/password-set.qml:61
687msgid "Enter at least 8 characters"
694msgid "Enter at least 8 characters"
688−msgstr ""
695+msgstr "Enter at least 8 characters"
689
696
690#: qml/Wizard/Pages/password-set.qml:73
697#: qml/Wizard/Pages/password-set.qml:73
691msgid "Choose password"
698msgid "Choose password"
692−msgstr ""
699+msgstr "Choose password"
693
700
694#: qml/Wizard/Pages/password-set.qml:103
701#: qml/Wizard/Pages/password-set.qml:103
695msgid "Confirm password"
702msgid "Confirm password"
696−msgstr ""
703+msgstr "Confirm password"
697
704
698#: qml/Wizard/Pages/sim.qml:27
705#: qml/Wizard/Pages/sim.qml:27
699msgid "No SIM card installed"
706msgid "No SIM card installed"
700−msgstr ""
707+msgstr "No SIM card installed"
701
708
702#: qml/Wizard/Pages/sim.qml:54
709#: qml/Wizard/Pages/sim.qml:54
703msgid "SIM card added"
710msgid "SIM card added"
704−msgstr ""
711+msgstr "SIM card added"
705
712
706#: qml/Wizard/Pages/sim.qml:55
713#: qml/Wizard/Pages/sim.qml:55
707msgid "You must restart the device to access the mobile network."
714msgid "You must restart the device to access the mobile network."
708−msgstr ""
715+msgstr "You must restart the device to access the mobile network."
709
716
710#: qml/Wizard/Pages/sim.qml:59
717#: qml/Wizard/Pages/sim.qml:59
711msgid "Restart"
718msgid "Restart"
@@ -713,35 +720,35 @@ msgstr "Restart"
713
720
714#: qml/Wizard/Pages/sim.qml:78
721#: qml/Wizard/Pages/sim.qml:78
715msgid "You won’t be able to make calls or use text messaging without a SIM."
722msgid "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."
717
724
718#: qml/Wizard/Pages/sim.qml:90
725#: qml/Wizard/Pages/sim.qml:90
719msgid "To proceed with no SIM tap Skip."
726msgid "To proceed with no SIM tap Skip."
720−msgstr ""
727+msgstr "To proceed with no SIM tap Skip."
721
728
722#: qml/Wizard/PasswordMeter.qml:87
729#: qml/Wizard/PasswordMeter.qml:87
723msgid "Passwords match"
730msgid "Passwords match"
724−msgstr ""
731+msgstr "Passwords match"
725
732
726#: qml/Wizard/PasswordMeter.qml:89
733#: qml/Wizard/PasswordMeter.qml:89
727msgid "Passwords do not match"
734msgid "Passwords do not match"
728−msgstr ""
735+msgstr "Passwords do not match"
729
736
730#: qml/Wizard/PasswordMeter.qml:93
737#: qml/Wizard/PasswordMeter.qml:93
731msgid "Strong password"
738msgid "Strong password"
732−msgstr ""
739+msgstr "Strong password"
733
740
734#: qml/Wizard/PasswordMeter.qml:95
741#: qml/Wizard/PasswordMeter.qml:95
735msgid "Fair password"
742msgid "Fair password"
736−msgstr ""
743+msgstr "Fair password"
737
744
738#: qml/Wizard/PasswordMeter.qml:97
745#: qml/Wizard/PasswordMeter.qml:97
739msgid "Weak password"
746msgid "Weak password"
740−msgstr ""
747+msgstr "Weak password"
741
748
742#: qml/Wizard/PasswordMeter.qml:99
749#: qml/Wizard/PasswordMeter.qml:99
743msgid "Very weak password"
750msgid "Very weak password"
744−msgstr ""
751+msgstr "Very weak password"
745
752
746#~ msgid "Confirm"
753#~ msgid "Confirm"
747#~ msgstr "Confirm"
754#~ msgstr "Confirm"
@@ -1054,12 +1061,3 @@ msgstr ""
1054
1061
1055#~ msgid "Call back"
1062#~ msgid "Call back"
1056#~ msgstr "Call back"
1063#~ 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 ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2016-03-25 00:37+0000\n"
11+"PO-Revision-Date: 2016-03-25 12:02+0000\n"
12−"Last-Translator: Víctor R. Ruiz <Unknown>\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-25 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-26 05:44+0000\n"
19"X-Generator: Launchpad (build 17967)\n"
19"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -191,7 +191,7 @@ msgstr "Refinar resultados"
191
191
192#: qml/Dash/FiltersPopover.qml:69
192#: qml/Dash/FiltersPopover.qml:69
193msgid "Reset"
193msgid "Reset"
194−msgstr "Reiniciar"
194+msgstr "Restablecer"
195
195
196#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
196#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
197msgid "See less"
197msgid "See less"
@@ -253,7 +253,7 @@ msgstr "Activar datos de ubicación"
253
253
254#: qml/Dash/ScopesList.qml:67
254#: qml/Dash/ScopesList.qml:67
255msgid "Manage"
255msgid "Manage"
256−msgstr "Administrar"
256+msgstr "Gestionar"
257
257
258#: qml/Dash/ScopesList.qml:113
258#: qml/Dash/ScopesList.qml:113
259msgid "Home"
259msgid "Home"
@@ -545,7 +545,7 @@ msgstr "términos y condiciones"
545
545
546#: qml/Wizard/Pages/40-location.qml:160
546#: qml/Wizard/Pages/40-location.qml:160
547msgid "GPS only"
547msgid "GPS only"
548−msgstr "Sólo GPS"
548+msgstr "Solo GPS"
549
549
550#: qml/Wizard/Pages/40-location.qml:214
550#: qml/Wizard/Pages/40-location.qml:214
551msgid "Don't use my location"
551msgid "Don't use my location"
@@ -553,11 +553,11 @@ msgstr "No usar mi ubicación"
553
553
554#: qml/Wizard/Pages/40-location.qml:260
554#: qml/Wizard/Pages/40-location.qml:260
555msgid "You can change it later in System Settings."
555msgid "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."
557
557
558#: qml/Wizard/Pages/50-timezone.qml:29
558#: qml/Wizard/Pages/50-timezone.qml:29
559msgid "Time Zone"
559msgid "Time Zone"
560−msgstr "Zona horaria"
560+msgstr "Huso horario"
561
561
562#: qml/Wizard/Pages/50-timezone.qml:178
562#: qml/Wizard/Pages/50-timezone.qml:178
563msgid "Enter your city"
563msgid "Enter your city"
@@ -578,12 +578,12 @@ msgstr "Bloquear pantalla"
578#: qml/Wizard/Pages/70-passwd-type.qml:101
578#: qml/Wizard/Pages/70-passwd-type.qml:101
579msgctxt "Label: Type of security method"
579msgctxt "Label: Type of security method"
580msgid "Create new password"
580msgid "Create new password"
581−msgstr "Crear nueva contraseña"
581+msgstr "Crear contraseña nueva"
582
582
583#: qml/Wizard/Pages/70-passwd-type.qml:103
583#: qml/Wizard/Pages/70-passwd-type.qml:103
584msgctxt "Label: Type of security method"
584msgctxt "Label: Type of security method"
585msgid "Create passcode (numbers only)"
585msgid "Create passcode (numbers only)"
586−msgstr "Crear código (sólo dígitos)"
586+msgstr "Crear código (solo dígitos)"
587
587
588#: qml/Wizard/Pages/70-passwd-type.qml:105
588#: qml/Wizard/Pages/70-passwd-type.qml:105
589msgctxt "Label: Type of security method"
589msgctxt "Label: Type of security method"
@@ -608,7 +608,7 @@ msgstr "Política de privacidad"
608
608
609#: qml/Wizard/Pages/80-finished.qml:89
609#: qml/Wizard/Pages/80-finished.qml:89
610msgid "Welcome to Ubuntu"
610msgid "Welcome to Ubuntu"
611−msgstr "Bienvenido a Ubuntu"
611+msgstr "Le damos la bienvenida a Ubuntu"
612
612
613#: qml/Wizard/Pages/80-finished.qml:104
613#: qml/Wizard/Pages/80-finished.qml:104
614msgid "You are ready to use your device now"
614msgid "You are ready to use your device now"
@@ -1075,12 +1075,3 @@ msgstr "Contraseña muy débil"
1075
1075
1076#~ msgid "Call back"
1076#~ msgid "Call back"
1077#~ msgstr "Devolver llamada"
1077#~ 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 ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"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"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
13"Language-Team: Persian <fa@li.org>\n"
13"Language-Team: Persian <fa@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"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"
19"X-Generator: Launchpad (build 17967)\n"
19"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -140,6 +140,7 @@ msgctxt ""
140"Re-dock means connect the device again to an external screen/mouse/keyboard"
140"Re-dock means connect the device again to an external screen/mouse/keyboard"
141msgid "Re-dock, save your work and close these apps to continue."
141msgid "Re-dock, save your work and close these apps to continue."
142msgstr ""
142msgstr ""
143+"برای ادامه، دوباره متّصل کرده، کارتان را ذخیره کنید و این کاره‌ها را ببندید."
143
144
144#: qml/Components/ModeSwitchWarningDialog.qml:63
145#: qml/Components/ModeSwitchWarningDialog.qml:63
145msgid "Or force close now (unsaved data will be lost)."
146msgid "Or force close now (unsaved data will be lost)."
@@ -182,7 +183,7 @@ msgstr "افزودن به برگزیده‌ها"
182
183
183#: qml/Dash/FiltersPopover.qml:60
184#: qml/Dash/FiltersPopover.qml:60
184msgid "Refine your results"
185msgid "Refine your results"
185−msgstr ""
186+msgstr "نتایجتان را بهبود دهید"
186
187
187#: qml/Dash/FiltersPopover.qml:69
188#: qml/Dash/FiltersPopover.qml:69
188msgid "Reset"
189msgid "Reset"
@@ -263,6 +264,8 @@ msgid ""
263"Your device is now connected to an external display. Use this screen as a "
264"Your device is now connected to an external display. Use this screen as a "
264"touch pad to interact with the pointer."
265"touch pad to interact with the pointer."
265msgstr ""
266msgstr ""
267+"افزاره‌تان هم‌تکنون به یک نمایشگر خارجی وصل شده است. از این صفحه به عنوان یک "
268+"صفحه‌لمسی برای کارکردن با نشانگر استفاده کنید."
266
269
267#: qml/Greeter/CoverPage.qml:118
270#: qml/Greeter/CoverPage.qml:118
268msgid "Unlock"
271msgid "Unlock"
@@ -421,7 +424,7 @@ msgstr "پاسخ تماس"
421
424
422#: qml/Stages/SideStage.qml:76
425#: qml/Stages/SideStage.qml:76
423msgid "Drag using 3 fingers any application from one window to the other"
426msgid "Drag using 3 fingers any application from one window to the other"
424−msgstr ""
427+msgstr "هر پنجره‌ای را با کشیدن سه‌انگشت از پنجره‌ای به ینجرهٔ دیگر ببرید"
425
428
426#: qml/Tutorial/TutorialBottom.qml:78
429#: qml/Tutorial/TutorialBottom.qml:78
427msgid "Swipe up to add a contact"
430msgid "Swipe up to add a contact"
@@ -515,6 +518,8 @@ msgid ""
515"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
518"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
516"(recommended)"
519"(recommended)"
517msgstr ""
520msgstr ""
521+"برای تشخیص موقعیّت، به صورت ناشناس از جی‌پی‌اس، نقطه‌های داغ وای‌فای و "
522+"شبکه‌های تلفن همراه استفاده شود (توصیه شده)"
518
523
519#: qml/Wizard/Pages/40-location.qml:105
524#: qml/Wizard/Pages/40-location.qml:105
520#, qt-format
525#, qt-format
@@ -583,7 +588,7 @@ msgstr "کمک به بهبود"
583
588
584#: qml/Wizard/Pages/75-report-check.qml:59
589#: qml/Wizard/Pages/75-report-check.qml:59
585msgid "Improve system performance by sending us crashes and error reports."
590msgid "Improve system performance by sending us crashes and error reports."
586−msgstr ""
591+msgstr "کارایی سامانه با ارسال گزارش‌های خطا بهبود دهید."
587
592
588#: qml/Wizard/Pages/75-report-check.qml:60
593#: qml/Wizard/Pages/75-report-check.qml:60
589msgid "Privacy policy"
594msgid "Privacy policy"
@@ -608,6 +613,7 @@ msgstr "شرایط و ضوابط"
608#: qml/Wizard/Pages/here-terms.qml:69
613#: qml/Wizard/Pages/here-terms.qml:69
609msgid "Your device uses positioning technologies provided by HERE."
614msgid "Your device uses positioning technologies provided by HERE."
610msgstr ""
615msgstr ""
616+"افزاره‌تان از فن‌آوری‌های موقعیّت‌یابی فراهم‌شده توسّط HERE استفاده مي‌کند."
611
617
612#: qml/Wizard/Pages/here-terms.qml:81
618#: qml/Wizard/Pages/here-terms.qml:81
613msgid ""
619msgid ""
@@ -615,17 +621,22 @@ msgid ""
615"collects information about nearby cell towers and Wi-Fi hotspots around your "
621"collects information about nearby cell towers and Wi-Fi hotspots around your "
616"current location whenever your position is being found."
622"current location whenever your position is being found."
617msgstr ""
623msgstr ""
624+"به منظور فراهم کردن خدمات موقعیّت‌یابی و بهبود کیفیت آن‌ها، به هنگام پیدا "
625+"شدن موقعیتتان، HERE اطّلاعاتی دربارهٔ برج‌های تلفن همراه نزدیک و نقطه‌های "
626+"داغ وای‌فای اطراف موقعیّت فعلیتان را حمع‌آوری می‌کند."
618
627
619#: qml/Wizard/Pages/here-terms.qml:93
628#: qml/Wizard/Pages/here-terms.qml:93
620msgid ""
629msgid ""
621"The information collected is used to analyze the service and to improve the "
630"The information collected is used to analyze the service and to improve the "
622"use of service, but not to identify you personally."
631"use of service, but not to identify you personally."
623msgstr ""
632msgstr ""
633+"اطّلاعات جمع‌آوری شده برای تحلیل خدمت و بهبود استفاده از آن، و نه برای تشخیص "
634+"شخص شما استفاده می‌شوند"
624
635
625#: qml/Wizard/Pages/here-terms.qml:106
636#: qml/Wizard/Pages/here-terms.qml:106
626#, qt-format
637#, qt-format
627msgid "By continuing, you agree to the HERE platform %1 and %2."
638msgid "By continuing, you agree to the HERE platform %1 and %2."
628−msgstr ""
639+msgstr "با ادامه، با %1 و %2 بن‌سازهٔ HERE موافقت می‌کنید."
629
640
630#: qml/Wizard/Pages/here-terms.qml:107
641#: qml/Wizard/Pages/here-terms.qml:107
631msgid "Service Terms"
642msgid "Service Terms"
@@ -726,19 +737,19 @@ msgstr "گذرواژه‌ها مطابق نیستند"
726
737
727#: qml/Wizard/PasswordMeter.qml:93
738#: qml/Wizard/PasswordMeter.qml:93
728msgid "Strong password"
739msgid "Strong password"
729−msgstr ""
740+msgstr "گذرواژهٔ قوی"
730
741
731#: qml/Wizard/PasswordMeter.qml:95
742#: qml/Wizard/PasswordMeter.qml:95
732msgid "Fair password"
743msgid "Fair password"
733−msgstr ""
744+msgstr "گذرواژهٔ معتدل"
734
745
735#: qml/Wizard/PasswordMeter.qml:97
746#: qml/Wizard/PasswordMeter.qml:97
736msgid "Weak password"
747msgid "Weak password"
737−msgstr ""
748+msgstr "گذرواژهٔ ضعیف"
738
749
739#: qml/Wizard/PasswordMeter.qml:99
750#: qml/Wizard/PasswordMeter.qml:99
740msgid "Very weak password"
751msgid "Very weak password"
741−msgstr ""
752+msgstr "گذرواژهٔ خیلی ضعیف"
742
753
743#~ msgid "Right edge"
754#~ msgid "Right edge"
744#~ msgstr "لبه‌ی راست"
755#~ msgstr "لبه‌ی راست"
po/fr.po+69−57
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"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"
12"Last-Translator: Jean-Marc <Unknown>\n"
12"Last-Translator: Jean-Marc <Unknown>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-25 05:54+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-27 05:47+0000\n"
19"X-Generator: Launchpad (build 17967)\n"
19"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -215,7 +215,7 @@ msgstr "Recherches récentes"
215
215
216#: qml/Dash/PageHeaderExtraPanel.qml:66
216#: qml/Dash/PageHeaderExtraPanel.qml:66
217msgid "Clear All"
217msgid "Clear All"
218−msgstr ""
218+msgstr "Tout effacer"
219
219
220#: qml/Dash/Previews/PreviewActionCombo.qml:35
220#: qml/Dash/Previews/PreviewActionCombo.qml:35
221msgid "More..."
221msgid "More..."
@@ -446,11 +446,11 @@ msgstr "Faites glisser vers le haut pour ajouter un contact"
446
446
447#: qml/Tutorial/TutorialBottom.qml:80
447#: qml/Tutorial/TutorialBottom.qml:80
448msgid "Swipe up for favorite calculations"
448msgid "Swipe up for favorite calculations"
449−msgstr ""
449+msgstr "Faites glisser vers le haut pour afficher les calculs favoris"
450
450
451#: qml/Tutorial/TutorialBottom.qml:82
451#: qml/Tutorial/TutorialBottom.qml:82
452msgid "Swipe up for recent calls"
452msgid "Swipe up for recent calls"
453−msgstr ""
453+msgstr "Faites glisser vers le haut pour afficher les appels récents"
454
454
455#: qml/Tutorial/TutorialBottom.qml:84
455#: qml/Tutorial/TutorialBottom.qml:84
456msgid "Swipe up to create a message"
456msgid "Swipe up to create a message"
@@ -462,27 +462,36 @@ msgstr "Faites glisser vers le haut pour gérer l'application"
462
462
463#: qml/Tutorial/TutorialLeft.qml:47
463#: qml/Tutorial/TutorialLeft.qml:47
464msgid "Swipe from the left edge to open the launcher"
464msgid "Swipe from the left edge to open the launcher"
465−msgstr ""
465+msgstr "Faites glisser à partir du bord gauche pour ouvrir le lanceur"
466
466
467#: qml/Tutorial/TutorialLeftLong.qml:47
467#: qml/Tutorial/TutorialLeftLong.qml:47
468msgid "Long swipe from the left edge to open the Today scope"
468msgid "Long swipe from the left edge to open the Today scope"
469msgstr ""
469msgstr ""
470+"Faites glisser à partir du bord gauche jusqu'au bord droit pour ouvrir le "
471+"moteur de recherche Aujourd'hui"
470
472
471#: qml/Tutorial/TutorialRight.qml:54
473#: qml/Tutorial/TutorialRight.qml:54
472msgid "Hover your mouse on the right edge to view your open apps"
474msgid "Hover your mouse on the right edge to view your open apps"
473msgstr ""
475msgstr ""
476+"Passez votre souris sur le bord droit pour voir vos applications ouvertes"
474
477
475#: qml/Tutorial/TutorialRight.qml:55
478#: qml/Tutorial/TutorialRight.qml:55
476msgid "Short or long swipe from the right edge to view your open apps"
479msgid "Short or long swipe from the right edge to view your open apps"
477msgstr ""
480msgstr ""
481+"Faites glisser brièvement ou longuement à partir du bord droit pour voir vos "
482+"applications ouvertes"
478
483
479#: qml/Tutorial/TutorialTop.qml:53
484#: qml/Tutorial/TutorialTop.qml:53
480msgid "Swipe from the top right edge to open the notification bar"
485msgid "Swipe from the top right edge to open the notification bar"
481msgstr ""
486msgstr ""
487+"Faites glisser à partir du bord supérieur droit pour ouvrir la barre de "
488+"notifications"
482
489
483#: qml/Tutorial/TutorialTop.qml:54
490#: qml/Tutorial/TutorialTop.qml:54
484msgid "Swipe from the top edge to open the notification bar"
491msgid "Swipe from the top edge to open the notification bar"
485msgstr ""
492msgstr ""
493+"Faites glisser à partir du bord supérieur pour ouvrir la barre de "
494+"notifications"
486
495
487#: qml/Wizard/Page.qml:54
496#: qml/Wizard/Page.qml:54
488msgctxt "Button: Go back one page in the Wizard"
497msgctxt "Button: Go back one page in the Wizard"
@@ -491,7 +500,7 @@ msgstr "Précédent"
491
500
492#: qml/Wizard/Pages/10-welcome.qml:27
501#: qml/Wizard/Pages/10-welcome.qml:27
493msgid "Language"
502msgid "Language"
494−msgstr ""
503+msgstr "Langue"
495
504
496#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
505#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
497#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
506#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -532,6 +541,8 @@ msgid ""
532"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
541"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
533"(recommended)"
542"(recommended)"
534msgstr ""
543msgstr ""
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é)"
535
546
536#: qml/Wizard/Pages/40-location.qml:105
547#: qml/Wizard/Pages/40-location.qml:105
537#, qt-format
548#, qt-format
@@ -545,7 +556,7 @@ msgstr "conditions générales d'utilisation"
545
556
546#: qml/Wizard/Pages/40-location.qml:160
557#: qml/Wizard/Pages/40-location.qml:160
547msgid "GPS only"
558msgid "GPS only"
548−msgstr ""
559+msgstr "GPS uniquement"
549
560
550#: qml/Wizard/Pages/40-location.qml:214
561#: qml/Wizard/Pages/40-location.qml:214
551msgid "Don't use my location"
562msgid "Don't use my location"
@@ -553,7 +564,7 @@ msgstr "Ne pas utiliser ma position"
553
564
554#: qml/Wizard/Pages/40-location.qml:260
565#: qml/Wizard/Pages/40-location.qml:260
555msgid "You can change it later in System Settings."
566msgid "You can change it later in System Settings."
556−msgstr ""
567+msgstr "Vous pouvez le modifier ultérieurement dans les Paramètres système."
557
568
558#: qml/Wizard/Pages/50-timezone.qml:29
569#: qml/Wizard/Pages/50-timezone.qml:29
559msgid "Time Zone"
570msgid "Time Zone"
@@ -561,34 +572,34 @@ msgstr "Fuseau horaire"
561
572
562#: qml/Wizard/Pages/50-timezone.qml:178
573#: qml/Wizard/Pages/50-timezone.qml:178
563msgid "Enter your city"
574msgid "Enter your city"
564−msgstr ""
575+msgstr "Saisir votre ville"
565
576
566#: qml/Wizard/Pages/60-account.qml:24
577#: qml/Wizard/Pages/60-account.qml:24
567msgid "Personalize Your Device"
578msgid "Personalize Your Device"
568−msgstr ""
579+msgstr "Personnaliser votre appareil"
569
580
570#: qml/Wizard/Pages/60-account.qml:48
581#: qml/Wizard/Pages/60-account.qml:48
571msgid "Preferred Name"
582msgid "Preferred Name"
572−msgstr ""
583+msgstr "Nom préferé"
573
584
574#: qml/Wizard/Pages/70-passwd-type.qml:39
585#: qml/Wizard/Pages/70-passwd-type.qml:39
575msgid "Lock Screen"
586msgid "Lock Screen"
576−msgstr ""
587+msgstr "Verrouiller l'écran"
577
588
578#: qml/Wizard/Pages/70-passwd-type.qml:101
589#: qml/Wizard/Pages/70-passwd-type.qml:101
579msgctxt "Label: Type of security method"
590msgctxt "Label: Type of security method"
580msgid "Create new password"
591msgid "Create new password"
581−msgstr ""
592+msgstr "Créer un nouveau mot de passe"
582
593
583#: qml/Wizard/Pages/70-passwd-type.qml:103
594#: qml/Wizard/Pages/70-passwd-type.qml:103
584msgctxt "Label: Type of security method"
595msgctxt "Label: Type of security method"
585msgid "Create passcode (numbers only)"
596msgid "Create passcode (numbers only)"
586−msgstr ""
597+msgstr "Créer un code (chiffres uniquement)"
587
598
588#: qml/Wizard/Pages/70-passwd-type.qml:105
599#: qml/Wizard/Pages/70-passwd-type.qml:105
589msgctxt "Label: Type of security method"
600msgctxt "Label: Type of security method"
590msgid "No lock code"
601msgid "No lock code"
591−msgstr ""
602+msgstr "Aucun code de verrouillage"
592
603
593#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
604#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
594msgid "Privacy Policy"
605msgid "Privacy Policy"
@@ -596,27 +607,29 @@ msgstr "Politique de confidentialité"
596
607
597#: qml/Wizard/Pages/75-report-check.qml:26
608#: qml/Wizard/Pages/75-report-check.qml:26
598msgid "Help Us Improve"
609msgid "Help Us Improve"
599−msgstr ""
610+msgstr "Aidez-nous à améliorer"
600
611
601#: qml/Wizard/Pages/75-report-check.qml:59
612#: qml/Wizard/Pages/75-report-check.qml:59
602msgid "Improve system performance by sending us crashes and error reports."
613msgid "Improve system performance by sending us crashes and error reports."
603msgstr ""
614msgstr ""
615+"Améliorez les performances du système en nous envoyant les rapports d'erreur "
616+"et en nous signalant les anomalies."
604
617
605#: qml/Wizard/Pages/75-report-check.qml:60
618#: qml/Wizard/Pages/75-report-check.qml:60
606msgid "Privacy policy"
619msgid "Privacy policy"
607−msgstr ""
620+msgstr "Politique relative à la vie privée"
608
621
609#: qml/Wizard/Pages/80-finished.qml:89
622#: qml/Wizard/Pages/80-finished.qml:89
610msgid "Welcome to Ubuntu"
623msgid "Welcome to Ubuntu"
611−msgstr ""
624+msgstr "Bienvenue sur Ubuntu"
612
625
613#: qml/Wizard/Pages/80-finished.qml:104
626#: qml/Wizard/Pages/80-finished.qml:104
614msgid "You are ready to use your device now"
627msgid "You are ready to use your device now"
615−msgstr ""
628+msgstr "Vous êtes prêt à utiliser votre appareil maintenant"
616
629
617#: qml/Wizard/Pages/80-finished.qml:124
630#: qml/Wizard/Pages/80-finished.qml:124
618msgid "Get Started"
631msgid "Get Started"
619−msgstr ""
632+msgstr "Commencer"
620
633
621#: qml/Wizard/Pages/here-terms.qml:25
634#: qml/Wizard/Pages/here-terms.qml:25
622msgid "Terms & Conditions"
635msgid "Terms & Conditions"
@@ -625,6 +638,7 @@ msgstr "Conditions générales d'utilisation"
625#: qml/Wizard/Pages/here-terms.qml:69
638#: qml/Wizard/Pages/here-terms.qml:69
626msgid "Your device uses positioning technologies provided by HERE."
639msgid "Your device uses positioning technologies provided by HERE."
627msgstr ""
640msgstr ""
641+"Votre appareil utilise des technologies de localisation fournies par HERE."
628
642
629#: qml/Wizard/Pages/here-terms.qml:81
643#: qml/Wizard/Pages/here-terms.qml:81
630msgid ""
644msgid ""
@@ -632,21 +646,28 @@ msgid ""
632"collects information about nearby cell towers and Wi-Fi hotspots around your "
646"collects information about nearby cell towers and Wi-Fi hotspots around your "
633"current location whenever your position is being found."
647"current location whenever your position is being found."
634msgstr ""
648msgstr ""
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."
635
653
636#: qml/Wizard/Pages/here-terms.qml:93
654#: qml/Wizard/Pages/here-terms.qml:93
637msgid ""
655msgid ""
638"The information collected is used to analyze the service and to improve the "
656"The information collected is used to analyze the service and to improve the "
639"use of service, but not to identify you personally."
657"use of service, but not to identify you personally."
640msgstr ""
658msgstr ""
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."
641
662
642#: qml/Wizard/Pages/here-terms.qml:106
663#: qml/Wizard/Pages/here-terms.qml:106
643#, qt-format
664#, qt-format
644msgid "By continuing, you agree to the HERE platform %1 and %2."
665msgid "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."
646
667
647#: qml/Wizard/Pages/here-terms.qml:107
668#: qml/Wizard/Pages/here-terms.qml:107
648msgid "Service Terms"
669msgid "Service Terms"
649−msgstr ""
670+msgstr "Conditions de service"
650
671
651#: qml/Wizard/Pages/passcode-confirm.qml:43
672#: qml/Wizard/Pages/passcode-confirm.qml:43
652#: qml/Wizard/Pages/passcode-desktop.qml:80
673#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -655,69 +676,69 @@ msgstr "Confirmez votre code"
655
676
656#: qml/Wizard/Pages/passcode-confirm.qml:45
677#: qml/Wizard/Pages/passcode-confirm.qml:45
657msgid "Incorrect passcode."
678msgid "Incorrect passcode."
658−msgstr ""
679+msgstr "Code incorrect."
659
680
660#: qml/Wizard/Pages/passcode-confirm.qml:45
681#: qml/Wizard/Pages/passcode-confirm.qml:45
661msgctxt "Enter the passcode again"
682msgctxt "Enter the passcode again"
662msgid "Please re-enter."
683msgid "Please re-enter."
663−msgstr ""
684+msgstr "Veuillez ressaisir."
664
685
665#: qml/Wizard/Pages/passcode-desktop.qml:30
686#: qml/Wizard/Pages/passcode-desktop.qml:30
666msgid "Lock Screen Passcode"
687msgid "Lock Screen Passcode"
667−msgstr ""
688+msgstr "Code de verrouillage d'écran"
668
689
669#: qml/Wizard/Pages/passcode-desktop.qml:56
690#: qml/Wizard/Pages/passcode-desktop.qml:56
670msgid "Enter 4 numbers to setup your passcode"
691msgid "Enter 4 numbers to setup your passcode"
671−msgstr ""
692+msgstr "Saisissez 4 chiffres pour définir votre code"
672
693
673#: qml/Wizard/Pages/passcode-desktop.qml:65
694#: qml/Wizard/Pages/passcode-desktop.qml:65
674#: qml/Wizard/Pages/passcode-set.qml:54
695#: qml/Wizard/Pages/passcode-set.qml:54
675msgid "Choose passcode"
696msgid "Choose passcode"
676−msgstr ""
697+msgstr "Choisissez un code"
677
698
678#: qml/Wizard/Pages/passcode-desktop.qml:105
699#: qml/Wizard/Pages/passcode-desktop.qml:105
679msgid "Passcode too short"
700msgid "Passcode too short"
680−msgstr ""
701+msgstr "Code trop court"
681
702
682#: qml/Wizard/Pages/passcode-desktop.qml:107
703#: qml/Wizard/Pages/passcode-desktop.qml:107
683msgid "Passcodes match"
704msgid "Passcodes match"
684−msgstr ""
705+msgstr "Les codes correspondent"
685
706
686#: qml/Wizard/Pages/passcode-desktop.qml:109
707#: qml/Wizard/Pages/passcode-desktop.qml:109
687msgid "Passcodes do not match"
708msgid "Passcodes do not match"
688−msgstr ""
709+msgstr "Les codes ne correspondent pas"
689
710
690#: qml/Wizard/Pages/passcode-set.qml:62
711#: qml/Wizard/Pages/passcode-set.qml:62
691msgid "Passcode must be 4 characters long"
712msgid "Passcode must be 4 characters long"
692−msgstr ""
713+msgstr "Le code doit contenir au moins 4 caractères"
693
714
694#: qml/Wizard/Pages/password-set.qml:30
715#: qml/Wizard/Pages/password-set.qml:30
695msgid "Lock Screen Password"
716msgid "Lock Screen Password"
696−msgstr ""
717+msgstr "Mot de passe de verrouillage de l'écran"
697
718
698#: qml/Wizard/Pages/password-set.qml:61
719#: qml/Wizard/Pages/password-set.qml:61
699msgid "Enter at least 8 characters"
720msgid "Enter at least 8 characters"
700−msgstr ""
721+msgstr "Saisissez au moins 8 caractères"
701
722
702#: qml/Wizard/Pages/password-set.qml:73
723#: qml/Wizard/Pages/password-set.qml:73
703msgid "Choose password"
724msgid "Choose password"
704−msgstr ""
725+msgstr "Choisissez un mot de passe"
705
726
706#: qml/Wizard/Pages/password-set.qml:103
727#: qml/Wizard/Pages/password-set.qml:103
707msgid "Confirm password"
728msgid "Confirm password"
708−msgstr ""
729+msgstr "Confirmez le mot de passe"
709
730
710#: qml/Wizard/Pages/sim.qml:27
731#: qml/Wizard/Pages/sim.qml:27
711msgid "No SIM card installed"
732msgid "No SIM card installed"
712−msgstr ""
733+msgstr "Aucune carte SIM installée"
713
734
714#: qml/Wizard/Pages/sim.qml:54
735#: qml/Wizard/Pages/sim.qml:54
715msgid "SIM card added"
736msgid "SIM card added"
716−msgstr ""
737+msgstr "Carte SIM ajoutée"
717
738
718#: qml/Wizard/Pages/sim.qml:55
739#: qml/Wizard/Pages/sim.qml:55
719msgid "You must restart the device to access the mobile network."
740msgid "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."
721
742
722#: qml/Wizard/Pages/sim.qml:59
743#: qml/Wizard/Pages/sim.qml:59
723msgid "Restart"
744msgid "Restart"
@@ -726,34 +747,36 @@ msgstr "Redémarrer"
726#: qml/Wizard/Pages/sim.qml:78
747#: qml/Wizard/Pages/sim.qml:78
727msgid "You won’t be able to make calls or use text messaging without a SIM."
748msgid "You won’t be able to make calls or use text messaging without a SIM."
728msgstr ""
749msgstr ""
750+"Vous ne serez pas en mesure de passer des appels ou d'envoyer des messages "
751+"sans carte SIM."
729
752
730#: qml/Wizard/Pages/sim.qml:90
753#: qml/Wizard/Pages/sim.qml:90
731msgid "To proceed with no SIM tap Skip."
754msgid "To proceed with no SIM tap Skip."
732−msgstr ""
755+msgstr "Pour poursuivre sans carte SIM, appuyez sur « Ignorer »"
733
756
734#: qml/Wizard/PasswordMeter.qml:87
757#: qml/Wizard/PasswordMeter.qml:87
735msgid "Passwords match"
758msgid "Passwords match"
736−msgstr ""
759+msgstr "Les mots de passe correspondent"
737
760
738#: qml/Wizard/PasswordMeter.qml:89
761#: qml/Wizard/PasswordMeter.qml:89
739msgid "Passwords do not match"
762msgid "Passwords do not match"
740−msgstr ""
763+msgstr "Les mots de passe ne correspondent pas"
741
764
742#: qml/Wizard/PasswordMeter.qml:93
765#: qml/Wizard/PasswordMeter.qml:93
743msgid "Strong password"
766msgid "Strong password"
744−msgstr ""
767+msgstr "Mot de passe fort"
745
768
746#: qml/Wizard/PasswordMeter.qml:95
769#: qml/Wizard/PasswordMeter.qml:95
747msgid "Fair password"
770msgid "Fair password"
748−msgstr ""
771+msgstr "Mot de passe acceptable"
749
772
750#: qml/Wizard/PasswordMeter.qml:97
773#: qml/Wizard/PasswordMeter.qml:97
751msgid "Weak password"
774msgid "Weak password"
752−msgstr ""
775+msgstr "Mot de passe faible"
753
776
754#: qml/Wizard/PasswordMeter.qml:99
777#: qml/Wizard/PasswordMeter.qml:99
755msgid "Very weak password"
778msgid "Very weak password"
756−msgstr ""
779+msgstr "Mot de passe très faible"
757
780
758#~ msgid "Skip intro"
781#~ msgid "Skip intro"
759#~ msgstr "Passer l'intro"
782#~ msgstr "Passer l'intro"
@@ -1079,14 +1102,3 @@ msgstr ""
1079
1102
1080#~ msgid "Call back"
1103#~ msgid "Call back"
1081#~ msgstr "Rappeler"
1104#~ 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 ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2015-07-05 19:44+0000\n"
11+"PO-Revision-Date: 2016-03-29 08:56+0000\n"
12−"Last-Translator: Mathias Bynke <Unknown>\n"
12+"Last-Translator: Åka Sikrom <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-30 06:25+0000\n"
19−"X-Generator: Launchpad (build 17958)\n"
19+"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -142,6 +142,8 @@ msgctxt ""
142"Re-dock means connect the device again to an external screen/mouse/keyboard"
142"Re-dock means connect the device again to an external screen/mouse/keyboard"
143msgid "Re-dock, save your work and close these apps to continue."
143msgid "Re-dock, save your work and close these apps to continue."
144msgstr ""
144msgstr ""
145+"Koble enheten til strøm, lagre arbeidet ditt og lukk disse programmene for å "
146+"fortsette."
145
147
146#: qml/Components/ModeSwitchWarningDialog.qml:63
148#: qml/Components/ModeSwitchWarningDialog.qml:63
147msgid "Or force close now (unsaved data will be lost)."
149msgid "Or force close now (unsaved data will be lost)."
@@ -184,11 +186,11 @@ msgstr "Legg til i favoritter"
184
186
185#: qml/Dash/FiltersPopover.qml:60
187#: qml/Dash/FiltersPopover.qml:60
186msgid "Refine your results"
188msgid "Refine your results"
187−msgstr ""
189+msgstr "Filtrer søketreff"
188
190
189#: qml/Dash/FiltersPopover.qml:69
191#: qml/Dash/FiltersPopover.qml:69
190msgid "Reset"
192msgid "Reset"
191−msgstr ""
193+msgstr "Tilbakestill"
192
194
193#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
195#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
194msgid "See less"
196msgid "See less"
@@ -205,11 +207,11 @@ msgstr "Søk"
205
207
206#: qml/Dash/PageHeaderExtraPanel.qml:55
208#: qml/Dash/PageHeaderExtraPanel.qml:55
207msgid "Recent Searches"
209msgid "Recent Searches"
208−msgstr ""
210+msgstr "Nylige søk"
209
211
210#: qml/Dash/PageHeaderExtraPanel.qml:66
212#: qml/Dash/PageHeaderExtraPanel.qml:66
211msgid "Clear All"
213msgid "Clear All"
212−msgstr ""
214+msgstr "Tøm alt"
213
215
214#: qml/Dash/Previews/PreviewActionCombo.qml:35
216#: qml/Dash/Previews/PreviewActionCombo.qml:35
215msgid "More..."
217msgid "More..."
@@ -265,6 +267,8 @@ msgid ""
265"Your device is now connected to an external display. Use this screen as a "
267"Your device is now connected to an external display. Use this screen as a "
266"touch pad to interact with the pointer."
268"touch pad to interact with the pointer."
267msgstr ""
269msgstr ""
270+"Enheten er nå koblet til en ekstern skjerm. Bruk denne skjermen som en "
271+"pekeplate for å styre pekeren."
268
272
269#: qml/Greeter/CoverPage.qml:118
273#: qml/Greeter/CoverPage.qml:118
270msgid "Unlock"
274msgid "Unlock"
@@ -426,51 +430,51 @@ msgstr "Ring tilbake"
426
430
427#: qml/Stages/SideStage.qml:76
431#: qml/Stages/SideStage.qml:76
428msgid "Drag using 3 fingers any application from one window to the other"
432msgid "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"
430
434
431#: qml/Tutorial/TutorialBottom.qml:78
435#: qml/Tutorial/TutorialBottom.qml:78
432msgid "Swipe up to add a contact"
436msgid "Swipe up to add a contact"
433−msgstr ""
437+msgstr "Dra opp for å legge til en kontakt"
434
438
435#: qml/Tutorial/TutorialBottom.qml:80
439#: qml/Tutorial/TutorialBottom.qml:80
436msgid "Swipe up for favorite calculations"
440msgid "Swipe up for favorite calculations"
437−msgstr ""
441+msgstr "Dra opp for å se favoritt-utregninger"
438
442
439#: qml/Tutorial/TutorialBottom.qml:82
443#: qml/Tutorial/TutorialBottom.qml:82
440msgid "Swipe up for recent calls"
444msgid "Swipe up for recent calls"
441−msgstr ""
445+msgstr "Dra opp for å se nylige anrop"
442
446
443#: qml/Tutorial/TutorialBottom.qml:84
447#: qml/Tutorial/TutorialBottom.qml:84
444msgid "Swipe up to create a message"
448msgid "Swipe up to create a message"
445−msgstr ""
449+msgstr "Dra opp for å lage en melding"
446
450
447#: qml/Tutorial/TutorialBottom.qml:85
451#: qml/Tutorial/TutorialBottom.qml:85
448msgid "Swipe up to manage the app"
452msgid "Swipe up to manage the app"
449−msgstr ""
453+msgstr "Dra opp for å håndtere programmet"
450
454
451#: qml/Tutorial/TutorialLeft.qml:47
455#: qml/Tutorial/TutorialLeft.qml:47
452msgid "Swipe from the left edge to open the launcher"
456msgid "Swipe from the left edge to open the launcher"
453−msgstr ""
457+msgstr "Dra fra venstre kant for å åpne oppstarteren"
454
458
455#: qml/Tutorial/TutorialLeftLong.qml:47
459#: qml/Tutorial/TutorialLeftLong.qml:47
456msgid "Long swipe from the left edge to open the Today scope"
460msgid "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»"
458
462
459#: qml/Tutorial/TutorialRight.qml:54
463#: qml/Tutorial/TutorialRight.qml:54
460msgid "Hover your mouse on the right edge to view your open apps"
464msgid "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"
462
466
463#: qml/Tutorial/TutorialRight.qml:55
467#: qml/Tutorial/TutorialRight.qml:55
464msgid "Short or long swipe from the right edge to view your open apps"
468msgid "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"
466
470
467#: qml/Tutorial/TutorialTop.qml:53
471#: qml/Tutorial/TutorialTop.qml:53
468msgid "Swipe from the top right edge to open the notification bar"
472msgid "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"
470
474
471#: qml/Tutorial/TutorialTop.qml:54
475#: qml/Tutorial/TutorialTop.qml:54
472msgid "Swipe from the top edge to open the notification bar"
476msgid "Swipe from the top edge to open the notification bar"
473−msgstr ""
477+msgstr "Dra fra øvre kant for å åpne varslingslinja"
474
478
475#: qml/Wizard/Page.qml:54
479#: qml/Wizard/Page.qml:54
476msgctxt "Button: Go back one page in the Wizard"
480msgctxt "Button: Go back one page in the Wizard"
@@ -479,7 +483,7 @@ msgstr "Tilbake"
479
483
480#: qml/Wizard/Pages/10-welcome.qml:27
484#: qml/Wizard/Pages/10-welcome.qml:27
481msgid "Language"
485msgid "Language"
482−msgstr ""
486+msgstr "Språk"
483
487
484#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
488#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
485#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
489#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -488,7 +492,7 @@ msgstr ""
488#: qml/Wizard/Pages/passcode-desktop.qml:124
492#: qml/Wizard/Pages/passcode-desktop.qml:124
489#: qml/Wizard/Pages/password-set.qml:141
493#: qml/Wizard/Pages/password-set.qml:141
490msgid "Next"
494msgid "Next"
491−msgstr ""
495+msgstr "Neste"
492
496
493#: qml/Wizard/Pages/30-wifi.qml:29
497#: qml/Wizard/Pages/30-wifi.qml:29
494msgid "Connect to Wi‑Fi"
498msgid "Connect to Wi‑Fi"
@@ -496,15 +500,15 @@ msgstr "Koble til trådløst nettverk"
496
500
497#: qml/Wizard/Pages/30-wifi.qml:130
501#: qml/Wizard/Pages/30-wifi.qml:130
498msgid "Connected"
502msgid "Connected"
499−msgstr ""
503+msgstr "Koblet til"
500
504
501#: qml/Wizard/Pages/30-wifi.qml:163
505#: qml/Wizard/Pages/30-wifi.qml:163
502msgid "Available Wi-Fi networks"
506msgid "Available Wi-Fi networks"
503−msgstr ""
507+msgstr "Tilgjengelige trådløse nettverk"
504
508
505#: qml/Wizard/Pages/30-wifi.qml:164
509#: qml/Wizard/Pages/30-wifi.qml:164
506msgid "No available Wi-Fi networks"
510msgid "No available Wi-Fi networks"
507−msgstr ""
511+msgstr "Intet trådløst nettverk tilgjengelig"
508
512
509#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
513#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
510#: qml/Wizard/Pages/sim.qml:101
514#: qml/Wizard/Pages/sim.qml:101
@@ -513,98 +517,101 @@ msgstr "Hopp over"
513
517
514#: qml/Wizard/Pages/40-location.qml:27
518#: qml/Wizard/Pages/40-location.qml:27
515msgid "Location Services"
519msgid "Location Services"
516−msgstr ""
520+msgstr "Posisjonstjenester"
517
521
518#: qml/Wizard/Pages/40-location.qml:83
522#: qml/Wizard/Pages/40-location.qml:83
519msgid ""
523msgid ""
520"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
521"(recommended)"
525"(recommended)"
522msgstr ""
526msgstr ""
527+"Bruk GPS, åpne trådløse nettverk og mobilnett for å regne ut posisjon "
528+"anonymt (anbefales)"
523
529
524#: qml/Wizard/Pages/40-location.qml:105
530#: qml/Wizard/Pages/40-location.qml:105
525#, qt-format
531#, qt-format
526msgid "By selecting this option you agree to the Nokia HERE %1."
532msgid "By selecting this option you agree to the Nokia HERE %1."
527−msgstr ""
533+msgstr "Ved å velge dette godtar du %1 for Nokia HERE."
528
534
529#: qml/Wizard/Pages/40-location.qml:106
535#: qml/Wizard/Pages/40-location.qml:106
530msgctxt "part of: Nokia HERE terms and conditions"
536msgctxt "part of: Nokia HERE terms and conditions"
531msgid "terms and conditions"
537msgid "terms and conditions"
532−msgstr ""
538+msgstr "bruksvilkår"
533
539
534#: qml/Wizard/Pages/40-location.qml:160
540#: qml/Wizard/Pages/40-location.qml:160
535msgid "GPS only"
541msgid "GPS only"
536−msgstr ""
542+msgstr "Bare GPS"
537
543
538#: qml/Wizard/Pages/40-location.qml:214
544#: qml/Wizard/Pages/40-location.qml:214
539msgid "Don't use my location"
545msgid "Don't use my location"
540−msgstr ""
546+msgstr "Ikke bruk posisjon"
541
547
542#: qml/Wizard/Pages/40-location.qml:260
548#: qml/Wizard/Pages/40-location.qml:260
543msgid "You can change it later in System Settings."
549msgid "You can change it later in System Settings."
544−msgstr ""
550+msgstr "Du kan endre dette senere i systemoppsettet."
545
551
546#: qml/Wizard/Pages/50-timezone.qml:29
552#: qml/Wizard/Pages/50-timezone.qml:29
547msgid "Time Zone"
553msgid "Time Zone"
548−msgstr ""
554+msgstr "Tidssone"
549
555
550#: qml/Wizard/Pages/50-timezone.qml:178
556#: qml/Wizard/Pages/50-timezone.qml:178
551msgid "Enter your city"
557msgid "Enter your city"
552−msgstr ""
558+msgstr "Skriv inn by"
553
559
554#: qml/Wizard/Pages/60-account.qml:24
560#: qml/Wizard/Pages/60-account.qml:24
555msgid "Personalize Your Device"
561msgid "Personalize Your Device"
556−msgstr ""
562+msgstr "Tilpass enhet"
557
563
558#: qml/Wizard/Pages/60-account.qml:48
564#: qml/Wizard/Pages/60-account.qml:48
559msgid "Preferred Name"
565msgid "Preferred Name"
560−msgstr ""
566+msgstr "Foretrukket navn"
561
567
562#: qml/Wizard/Pages/70-passwd-type.qml:39
568#: qml/Wizard/Pages/70-passwd-type.qml:39
563msgid "Lock Screen"
569msgid "Lock Screen"
564−msgstr ""
570+msgstr "Låseskjerm"
565
571
566#: qml/Wizard/Pages/70-passwd-type.qml:101
572#: qml/Wizard/Pages/70-passwd-type.qml:101
567msgctxt "Label: Type of security method"
573msgctxt "Label: Type of security method"
568msgid "Create new password"
574msgid "Create new password"
569−msgstr ""
575+msgstr "Lag nytt passord"
570
576
571#: qml/Wizard/Pages/70-passwd-type.qml:103
577#: qml/Wizard/Pages/70-passwd-type.qml:103
572msgctxt "Label: Type of security method"
578msgctxt "Label: Type of security method"
573msgid "Create passcode (numbers only)"
579msgid "Create passcode (numbers only)"
574−msgstr ""
580+msgstr "Lag kode (kun tall)"
575
581
576#: qml/Wizard/Pages/70-passwd-type.qml:105
582#: qml/Wizard/Pages/70-passwd-type.qml:105
577msgctxt "Label: Type of security method"
583msgctxt "Label: Type of security method"
578msgid "No lock code"
584msgid "No lock code"
579−msgstr ""
585+msgstr "Ingen låsekode"
580
586
581#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
587#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
582msgid "Privacy Policy"
588msgid "Privacy Policy"
583−msgstr ""
589+msgstr "Personvernregler"
584
590
585#: qml/Wizard/Pages/75-report-check.qml:26
591#: qml/Wizard/Pages/75-report-check.qml:26
586msgid "Help Us Improve"
592msgid "Help Us Improve"
587−msgstr ""
593+msgstr "Hjelp oss med å bli bedre"
588
594
589#: qml/Wizard/Pages/75-report-check.qml:59
595#: qml/Wizard/Pages/75-report-check.qml:59
590msgid "Improve system performance by sending us crashes and error reports."
596msgid "Improve system performance by sending us crashes and error reports."
591msgstr ""
597msgstr ""
598+"Send oss kræsj- og feilrapporter og hjelp oss med å gjøre systemet bedre."
592
599
593#: qml/Wizard/Pages/75-report-check.qml:60
600#: qml/Wizard/Pages/75-report-check.qml:60
594msgid "Privacy policy"
601msgid "Privacy policy"
595−msgstr ""
602+msgstr "Personvernregler"
596
603
597#: qml/Wizard/Pages/80-finished.qml:89
604#: qml/Wizard/Pages/80-finished.qml:89
598msgid "Welcome to Ubuntu"
605msgid "Welcome to Ubuntu"
599−msgstr ""
606+msgstr "Velkommen til Ubuntu"
600
607
601#: qml/Wizard/Pages/80-finished.qml:104
608#: qml/Wizard/Pages/80-finished.qml:104
602msgid "You are ready to use your device now"
609msgid "You are ready to use your device now"
603−msgstr ""
610+msgstr "Enheten er nå klar til bruk"
604
611
605#: qml/Wizard/Pages/80-finished.qml:124
612#: qml/Wizard/Pages/80-finished.qml:124
606msgid "Get Started"
613msgid "Get Started"
607−msgstr ""
614+msgstr "Kom i gang"
608
615
609#: qml/Wizard/Pages/here-terms.qml:25
616#: qml/Wizard/Pages/here-terms.qml:25
610msgid "Terms & Conditions"
617msgid "Terms & Conditions"
@@ -612,7 +619,7 @@ msgstr "Brukervilkår"
612
619
613#: qml/Wizard/Pages/here-terms.qml:69
620#: qml/Wizard/Pages/here-terms.qml:69
614msgid "Your device uses positioning technologies provided by HERE."
621msgid "Your device uses positioning technologies provided by HERE."
615−msgstr ""
622+msgstr "Enheten bruker posisjonsteknologi via tjenesten HERE."
616
623
617#: qml/Wizard/Pages/here-terms.qml:81
624#: qml/Wizard/Pages/here-terms.qml:81
618msgid ""
625msgid ""
@@ -620,21 +627,26 @@ msgid ""
620"collects information about nearby cell towers and Wi-Fi hotspots around your "
627"collects information about nearby cell towers and Wi-Fi hotspots around your "
621"current location whenever your position is being found."
628"current location whenever your position is being found."
622msgstr ""
629msgstr ""
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."
623
632
624#: qml/Wizard/Pages/here-terms.qml:93
633#: qml/Wizard/Pages/here-terms.qml:93
625msgid ""
634msgid ""
626"The information collected is used to analyze the service and to improve the "
635"The information collected is used to analyze the service and to improve the "
627"use of service, but not to identify you personally."
636"use of service, but not to identify you personally."
628msgstr ""
637msgstr ""
638+"Informasjonen som samles inn blir brukt til å analysere tjenesten og "
639+"forbedre brukskvaliteten. Den blir ikke brukt til å identifisere deg "
640+"personlig."
629
641
630#: qml/Wizard/Pages/here-terms.qml:106
642#: qml/Wizard/Pages/here-terms.qml:106
631#, qt-format
643#, qt-format
632msgid "By continuing, you agree to the HERE platform %1 and %2."
644msgid "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."
634
646
635#: qml/Wizard/Pages/here-terms.qml:107
647#: qml/Wizard/Pages/here-terms.qml:107
636msgid "Service Terms"
648msgid "Service Terms"
637−msgstr ""
649+msgstr "tjenestevilkår"
638
650
639#: qml/Wizard/Pages/passcode-confirm.qml:43
651#: qml/Wizard/Pages/passcode-confirm.qml:43
640#: qml/Wizard/Pages/passcode-desktop.qml:80
652#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -643,69 +655,69 @@ msgstr "Bekreft kode"
643
655
644#: qml/Wizard/Pages/passcode-confirm.qml:45
656#: qml/Wizard/Pages/passcode-confirm.qml:45
645msgid "Incorrect passcode."
657msgid "Incorrect passcode."
646−msgstr ""
658+msgstr "Feil kode."
647
659
648#: qml/Wizard/Pages/passcode-confirm.qml:45
660#: qml/Wizard/Pages/passcode-confirm.qml:45
649msgctxt "Enter the passcode again"
661msgctxt "Enter the passcode again"
650msgid "Please re-enter."
662msgid "Please re-enter."
651−msgstr ""
663+msgstr "Tast koden på nytt"
652
664
653#: qml/Wizard/Pages/passcode-desktop.qml:30
665#: qml/Wizard/Pages/passcode-desktop.qml:30
654msgid "Lock Screen Passcode"
666msgid "Lock Screen Passcode"
655−msgstr ""
667+msgstr "Låseskjerm-kode"
656
668
657#: qml/Wizard/Pages/passcode-desktop.qml:56
669#: qml/Wizard/Pages/passcode-desktop.qml:56
658msgid "Enter 4 numbers to setup your passcode"
670msgid "Enter 4 numbers to setup your passcode"
659−msgstr ""
671+msgstr "Skriv inn 4 sifre som skal brukes som kode"
660
672
661#: qml/Wizard/Pages/passcode-desktop.qml:65
673#: qml/Wizard/Pages/passcode-desktop.qml:65
662#: qml/Wizard/Pages/passcode-set.qml:54
674#: qml/Wizard/Pages/passcode-set.qml:54
663msgid "Choose passcode"
675msgid "Choose passcode"
664−msgstr ""
676+msgstr "Velg kode"
665
677
666#: qml/Wizard/Pages/passcode-desktop.qml:105
678#: qml/Wizard/Pages/passcode-desktop.qml:105
667msgid "Passcode too short"
679msgid "Passcode too short"
668−msgstr ""
680+msgstr "Koden er for kort"
669
681
670#: qml/Wizard/Pages/passcode-desktop.qml:107
682#: qml/Wizard/Pages/passcode-desktop.qml:107
671msgid "Passcodes match"
683msgid "Passcodes match"
672−msgstr ""
684+msgstr "Kodene stemmer"
673
685
674#: qml/Wizard/Pages/passcode-desktop.qml:109
686#: qml/Wizard/Pages/passcode-desktop.qml:109
675msgid "Passcodes do not match"
687msgid "Passcodes do not match"
676−msgstr ""
688+msgstr "Kodene er ulike"
677
689
678#: qml/Wizard/Pages/passcode-set.qml:62
690#: qml/Wizard/Pages/passcode-set.qml:62
679msgid "Passcode must be 4 characters long"
691msgid "Passcode must be 4 characters long"
680−msgstr ""
692+msgstr "Koden må bestå av 4 sifre"
681
693
682#: qml/Wizard/Pages/password-set.qml:30
694#: qml/Wizard/Pages/password-set.qml:30
683msgid "Lock Screen Password"
695msgid "Lock Screen Password"
684−msgstr ""
696+msgstr "Låseskjerm-passord"
685
697
686#: qml/Wizard/Pages/password-set.qml:61
698#: qml/Wizard/Pages/password-set.qml:61
687msgid "Enter at least 8 characters"
699msgid "Enter at least 8 characters"
688−msgstr ""
700+msgstr "Skriv inn minst 8 tegn"
689
701
690#: qml/Wizard/Pages/password-set.qml:73
702#: qml/Wizard/Pages/password-set.qml:73
691msgid "Choose password"
703msgid "Choose password"
692−msgstr ""
704+msgstr "Velg passord"
693
705
694#: qml/Wizard/Pages/password-set.qml:103
706#: qml/Wizard/Pages/password-set.qml:103
695msgid "Confirm password"
707msgid "Confirm password"
696−msgstr ""
708+msgstr "Bekreft passord"
697
709
698#: qml/Wizard/Pages/sim.qml:27
710#: qml/Wizard/Pages/sim.qml:27
699msgid "No SIM card installed"
711msgid "No SIM card installed"
700−msgstr ""
712+msgstr "Ingen SIM-kort installert"
701
713
702#: qml/Wizard/Pages/sim.qml:54
714#: qml/Wizard/Pages/sim.qml:54
703msgid "SIM card added"
715msgid "SIM card added"
704−msgstr ""
716+msgstr "SIM-kort satt inn"
705
717
706#: qml/Wizard/Pages/sim.qml:55
718#: qml/Wizard/Pages/sim.qml:55
707msgid "You must restart the device to access the mobile network."
719msgid "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."
709
721
710#: qml/Wizard/Pages/sim.qml:59
722#: qml/Wizard/Pages/sim.qml:59
711msgid "Restart"
723msgid "Restart"
@@ -713,35 +725,35 @@ msgstr "Start på nytt"
713
725
714#: qml/Wizard/Pages/sim.qml:78
726#: qml/Wizard/Pages/sim.qml:78
715msgid "You won’t be able to make calls or use text messaging without a SIM."
727msgid "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."
717
729
718#: qml/Wizard/Pages/sim.qml:90
730#: qml/Wizard/Pages/sim.qml:90
719msgid "To proceed with no SIM tap Skip."
731msgid "To proceed with no SIM tap Skip."
720−msgstr ""
732+msgstr "Trykk «Hopp over» for å fortsette uten SIM-kort"
721
733
722#: qml/Wizard/PasswordMeter.qml:87
734#: qml/Wizard/PasswordMeter.qml:87
723msgid "Passwords match"
735msgid "Passwords match"
724−msgstr ""
736+msgstr "Passordene stemmer"
725
737
726#: qml/Wizard/PasswordMeter.qml:89
738#: qml/Wizard/PasswordMeter.qml:89
727msgid "Passwords do not match"
739msgid "Passwords do not match"
728−msgstr ""
740+msgstr "Passordene er ulike"
729
741
730#: qml/Wizard/PasswordMeter.qml:93
742#: qml/Wizard/PasswordMeter.qml:93
731msgid "Strong password"
743msgid "Strong password"
732−msgstr ""
744+msgstr "Sterkt passord"
733
745
734#: qml/Wizard/PasswordMeter.qml:95
746#: qml/Wizard/PasswordMeter.qml:95
735msgid "Fair password"
747msgid "Fair password"
736−msgstr ""
748+msgstr "Middels sterkt passord"
737
749
738#: qml/Wizard/PasswordMeter.qml:97
750#: qml/Wizard/PasswordMeter.qml:97
739msgid "Weak password"
751msgid "Weak password"
740−msgstr ""
752+msgstr "Svakt passord"
741
753
742#: qml/Wizard/PasswordMeter.qml:99
754#: qml/Wizard/PasswordMeter.qml:99
743msgid "Very weak password"
755msgid "Very weak password"
744−msgstr ""
756+msgstr "Veldig svakt passord"
745
757
746#~ msgid "Confirm"
758#~ msgid "Confirm"
747#~ msgstr "Bekreft"
759#~ msgstr "Bekreft"
@@ -1051,12 +1063,3 @@ msgstr ""
1051
1063
1052#~ msgid "Tomorrow %H:%M"
1064#~ msgid "Tomorrow %H:%M"
1053#~ msgstr "I morgen %H:%M"
1065#~ 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 ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"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"
12"Last-Translator: Krzysztof Tataradziński <Unknown>\n"
12"Last-Translator: Krzysztof Tataradziński <Unknown>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
18"|| n%100>=20) ? 1 : 2;\n"
18"|| 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"
20"X-Generator: Launchpad (build 17967)\n"
20"X-Generator: Launchpad (build 17967)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -430,6 +430,7 @@ msgstr "Oddzwoń"
430#: qml/Stages/SideStage.qml:76
430#: qml/Stages/SideStage.qml:76
431msgid "Drag using 3 fingers any application from one window to the other"
431msgid "Drag using 3 fingers any application from one window to the other"
432msgstr ""
432msgstr ""
433+"Przeciągnij 3 palcami jakąkolwiek aplikację z jednego okna do drugiego"
433
434
434#: qml/Tutorial/TutorialBottom.qml:78
435#: qml/Tutorial/TutorialBottom.qml:78
435msgid "Swipe up to add a contact"
436msgid "Swipe up to add a contact"
@@ -1048,12 +1049,3 @@ msgstr ""
1048
1049
1049#~ msgid "Call back"
1050#~ msgid "Call back"
1050#~ msgstr "Oddzwoń"
1051#~ 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 ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-03-23 10:01+0000\n"
10"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"
12"Last-Translator: P_E_T_O <Unknown>\n"
12"Last-Translator: P_E_T_O <Unknown>\n"
13"Language-Team: Slovak <sk@li.org>\n"
13"Language-Team: Slovak <sk@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
17"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"
18+"X-Launchpad-Export-Date: 2016-03-27 05:47+0000\n"
19−"X-Generator: Launchpad (build 17958)\n"
19+"X-Generator: Launchpad (build 17967)\n"
20"Language: sk\n"
20"Language: sk\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -189,11 +189,11 @@ msgstr "Pridať k obľúbeným"
189
189
190#: qml/Dash/FiltersPopover.qml:60
190#: qml/Dash/FiltersPopover.qml:60
191msgid "Refine your results"
191msgid "Refine your results"
192−msgstr ""
192+msgstr "Spresniť výsledky"
193
193
194#: qml/Dash/FiltersPopover.qml:69
194#: qml/Dash/FiltersPopover.qml:69
195msgid "Reset"
195msgid "Reset"
196−msgstr ""
196+msgstr "Resetovať"
197
197
198#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
198#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
199msgid "See less"
199msgid "See less"
@@ -210,11 +210,11 @@ msgstr "Hľadať"
210
210
211#: qml/Dash/PageHeaderExtraPanel.qml:55
211#: qml/Dash/PageHeaderExtraPanel.qml:55
212msgid "Recent Searches"
212msgid "Recent Searches"
213−msgstr ""
213+msgstr "Nedávne vyhľadávania"
214
214
215#: qml/Dash/PageHeaderExtraPanel.qml:66
215#: qml/Dash/PageHeaderExtraPanel.qml:66
216msgid "Clear All"
216msgid "Clear All"
217−msgstr ""
217+msgstr "Vymazať všetko"
218
218
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
220msgid "More..."
220msgid "More..."
@@ -437,50 +437,53 @@ msgstr "Zavolať naspäť"
437#: qml/Stages/SideStage.qml:76
437#: qml/Stages/SideStage.qml:76
438msgid "Drag using 3 fingers any application from one window to the other"
438msgid "Drag using 3 fingers any application from one window to the other"
439msgstr ""
439msgstr ""
440+"Potiahnite pomocou 3 prstov ľubovoľnú aplikáciu z jedného okna do druhého"
440
441
441#: qml/Tutorial/TutorialBottom.qml:78
442#: qml/Tutorial/TutorialBottom.qml:78
442msgid "Swipe up to add a contact"
443msgid "Swipe up to add a contact"
443−msgstr ""
444+msgstr "Potiahnuť dohora pre pridanie kontaktu"
444
445
445#: qml/Tutorial/TutorialBottom.qml:80
446#: qml/Tutorial/TutorialBottom.qml:80
446msgid "Swipe up for favorite calculations"
447msgid "Swipe up for favorite calculations"
447−msgstr ""
448+msgstr "Potiahnuť dohora pre obľúbené výpočty"
448
449
449#: qml/Tutorial/TutorialBottom.qml:82
450#: qml/Tutorial/TutorialBottom.qml:82
450msgid "Swipe up for recent calls"
451msgid "Swipe up for recent calls"
451−msgstr ""
452+msgstr "Potiahnuť dohora pre nedávne hovory"
452
453
453#: qml/Tutorial/TutorialBottom.qml:84
454#: qml/Tutorial/TutorialBottom.qml:84
454msgid "Swipe up to create a message"
455msgid "Swipe up to create a message"
455−msgstr ""
456+msgstr "Potiahnuť dohora pre vytvorenie správy"
456
457
457#: qml/Tutorial/TutorialBottom.qml:85
458#: qml/Tutorial/TutorialBottom.qml:85
458msgid "Swipe up to manage the app"
459msgid "Swipe up to manage the app"
459−msgstr ""
460+msgstr "Potiahnuť dohora pre spravovanie aplikácie"
460
461
461#: qml/Tutorial/TutorialLeft.qml:47
462#: qml/Tutorial/TutorialLeft.qml:47
462msgid "Swipe from the left edge to open the launcher"
463msgid "Swipe from the left edge to open the launcher"
463−msgstr ""
464+msgstr "Potiahnite od ľavého okraja pre otvorenie spúšťača"
464
465
465#: qml/Tutorial/TutorialLeftLong.qml:47
466#: qml/Tutorial/TutorialLeftLong.qml:47
466msgid "Long swipe from the left edge to open the Today scope"
467msgid "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"
468
469
469#: qml/Tutorial/TutorialRight.qml:54
470#: qml/Tutorial/TutorialRight.qml:54
470msgid "Hover your mouse on the right edge to view your open apps"
471msgid "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í"
472
473
473#: qml/Tutorial/TutorialRight.qml:55
474#: qml/Tutorial/TutorialRight.qml:55
474msgid "Short or long swipe from the right edge to view your open apps"
475msgid "Short or long swipe from the right edge to view your open apps"
475msgstr ""
476msgstr ""
477+"Krátke alebo dlhé potiahnutie od pravého okraja pre zobrazenie otvorených "
478+"aplikácií"
476
479
477#: qml/Tutorial/TutorialTop.qml:53
480#: qml/Tutorial/TutorialTop.qml:53
478msgid "Swipe from the top right edge to open the notification bar"
481msgid "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"
480
483
481#: qml/Tutorial/TutorialTop.qml:54
484#: qml/Tutorial/TutorialTop.qml:54
482msgid "Swipe from the top edge to open the notification bar"
485msgid "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"
484
487
485#: qml/Wizard/Page.qml:54
488#: qml/Wizard/Page.qml:54
486msgctxt "Button: Go back one page in the Wizard"
489msgctxt "Button: Go back one page in the Wizard"
@@ -489,7 +492,7 @@ msgstr "Naspäť"
489
492
490#: qml/Wizard/Pages/10-welcome.qml:27
493#: qml/Wizard/Pages/10-welcome.qml:27
491msgid "Language"
494msgid "Language"
492−msgstr ""
495+msgstr "Jazyk"
493
496
494#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
497#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
495#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
498#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
@@ -498,7 +501,7 @@ msgstr ""
498#: qml/Wizard/Pages/passcode-desktop.qml:124
501#: qml/Wizard/Pages/passcode-desktop.qml:124
499#: qml/Wizard/Pages/password-set.qml:141
502#: qml/Wizard/Pages/password-set.qml:141
500msgid "Next"
503msgid "Next"
501−msgstr ""
504+msgstr "Nasledujúca"
502
505
503#: qml/Wizard/Pages/30-wifi.qml:29
506#: qml/Wizard/Pages/30-wifi.qml:29
504msgid "Connect to Wi‑Fi"
507msgid "Connect to Wi‑Fi"
@@ -506,15 +509,15 @@ msgstr "Pripojiť k Wifi"
506
509
507#: qml/Wizard/Pages/30-wifi.qml:130
510#: qml/Wizard/Pages/30-wifi.qml:130
508msgid "Connected"
511msgid "Connected"
509−msgstr ""
512+msgstr "Pripojené"
510
513
511#: qml/Wizard/Pages/30-wifi.qml:163
514#: qml/Wizard/Pages/30-wifi.qml:163
512msgid "Available Wi-Fi networks"
515msgid "Available Wi-Fi networks"
513−msgstr ""
516+msgstr "Dostupné Wifi siete"
514
517
515#: qml/Wizard/Pages/30-wifi.qml:164
518#: qml/Wizard/Pages/30-wifi.qml:164
516msgid "No available Wi-Fi networks"
519msgid "No available Wi-Fi networks"
517−msgstr ""
520+msgstr "Žiadne dostupné Wifi siete"
518
521
519#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
522#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
520#: qml/Wizard/Pages/sim.qml:101
523#: qml/Wizard/Pages/sim.qml:101
@@ -523,98 +526,100 @@ msgstr "Preskočiť"
523
526
524#: qml/Wizard/Pages/40-location.qml:27
527#: qml/Wizard/Pages/40-location.qml:27
525msgid "Location Services"
528msgid "Location Services"
526−msgstr ""
529+msgstr "Služby určovania polohy"
527
530
528#: qml/Wizard/Pages/40-location.qml:83
531#: qml/Wizard/Pages/40-location.qml:83
529msgid ""
532msgid ""
530"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
533"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
531"(recommended)"
534"(recommended)"
532msgstr ""
535msgstr ""
536+"Používa GPS, Wifi hotspot a mobilný signál na anonymné zistenie polohy "
537+"(odporúčané)"
533
538
534#: qml/Wizard/Pages/40-location.qml:105
539#: qml/Wizard/Pages/40-location.qml:105
535#, qt-format
540#, qt-format
536msgid "By selecting this option you agree to the Nokia HERE %1."
541msgid "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."
538
543
539#: qml/Wizard/Pages/40-location.qml:106
544#: qml/Wizard/Pages/40-location.qml:106
540msgctxt "part of: Nokia HERE terms and conditions"
545msgctxt "part of: Nokia HERE terms and conditions"
541msgid "terms and conditions"
546msgid "terms and conditions"
542−msgstr ""
547+msgstr "podmienky"
543
548
544#: qml/Wizard/Pages/40-location.qml:160
549#: qml/Wizard/Pages/40-location.qml:160
545msgid "GPS only"
550msgid "GPS only"
546−msgstr ""
551+msgstr "Len GPS"
547
552
548#: qml/Wizard/Pages/40-location.qml:214
553#: qml/Wizard/Pages/40-location.qml:214
549msgid "Don't use my location"
554msgid "Don't use my location"
550−msgstr ""
555+msgstr "Nepoužívať moju polohu"
551
556
552#: qml/Wizard/Pages/40-location.qml:260
557#: qml/Wizard/Pages/40-location.qml:260
553msgid "You can change it later in System Settings."
558msgid "You can change it later in System Settings."
554−msgstr ""
559+msgstr "Môžete to zmeniť neskôr v Systémových nastaveniach."
555
560
556#: qml/Wizard/Pages/50-timezone.qml:29
561#: qml/Wizard/Pages/50-timezone.qml:29
557msgid "Time Zone"
562msgid "Time Zone"
558−msgstr ""
563+msgstr "Časové pásmo"
559
564
560#: qml/Wizard/Pages/50-timezone.qml:178
565#: qml/Wizard/Pages/50-timezone.qml:178
561msgid "Enter your city"
566msgid "Enter your city"
562−msgstr ""
567+msgstr "Zadajte svoje mesto"
563
568
564#: qml/Wizard/Pages/60-account.qml:24
569#: qml/Wizard/Pages/60-account.qml:24
565msgid "Personalize Your Device"
570msgid "Personalize Your Device"
566−msgstr ""
571+msgstr "Prispôsobte svoje zariadenie"
567
572
568#: qml/Wizard/Pages/60-account.qml:48
573#: qml/Wizard/Pages/60-account.qml:48
569msgid "Preferred Name"
574msgid "Preferred Name"
570−msgstr ""
575+msgstr "Preferované meno"
571
576
572#: qml/Wizard/Pages/70-passwd-type.qml:39
577#: qml/Wizard/Pages/70-passwd-type.qml:39
573msgid "Lock Screen"
578msgid "Lock Screen"
574−msgstr ""
579+msgstr "Uzamknutie obrazovky"
575
580
576#: qml/Wizard/Pages/70-passwd-type.qml:101
581#: qml/Wizard/Pages/70-passwd-type.qml:101
577msgctxt "Label: Type of security method"
582msgctxt "Label: Type of security method"
578msgid "Create new password"
583msgid "Create new password"
579−msgstr ""
584+msgstr "Vytvoriť nové heslo"
580
585
581#: qml/Wizard/Pages/70-passwd-type.qml:103
586#: qml/Wizard/Pages/70-passwd-type.qml:103
582msgctxt "Label: Type of security method"
587msgctxt "Label: Type of security method"
583msgid "Create passcode (numbers only)"
588msgid "Create passcode (numbers only)"
584−msgstr ""
589+msgstr "Vytvoriť heslo (len čísla)"
585
590
586#: qml/Wizard/Pages/70-passwd-type.qml:105
591#: qml/Wizard/Pages/70-passwd-type.qml:105
587msgctxt "Label: Type of security method"
592msgctxt "Label: Type of security method"
588msgid "No lock code"
593msgid "No lock code"
589−msgstr ""
594+msgstr "Bez uzamykacieho kódu"
590
595
591#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
596#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
592msgid "Privacy Policy"
597msgid "Privacy Policy"
593−msgstr ""
598+msgstr "Ochrana osobných údajov"
594
599
595#: qml/Wizard/Pages/75-report-check.qml:26
600#: qml/Wizard/Pages/75-report-check.qml:26
596msgid "Help Us Improve"
601msgid "Help Us Improve"
597−msgstr ""
602+msgstr "Pomôžte nám vylepšiť"
598
603
599#: qml/Wizard/Pages/75-report-check.qml:59
604#: qml/Wizard/Pages/75-report-check.qml:59
600msgid "Improve system performance by sending us crashes and error reports."
605msgid "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í."
602
607
603#: qml/Wizard/Pages/75-report-check.qml:60
608#: qml/Wizard/Pages/75-report-check.qml:60
604msgid "Privacy policy"
609msgid "Privacy policy"
605−msgstr ""
610+msgstr "Ochrana osobných údajov"
606
611
607#: qml/Wizard/Pages/80-finished.qml:89
612#: qml/Wizard/Pages/80-finished.qml:89
608msgid "Welcome to Ubuntu"
613msgid "Welcome to Ubuntu"
609−msgstr ""
614+msgstr "Vitajte v Ubuntu"
610
615
611#: qml/Wizard/Pages/80-finished.qml:104
616#: qml/Wizard/Pages/80-finished.qml:104
612msgid "You are ready to use your device now"
617msgid "You are ready to use your device now"
613−msgstr ""
618+msgstr "Ste pripravený používať vaše zariadenie"
614
619
615#: qml/Wizard/Pages/80-finished.qml:124
620#: qml/Wizard/Pages/80-finished.qml:124
616msgid "Get Started"
621msgid "Get Started"
617−msgstr ""
622+msgstr "Začať"
618
623
619#: qml/Wizard/Pages/here-terms.qml:25
624#: qml/Wizard/Pages/here-terms.qml:25
620msgid "Terms & Conditions"
625msgid "Terms & Conditions"
@@ -622,7 +627,7 @@ msgstr "Všeobecné obchodné podmienky"
622
627
623#: qml/Wizard/Pages/here-terms.qml:69
628#: qml/Wizard/Pages/here-terms.qml:69
624msgid "Your device uses positioning technologies provided by HERE."
629msgid "Your device uses positioning technologies provided by HERE."
625−msgstr ""
630+msgstr "Zariadenie používa lokalizačné technológie poskytované HERE."
626
631
627#: qml/Wizard/Pages/here-terms.qml:81
632#: qml/Wizard/Pages/here-terms.qml:81
628msgid ""
633msgid ""
@@ -630,21 +635,26 @@ msgid ""
630"collects information about nearby cell towers and Wi-Fi hotspots around your "
635"collects information about nearby cell towers and Wi-Fi hotspots around your "
631"current location whenever your position is being found."
636"current location whenever your position is being found."
632msgstr ""
637msgstr ""
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."
633
641
634#: qml/Wizard/Pages/here-terms.qml:93
642#: qml/Wizard/Pages/here-terms.qml:93
635msgid ""
643msgid ""
636"The information collected is used to analyze the service and to improve the "
644"The information collected is used to analyze the service and to improve the "
637"use of service, but not to identify you personally."
645"use of service, but not to identify you personally."
638msgstr ""
646msgstr ""
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."
639
649
640#: qml/Wizard/Pages/here-terms.qml:106
650#: qml/Wizard/Pages/here-terms.qml:106
641#, qt-format
651#, qt-format
642msgid "By continuing, you agree to the HERE platform %1 and %2."
652msgid "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."
644
654
645#: qml/Wizard/Pages/here-terms.qml:107
655#: qml/Wizard/Pages/here-terms.qml:107
646msgid "Service Terms"
656msgid "Service Terms"
647−msgstr ""
657+msgstr "Servisné podmienky"
648
658
649#: qml/Wizard/Pages/passcode-confirm.qml:43
659#: qml/Wizard/Pages/passcode-confirm.qml:43
650#: qml/Wizard/Pages/passcode-desktop.qml:80
660#: qml/Wizard/Pages/passcode-desktop.qml:80
@@ -653,105 +663,106 @@ msgstr "Potvrdiť heslo"
653
663
654#: qml/Wizard/Pages/passcode-confirm.qml:45
664#: qml/Wizard/Pages/passcode-confirm.qml:45
655msgid "Incorrect passcode."
665msgid "Incorrect passcode."
656−msgstr ""
666+msgstr "Nesprávne heslo."
657
667
658#: qml/Wizard/Pages/passcode-confirm.qml:45
668#: qml/Wizard/Pages/passcode-confirm.qml:45
659msgctxt "Enter the passcode again"
669msgctxt "Enter the passcode again"
660msgid "Please re-enter."
670msgid "Please re-enter."
661−msgstr ""
671+msgstr "Zadajte znova."
662
672
663#: qml/Wizard/Pages/passcode-desktop.qml:30
673#: qml/Wizard/Pages/passcode-desktop.qml:30
664msgid "Lock Screen Passcode"
674msgid "Lock Screen Passcode"
665−msgstr ""
675+msgstr "Heslo uzamykacej obrazovky"
666
676
667#: qml/Wizard/Pages/passcode-desktop.qml:56
677#: qml/Wizard/Pages/passcode-desktop.qml:56
668msgid "Enter 4 numbers to setup your passcode"
678msgid "Enter 4 numbers to setup your passcode"
669−msgstr ""
679+msgstr "Zadajte 4 čísla pre nastavenie hesla"
670
680
671#: qml/Wizard/Pages/passcode-desktop.qml:65
681#: qml/Wizard/Pages/passcode-desktop.qml:65
672#: qml/Wizard/Pages/passcode-set.qml:54
682#: qml/Wizard/Pages/passcode-set.qml:54
673msgid "Choose passcode"
683msgid "Choose passcode"
674−msgstr ""
684+msgstr "Zvoliť heslo"
675
685
676#: qml/Wizard/Pages/passcode-desktop.qml:105
686#: qml/Wizard/Pages/passcode-desktop.qml:105
677msgid "Passcode too short"
687msgid "Passcode too short"
678−msgstr ""
688+msgstr "Heslo príliš krátke"
679
689
680#: qml/Wizard/Pages/passcode-desktop.qml:107
690#: qml/Wizard/Pages/passcode-desktop.qml:107
681msgid "Passcodes match"
691msgid "Passcodes match"
682−msgstr ""
692+msgstr "Zhoda hesiel"
683
693
684#: qml/Wizard/Pages/passcode-desktop.qml:109
694#: qml/Wizard/Pages/passcode-desktop.qml:109
685msgid "Passcodes do not match"
695msgid "Passcodes do not match"
686−msgstr ""
696+msgstr "Heslá sa nezhodujú"
687
697
688#: qml/Wizard/Pages/passcode-set.qml:62
698#: qml/Wizard/Pages/passcode-set.qml:62
689msgid "Passcode must be 4 characters long"
699msgid "Passcode must be 4 characters long"
690−msgstr ""
700+msgstr "Heslo musí mať 4 znaky"
691
701
692#: qml/Wizard/Pages/password-set.qml:30
702#: qml/Wizard/Pages/password-set.qml:30
693msgid "Lock Screen Password"
703msgid "Lock Screen Password"
694−msgstr ""
704+msgstr "Heslo uzamykacej obrazovky"
695
705
696#: qml/Wizard/Pages/password-set.qml:61
706#: qml/Wizard/Pages/password-set.qml:61
697msgid "Enter at least 8 characters"
707msgid "Enter at least 8 characters"
698−msgstr ""
708+msgstr "Zadajte najmenej 8 znakov"
699
709
700#: qml/Wizard/Pages/password-set.qml:73
710#: qml/Wizard/Pages/password-set.qml:73
701msgid "Choose password"
711msgid "Choose password"
702−msgstr ""
712+msgstr "Zvoliť heslo"
703
713
704#: qml/Wizard/Pages/password-set.qml:103
714#: qml/Wizard/Pages/password-set.qml:103
705msgid "Confirm password"
715msgid "Confirm password"
706−msgstr ""
716+msgstr "Potvrdiť heslo"
707
717
708#: qml/Wizard/Pages/sim.qml:27
718#: qml/Wizard/Pages/sim.qml:27
709msgid "No SIM card installed"
719msgid "No SIM card installed"
710−msgstr ""
720+msgstr "Žiadna SIM karta nainštalovaná"
711
721
712#: qml/Wizard/Pages/sim.qml:54
722#: qml/Wizard/Pages/sim.qml:54
713msgid "SIM card added"
723msgid "SIM card added"
714−msgstr ""
724+msgstr "Vložená SIM karta"
715
725
716#: qml/Wizard/Pages/sim.qml:55
726#: qml/Wizard/Pages/sim.qml:55
717msgid "You must restart the device to access the mobile network."
727msgid "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."
719
729
720#: qml/Wizard/Pages/sim.qml:59
730#: qml/Wizard/Pages/sim.qml:59
721msgid "Restart"
731msgid "Restart"
722−msgstr ""
732+msgstr "Reštart"
723
733
724#: qml/Wizard/Pages/sim.qml:78
734#: qml/Wizard/Pages/sim.qml:78
725msgid "You won’t be able to make calls or use text messaging without a SIM."
735msgid "You won’t be able to make calls or use text messaging without a SIM."
726msgstr ""
736msgstr ""
737+"Bez SIM karty nebudete môcť telefonovať alebo používať textové správy."
727
738
728#: qml/Wizard/Pages/sim.qml:90
739#: qml/Wizard/Pages/sim.qml:90
729msgid "To proceed with no SIM tap Skip."
740msgid "To proceed with no SIM tap Skip."
730−msgstr ""
741+msgstr "Pre pokračovanie bez SIM karty stlačte Preskočiť."
731
742
732#: qml/Wizard/PasswordMeter.qml:87
743#: qml/Wizard/PasswordMeter.qml:87
733msgid "Passwords match"
744msgid "Passwords match"
734−msgstr ""
745+msgstr "Heslá sa zhodujú"
735
746
736#: qml/Wizard/PasswordMeter.qml:89
747#: qml/Wizard/PasswordMeter.qml:89
737msgid "Passwords do not match"
748msgid "Passwords do not match"
738−msgstr ""
749+msgstr "Heslá sa nezhodujú"
739
750
740#: qml/Wizard/PasswordMeter.qml:93
751#: qml/Wizard/PasswordMeter.qml:93
741msgid "Strong password"
752msgid "Strong password"
742−msgstr ""
753+msgstr "Heslo je silné"
743
754
744#: qml/Wizard/PasswordMeter.qml:95
755#: qml/Wizard/PasswordMeter.qml:95
745msgid "Fair password"
756msgid "Fair password"
746−msgstr ""
757+msgstr "Heslo je prijateľné"
747
758
748#: qml/Wizard/PasswordMeter.qml:97
759#: qml/Wizard/PasswordMeter.qml:97
749msgid "Weak password"
760msgid "Weak password"
750−msgstr ""
761+msgstr "Heslo je slabé"
751
762
752#: qml/Wizard/PasswordMeter.qml:99
763#: qml/Wizard/PasswordMeter.qml:99
753msgid "Very weak password"
764msgid "Very weak password"
754−msgstr ""
765+msgstr "Heslo je veľmi slabé"
755
766
756#~ msgctxt "Title: Reboot/Shut down dialog"
767#~ msgctxt "Title: Reboot/Shut down dialog"
757#~ msgid "Shut down"
768#~ msgid "Shut down"
@@ -816,9 +827,6 @@ msgstr ""
816#~ msgid "Hi!"
827#~ msgid "Hi!"
817#~ msgstr "Ahoj!"
828#~ msgstr "Ahoj!"
818
829
819−#~ msgid "Welcome to your Ubuntu device."
820−#~ msgstr "Vitajte vo svojom Ubuntu zariadení."
821−
822#~ msgid "Let’s get started."
830#~ msgid "Let’s get started."
823#~ msgstr "Začíname."
831#~ msgstr "Začíname."
824
832
@@ -834,9 +842,6 @@ msgstr ""
834#~ msgid "Lock security"
842#~ msgid "Lock security"
835#~ msgstr "Bezpečnosť uzamknutia"
843#~ msgstr "Bezpečnosť uzamknutia"
836
844
837−#~ msgid "Please select how you’d like to unlock your device."
838−#~ msgstr "Prosím vyberte, ako by ste chceli odblokovať zariadenie."
839−
840#~ msgctxt "Label: Type of security method"
845#~ msgctxt "Label: Type of security method"
841#~ msgid "Swipe"
846#~ msgid "Swipe"
842#~ msgstr "Potiahnuť"
847#~ msgstr "Potiahnuť"
@@ -915,9 +920,6 @@ msgstr ""
915#~ msgid "Nice work!"
920#~ msgid "Nice work!"
916#~ msgstr "Dobrá práca!"
921#~ msgstr "Dobrá práca!"
917
922
918−#~ msgid "Your device is now ready to use."
919−#~ msgstr "Vaše zariadenie je teraz pripravené."
920−
921#~ msgid "Finish"
923#~ msgid "Finish"
922#~ msgstr "Dokončiť"
924#~ msgstr "Dokončiť"
923
925
po/sv.po+1−1
@@ -15,7 +15,7 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-25 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-26 05:44+0000\n"
19"X-Generator: Launchpad (build 17967)\n"
19"X-Generator: Launchpad (build 17967)\n"
20"Language: sv\n"
20"Language: sv\n"
21
21
qml/Components/Lockscreen.qml+2−2
@@ -253,10 +253,10 @@ Showable {
253
253
254 Component {
254 Component {
255 id: infoPopupComponent
255 id: infoPopupComponent
256− Dialog {
256+ ShellDialog {
257 id: dialog
257 id: dialog
258 objectName: "infoPopup"
258 objectName: "infoPopup"
259− modal: true
259+ property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
260
260
261 Button {
261 Button {
262 objectName: "infoPopupOkButton"
262 objectName: "infoPopupOkButton"
qml/Greeter/Greeter.qml+1−1
@@ -61,7 +61,7 @@ Showable {
61
61
62 function forceShow() {
62 function forceShow() {
63 showNow();
63 showNow();
64− loader.item.reset();
64+ d.selectUser(d.currentIndex, true);
65 }
65 }
66
66
67 function notifyAppFocused(appId) {
67 function notifyAppFocused(appId) {
qml/Stages/DesktopStage.qml+3
@@ -36,6 +36,9 @@ AbstractStage {
36 }
36 }
37 }
37 }
38
38
39+ // Used by TutorialRight
40+ property bool spreadShown: spread.state == "altTab"
41+
39 mainApp: ApplicationManager.focusedApplicationId
42 mainApp: ApplicationManager.focusedApplicationId
40 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
43 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
41 : null
44 : null
qml/Tutorial/TutorialRight.qml+2−1
@@ -47,11 +47,12 @@ TutorialPage {
47 anchors.right: root.right
47 anchors.right: root.right
48 anchors.rightMargin: units.gu(2)
48 anchors.rightMargin: units.gu(2)
49 anchors.verticalCenter: root.verticalCenter
49 anchors.verticalCenter: root.verticalCenter
50+ rotation: usageScenario === "desktop" ? 180 : 0
50 }
51 }
51
52
52 label {
53 label {
53 text: root.usageScenario === "desktop" ?
54 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") :
55 i18n.tr("Short or long swipe from the right edge to view your open apps")
56 i18n.tr("Short or long swipe from the right edge to view your open apps")
56 anchors.right: arrow.left
57 anchors.right: arrow.left
57 anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
58 anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
tests/plugins/AccountsService/CMakeLists.txt+2−1
@@ -5,7 +5,7 @@ else()
5endif()
5endif()
6macro(make_dbus_class NAME INTERFACE)
6macro(make_dbus_class NAME INTERFACE)
7 if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)
7 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})
9 endif()
9 endif()
10endmacro(make_dbus_class)
10endmacro(make_dbus_class)
11
11
@@ -20,6 +20,7 @@ make_dbus_class(UscInput com.canonical.Unity.Input)
20
20
21include_directories(
21include_directories(
22 ${CMAKE_CURRENT_BINARY_DIR}
22 ${CMAKE_CURRENT_BINARY_DIR}
23+ ${CMAKE_CURRENT_SOURCE_DIR}
23 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
24 )
25 )
25
26
tests/plugins/AccountsService/PropertiesServer.cpp+36−7
@@ -25,9 +25,7 @@
25#include <QDBusMessage>
25#include <QDBusMessage>
26#include <QDBusMetaType>
26#include <QDBusMetaType>
27
27
28−using StringMap = QMap<QString,QString>;
28+#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")
29−using StringMapList = QList<StringMap>;
30−Q_DECLARE_METATYPE(StringMapList)
31
29
32PropertiesServer::PropertiesServer(QObject *parent)
30PropertiesServer::PropertiesServer(QObject *parent)
33 : QObject(parent)
31 : QObject(parent)
@@ -62,6 +60,38 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co
62{
60{
63 QVariant newValue = variant.variant();
61 QVariant newValue = variant.variant();
64
62
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+
65 if (m_properties[interface].contains(property)) {
95 if (m_properties[interface].contains(property)) {
66 QVariant& oldValue = m_properties[interface][property];
96 QVariant& oldValue = m_properties[interface][property];
67 if (oldValue != newValue) {
97 if (oldValue != newValue) {
@@ -69,14 +99,12 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co
69 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&
99 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&
70 property == QStringLiteral("LauncherItems")) {
100 property == QStringLiteral("LauncherItems")) {
71 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));
101 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>()));
74 }
102 }
75
103
76 oldValue = newValue;
104 oldValue = newValue;
77
105
78 // Special case for user properties.
106 // Special case for user properties.
79− if (interface == "org.freedesktop.Accounts.User") {
107+ if (interface == IFACE_ACCOUNTS_USER) {
80 Q_EMIT Changed();
108 Q_EMIT Changed();
81 } else {
109 } else {
82 QVariantMap propertyChanges;
110 QVariantMap propertyChanges;
@@ -108,6 +136,7 @@ void PropertiesServer::Reset()
108 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;
136 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;
109 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
137 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
110 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";
138 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";
111− m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";
139+ m_properties["org.freedesktop.Accounts.User"]["Email"] = "";
112 m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());
140 m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());
141+ m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";
113}
142}
tests/plugins/AccountsService/PropertiesServer.h+7
@@ -24,6 +24,7 @@
24#include <QDBusVariant>
24#include <QDBusVariant>
25#include <QObject>
25#include <QObject>
26#include <QString>
26#include <QString>
27+#include "types.h"
27
28
28class PropertiesServer: public QObject, protected QDBusContext
29class PropertiesServer: public QObject, protected QDBusContext
29{
30{
@@ -36,6 +37,10 @@ public Q_SLOTS:
36 QDBusVariant Get(const QString &interface, const QString &property) const;
37 QDBusVariant Get(const QString &interface, const QString &property) const;
37 QVariantMap GetAll(const QString &interface) const;
38 QVariantMap GetAll(const QString &interface) const;
38 void Set(const QString &interface, const QString &property, const QDBusVariant &variant);
39 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);
39
44
40 // mock only.
45 // mock only.
41 void Reset();
46 void Reset();
@@ -45,6 +50,8 @@ Q_SIGNALS:
45 void Changed();
50 void Changed();
46
51
47private:
52private:
53+ void internalSet(const QString &interface, const QString &property, const QVariant &variant);
54+
48 QHash<QString, QVariantMap> m_properties;
55 QHash<QString, QVariantMap> m_properties;
49};
56};
50
57
tests/plugins/AccountsService/client.cpp+46−12
@@ -19,16 +19,13 @@
19
19
20#include "AccountsService.h"
20#include "AccountsService.h"
21#include "AccountsServiceDBusAdaptor.h"
21#include "AccountsServiceDBusAdaptor.h"
22+#include "types.h"
22#include <QSignalSpy>
23#include <QSignalSpy>
23#include <QTest>
24#include <QTest>
24#include <QDebug>
25#include <QDebug>
25#include <QDBusReply>
26#include <QDBusReply>
26#include <QDBusMetaType>
27#include <QDBusMetaType>
27
28
28−using StringMap = QMap<QString,QString>;
29−using StringMapList = QList<StringMap>;
30−Q_DECLARE_METATYPE(StringMapList)
31−
32template <class T>
29template <class T>
33QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
30QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
34
31
@@ -263,10 +260,13 @@ private Q_SLOTS:
263 AccountsService session(this, QTest::currentTestFunction());
260 AccountsService session(this, QTest::currentTestFunction());
264
261
265 QCOMPARE(session.backgroundFile(), QString());
262 QCOMPARE(session.backgroundFile(), QString());
266− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
263+
264+ QDBusInterface accountsIface(m_userInterface->service(),
265+ m_userInterface->path(),
267− "org.freedesktop.Accounts.User",
266+ "org.freedesktop.Accounts.User");
268− "BackgroundFile",
267+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetBackgroundFile",
269− dbusVariant("/test/BackgroundFile")));
268+ "/test/BackgroundFile"));
269+
270 QTRY_COMPARE(session.backgroundFile(), QString("/test/BackgroundFile"));
270 QTRY_COMPARE(session.backgroundFile(), QString("/test/BackgroundFile"));
271 }
271 }
272
272
@@ -311,6 +311,39 @@ private Q_SLOTS:
311 QCOMPARE(arguments.at(0).toInt(), 0);
311 QCOMPARE(arguments.at(0).toInt(), 0);
312 }
312 }
313
313
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+
314 void testAsynchronousChangeForKeymaps()
347 void testAsynchronousChangeForKeymaps()
315 {
348 {
316 AccountsService session(this, QTest::currentTestFunction());
349 AccountsService session(this, QTest::currentTestFunction());
@@ -325,10 +358,11 @@ private Q_SLOTS:
325 map2.insert("xkb", "fr");
358 map2.insert("xkb", "fr");
326 inputSources.append(map2);
359 inputSources.append(map2);
327
360
361+ QDBusInterface accountsIface(m_userInterface->service(),
328− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
362+ m_userInterface->path(),
329− "org.freedesktop.Accounts.User",
363+ "org.freedesktop.Accounts.User");
330− "InputSources",
364+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetInputSources",
331− QVariant::fromValue(QDBusVariant(QVariant::fromValue(inputSources)))));
365+ QVariant::fromValue(inputSources)));
332 QStringList result = {"cz+qwerty", "fr"};
366 QStringList result = {"cz+qwerty", "fr"};
333 QTRY_COMPARE(session.keymaps(), result);
367 QTRY_COMPARE(session.keymaps(), result);
334 }
368 }
tests/plugins/AccountsService/interfaces.xml+13
@@ -42,6 +42,19 @@
42 <interface name="com.ubuntu.location.providers.here.AccountsService" />
42 <interface name="com.ubuntu.location.providers.here.AccountsService" />
43 <interface name="org.freedesktop.Accounts.User">
43 <interface name="org.freedesktop.Accounts.User">
44 <signal name="Changed" />
44 <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>
45 </interface>
58 </interface>
46 <interface name="com.canonical.unity.AccountsService.Private" />
59 <interface name="com.canonical.unity.AccountsService.Private" />
47
60
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:
66 QCOMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
66 QCOMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
67 QStringLiteral(""));
67 QStringLiteral(""));
68
68
69− // The real AccountsService doesn't let you set via dbus properties. You
69+ QDBusInterface accountsIface(m_user->service(),
70− // have to call SetRealName instead (so that they can protect the call
70+ m_user->path(),
71− // via policykit). But our test server does let us.
71+ "org.freedesktop.Accounts.User");
72− QVariant wrapped = QVariant::fromValue(QDBusVariant(QStringLiteral("Test User")));
73− QDBusReply<void> reply = m_user->call(QStringLiteral("Set"),
72+ QDBusReply<void> reply = accountsIface.call(QStringLiteral("SetRealName"),
74− QStringLiteral("org.freedesktop.Accounts.User"),
73+ QStringLiteral("Test User"));
75− QStringLiteral("RealName"),
76− wrapped);
77 QVERIFY(reply.isValid());
74 QVERIFY(reply.isValid());
78
75
79 QTRY_COMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
76 QTRY_COMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
tests/qmltests/Greeter/tst_Greeter.qml+1
@@ -551,6 +551,7 @@ Item {
551
551
552 LightDM.Greeter.showGreeter();
552 LightDM.Greeter.showGreeter();
553 compare(viewResetSpy.count, 1);
553 compare(viewResetSpy.count, 1);
554+ tryCompare(viewShowPromptSpy, "count", 1);
554 }
555 }
555 }
556 }
556}
557}
tests/qmltests/Greeter/tst_NarrowView.qml+3−1
@@ -27,6 +27,8 @@ Item {
27 width: units.gu(90)
27 width: units.gu(90)
28 height: units.gu(80)
28 height: units.gu(80)
29
29
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
30 Row {
32 Row {
31 anchors.fill: parent
33 anchors.fill: parent
32 Loader {
34 Loader {
@@ -61,7 +63,7 @@ Item {
61
63
62 Rectangle {
64 Rectangle {
63 id: controls
65 id: controls
64− color: "white"
66+ color: theme.palette.normal.background
65 width: units.gu(40)
67 width: units.gu(40)
66 height: parent.height
68 height: parent.height
67
69
tests/qmltests/Tutorial/tst_Tutorial.qml+17−1
@@ -408,7 +408,7 @@ Rectangle {
408 ApplicationManager.startApplication("gallery-app");
408 ApplicationManager.startApplication("gallery-app");
409
409
410 var launcher = findChild(shell, "launcher");
410 var launcher = findChild(shell, "launcher");
411− var tutorialLeft = findChild(shell, "tutorialLeft");
411+ var tutorialLeft = findChild(shell, "tutorialLeftLoader");
412 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
412 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
413
413
414 tryCompare(tutorialLeft, "shown", false);
414 tryCompare(tutorialLeft, "shown", false);
@@ -764,6 +764,22 @@ Rectangle {
764 tryCompare(tutorialRightLoader, "shown", true);
764 tryCompare(tutorialRightLoader, "shown", true);
765 }
765 }
766
766
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+
767 function test_oskDoesNotHideTutorial() {
783 function test_oskDoesNotHideTutorial() {
768 var tutorialLeft = findChild(shell, "tutorialLeft");
784 var tutorialLeft = findChild(shell, "tutorialLeft");
769 verify(tutorialLeft.shown);
785 verify(tutorialLeft.shown);
tests/qmltests/tst_Shell.qml+3−1
@@ -1140,7 +1140,9 @@ Rectangle {
1140
1140
1141 showGreeter();
1141 showGreeter();
1142
1142
1143+ var greeter = findChild(shell, "greeter");
1144+ verify(!greeter.locked);
1143− tryCompare(sessionSpy, "count", 1);
1145+ verify(sessionSpy.count > 0);
1144 }
1146 }
1145
1147
1146 function test_fullscreen() {
1148 function test_fullscreen() {