ubuntu-system-settings

Merge lp:~mterry/ubuntu-system-settings/wizard-refresh-take-6 into lp:ubuntu-system-settings

  1. wizard-refresh-take-6
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1075
Merged at revision: 1123
Proposed branch: lp:~mterry/ubuntu-system-settings/wizard-refresh-take-6
Merge into: lp:ubuntu-system-settings
Diff against target: 4979 lines (+2038/-1834)
22 files modified
plugins/about/DevMode.qml (+1/-1)
plugins/security-privacy/LockSecurity.qml (+9/-9)
plugins/security-privacy/PhoneLocking.qml (+1/-1)
plugins/security-privacy/securityprivacy.cpp (+1/-1)
po/ubuntu-system-settings.pot (+1662/-1613)
wizard/CMakeLists.txt (+2/-2)
wizard/PageList.cpp (+5/-0)
wizard/Utils/system.cpp (+6/-2)
wizard/main.cpp (+7/-3)
wizard/qml/Components/Page.qml (+7/-1)
wizard/qml/Components/StackButton.qml (+11/-24)
wizard/qml/Pages/20-sim.qml (+23/-7)
wizard/qml/Pages/30-passwd-type.qml (+60/-131)
wizard/qml/Pages/31-passwd-set.qml (+86/-0)
wizard/qml/Pages/40-wifi.qml (+3/-3)
wizard/qml/Pages/50-location.qml (+32/-20)
wizard/qml/Pages/60-reporting.qml (+5/-7)
wizard/qml/Pages/80-finished.qml (+2/-3)
wizard/qml/Pages/here-terms.qml (+4/-2)
wizard/qml/Pages/passwd-confirm.qml (+68/-0)
wizard/qml/main.qml (+41/-2)
wizard/test.sh (+2/-2)
To merge this branch: bzr merge lp:~mterry/ubuntu-system-settings/wizard-refresh-take-6
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Sebastien Bacher (community) Approve
Ken VanDine Needs Information
Review via email: mp+235720@code.launchpad.net

Commit message

Complete the unlock security screens and update a host of other small design issues. (LP: #1365034, LP: #1348362)

Here's a list of the things this branch does:

A) Renames PIN code back to passcode
B) Makes a couple small wizard-testing changes to make it easier to run the wizard locally
C) Makes all buttons the chevron-style buttons (no more flat buttons)
D) Allows wizard pages to define a 'skip' value indicating whether they should be skipped (and a 'skipValid' value in case that check has to be done asynchronously). Previously, the only way to skip a page was to include logic on the previous page. This way things are more self-contained.
E) Some small text changes and widget adjustments around the place
F) And finally, the big point of this merge, the total redesign of the lock security security. We now ask for the password in the same way the user will be prompted at the greeter.

Description of the change

Complete the unlock security screens and update a host of other small design issues. (LP: #1365034, LP: #1348362)

Here's a list of the things this branch does:

A) Renames PIN code back to passcode
B) Makes a couple small wizard-testing changes to make it easier to run the wizard locally
C) Makes all buttons the chevron-style buttons (no more flat buttons)
D) Allows wizard pages to define a 'skip' value indicating whether they should be skipped (and a 'skipValid' value in case that check has to be done asynchronously). Previously, the only way to skip a page was to include logic on the previous page. This way things are more self-contained.
E) Some small text changes and widget adjustments around the place
F) And finally, the big point of this merge, the total redesign of the lock security security. We now ask for the password in the same way the user will be prompted at the greeter.

Oh, and this requires the following branch to land:
https://code.launchpad.net/~mterry/unity8/lockscreen-fixes-for-wizard/+merge/235630

Visuals here:
https://drive.google.com/a/canonical.com/folderview?id=0B8I8ZVKH-8SsM1QyMmhWbkpRLTg

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes, except on krillin

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 It was all from their designs

 * What components might get impacted by your changes?
 Wizard only

 * Have you requested review by the teams of these owning components?
 Yes

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1067
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4054
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4054/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1541/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1552/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4073
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4073/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1552/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Needs Information
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I see now the ">" in that string I complained about was directly from the design, seems odd to me but OK. From reviewing the diff, I'm happy with this branch but I haven't tested it yet. I'll test it in the morning.

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks for the upstart job fails,

"file:///usr/share/ubuntu/settings/wizard/ubuntu/settings/wizard/qml/main.qml: File not found"

it looks like the
" - view->setSource(QUrl(rootDir + "/qml/main.qml"));
 + view->setSource(QUrl(rootDir + "/ubuntu/settings/wizard/qml/main.qml"));"

change is buggy

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

urg, was supposed to be "thanks for the work, but the upstart job fails" ;-)

Revision history for this message
Sebastien Bacher (seb128) wrote :

seems like the design changed and the wizard needs some tweaks as well...

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

I'm so sorry for the upstart failure. That was my bad, not rebuilding correctly after changing main.cpp. Fixed now.

I've also updated some UI bits that have changed because Design edited the visuals again. I think they will be 100% done tomorrow... Let's see. I will mark this WIP for now.

Revision history for this message
Michael Terry (mterry) wrote :

Ugh, Design still isn't done tweaking, but we need to land the rest of the goodness here, so marking "Needs review" again

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1072
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1600/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4228/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1600/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, I think we shouldn't that too much on details, it's a non trivial changeset including UI and strings changes, some comments though

- entering the passcode seems to display another label in the bottom/right button for a second before changing page (I couldn't manage to read it but it seems to change geometry/looks weird)

- the enter passcode screen has a skip button, is that by design?

- the design got updated to address bug #1374504, can we include that as well (change the "report a bug" for "improve the experience")

- the wifi page has a label "no network available" before the aps list, dispite having quite some items in the list and being connected to one, do you see that as well?

The first two are nitpick, the other ones would be nice to address before merging. Out of those little details consider that has a +1 from me to get that landing

review: Needs Fixing
lp:~mterry/ubuntu-system-settings/wizard-refresh-take-6 updated
1073. By Michael Terry

Merge from trunk

1074. By Michael Terry

Update some texts

1075. By Michael Terry

Fix available networks text not appearing

Revision history for this message
Michael Terry (mterry) wrote :

> entering the passcode seems to display another label in the bottom/right button for a second before changing page (I couldn't manage to read it but it seems to change geometry/looks weird)

I *think* I see what you mean -- but it's after the next page (Wi-Fi) starts loading, not before. It looks like the button goes from Continue->Skip. Which it does. I've looked at the code and understand why it would. But we'd need to do something slightly fancy there to fix it:

A) Add a way to tell if a UnityMenuModel has finished asking for content over DBus or
B) Delay showing the button for a second, but that feels a little hackish

> the enter passcode screen has a skip button, is that by design?

Yes, it switches to Swipe mode if pressed.

> the design got updated to address bug #1374504, can we include that as well (change the "report a bug" for "improve the experience")

Fixed.

> the wifi page has a label "no network available" before the aps list, dispite having quite some items in the list and being connected to one, do you see that as well?

Fixed. It was odd, the count for the model wasn't correct but the count for the repeater was. I'm not sure when that broke, but I just used the repeater count instead.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1075
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1611/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/803
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6845/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4285
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4285/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1611/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, that looks something we can land!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1075
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1615/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5613/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/807
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5307/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6865
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6865/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4300
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4300/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1615/rebuild

review: Needs Fixing (continuous-integration)
lp:~mterry/ubuntu-system-settings/wizard-refresh-take-6 updated
1076. By Michael Terry

Merge from trunk

1077. By Michael Terry

Remove duplicate osk restart lines

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/DevMode.qml'
2--- plugins/about/DevMode.qml 2014-09-24 12:31:29 +0000
3+++ plugins/about/DevMode.qml 2014-10-10 17:52:06 +0000
4@@ -107,7 +107,7 @@
5 anchors.horizontalCenter: parent.horizontalCenter
6 horizontalAlignment: Text.AlignHCenter
7 wrapMode: Text.WordWrap
8- text: i18n.tr("You need a PIN code or passphrase set to use Developer Mode.")
9+ text: i18n.tr("You need a passcode or passphrase set to use Developer Mode.")
10 }
11 }
12
13
14=== modified file 'plugins/security-privacy/LockSecurity.qml'
15--- plugins/security-privacy/LockSecurity.qml 2014-08-28 18:43:10 +0000
16+++ plugins/security-privacy/LockSecurity.qml 2014-10-10 17:52:06 +0000
17@@ -93,7 +93,7 @@
18 changeSecurityDialog.oldMethod) { // Changing existing
19 switch (changeSecurityDialog.newMethod) {
20 case UbuntuSecurityPrivacyPanel.Passcode:
21- return i18n.tr("Change PIN code…")
22+ return i18n.tr("Change passcode…")
23 case UbuntuSecurityPrivacyPanel.Passphrase:
24 return i18n.tr("Change passphrase…")
25 default: // To stop the runtime complaining
26@@ -104,7 +104,7 @@
27 case UbuntuSecurityPrivacyPanel.Swipe:
28 return i18n.tr("Switch to swipe")
29 case UbuntuSecurityPrivacyPanel.Passcode:
30- return i18n.tr("Switch to PIN code")
31+ return i18n.tr("Switch to passcode")
32 case UbuntuSecurityPrivacyPanel.Passphrase:
33 return i18n.tr("Switch to passphrase")
34 }
35@@ -115,7 +115,7 @@
36 text: {
37 switch (changeSecurityDialog.oldMethod) {
38 case UbuntuSecurityPrivacyPanel.Passcode:
39- return i18n.tr("Existing PIN code")
40+ return i18n.tr("Existing passcode")
41 case UbuntuSecurityPrivacyPanel.Passphrase:
42 return i18n.tr("Existing passphrase")
43 // Shouldn't be reached when visible but still evaluated
44@@ -171,7 +171,7 @@
45 text: {
46 switch (changeSecurityDialog.newMethod) {
47 case UbuntuSecurityPrivacyPanel.Passcode:
48- return i18n.tr("Choose PIN code")
49+ return i18n.tr("Choose passcode")
50 case UbuntuSecurityPrivacyPanel.Passphrase:
51 return i18n.tr("Choose passphrase")
52 // Shouldn't be reached when visible but still evaluated
53@@ -217,7 +217,7 @@
54 text: {
55 switch (changeSecurityDialog.newMethod) {
56 case UbuntuSecurityPrivacyPanel.Passcode:
57- return i18n.tr("Confirm PIN code")
58+ return i18n.tr("Confirm passcode")
59 case UbuntuSecurityPrivacyPanel.Passphrase:
60 return i18n.tr("Confirm passphrase")
61 // Shouldn't be reached when visible but still evaluated
62@@ -262,7 +262,7 @@
63 text: {
64 if (changeSecurityDialog.newMethod ===
65 UbuntuSecurityPrivacyPanel.Passcode)
66- return i18n.tr("Those PIN codes don't match. Try again.")
67+ return i18n.tr("Those passcodes don't match. Try again.")
68 if (changeSecurityDialog.newMethod ===
69 UbuntuSecurityPrivacyPanel.Passphrase)
70 return i18n.tr("Those passphrases don't match. Try again.")
71@@ -346,10 +346,10 @@
72
73 ListItem.ItemSelector {
74 property string swipe: i18n.tr("Swipe (no security)")
75- property string passcode: i18n.tr("4-digit PIN code")
76+ property string passcode: i18n.tr("4-digit passcode")
77 property string passphrase: i18n.tr("Passphrase")
78 property string swipeAlt: i18n.tr("Swipe (no security)… ")
79- property string passcodeAlt: i18n.tr("4-digit PIN code…")
80+ property string passcodeAlt: i18n.tr("4-digit passcode…")
81 property string passphraseAlt: i18n.tr("Passphrase…")
82
83 id: unlockMethod
84@@ -381,7 +381,7 @@
85 UbuntuSecurityPrivacyPanel.Swipe
86
87 control: Button {
88- property string changePasscode: i18n.tr("Change PIN code…")
89+ property string changePasscode: i18n.tr("Change passcode…")
90 property string changePassphrase: i18n.tr("Change passphrase…")
91
92 property bool passcode: securityPrivacy.securityType ===
93
94=== modified file 'plugins/security-privacy/PhoneLocking.qml'
95--- plugins/security-privacy/PhoneLocking.qml 2014-09-02 09:44:12 +0000
96+++ plugins/security-privacy/PhoneLocking.qml 2014-10-10 17:52:06 +0000
97@@ -43,7 +43,7 @@
98
99 ListItem.SingleValue {
100 property string swipe: qsTr("None", "Unlock with swipe")
101- property string passcode: i18n.tr("PIN code")
102+ property string passcode: i18n.tr("Passcode")
103 property string passphrase: i18n.tr("Passphrase")
104
105 text: i18n.tr("Lock security")
106
107=== modified file 'plugins/security-privacy/securityprivacy.cpp'
108--- plugins/security-privacy/securityprivacy.cpp 2014-09-08 21:00:58 +0000
109+++ plugins/security-privacy/securityprivacy.cpp 2014-10-10 17:52:06 +0000
110@@ -315,7 +315,7 @@
111 {
112 switch (type) {
113 case SecurityPrivacy::Passcode:
114- return _("Incorrect PIN code. Try again.");
115+ return _("Incorrect passcode. Try again.");
116 case SecurityPrivacy::Passphrase:
117 return _("Incorrect passphrase. Try again.");
118 default:
119
120=== modified file 'po/ubuntu-system-settings.pot'
121--- po/ubuntu-system-settings.pot 2014-09-26 18:46:56 +0000
122+++ po/ubuntu-system-settings.pot 2014-10-10 17:52:06 +0000
123@@ -8,7 +8,7 @@
124 msgstr ""
125 "Project-Id-Version: ubuntu-system-settings\n"
126 "Report-Msgid-Bugs-To: \n"
127-"POT-Creation-Date: 2014-09-26 12:27-0400\n"
128+"POT-Creation-Date: 2014-10-03 09:12-0400\n"
129 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
130 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
131 "Language-Team: LANGUAGE <LL@li.org>\n"
132@@ -30,373 +30,183 @@
133 msgid "Preferences;Settings;"
134 msgstr ""
135
136-#: ../plugins/system-update//Configuration.qml:29
137-#: ../plugins/system-update//PageComponent.qml:565
138-msgid "Auto download"
139-msgstr ""
140-
141-#: ../plugins/system-update//Configuration.qml:34
142-msgid "Download future updates automatically:"
143-msgstr ""
144-
145-#: ../plugins/system-update//Configuration.qml:52
146-#: ../plugins/system-update//PageComponent.qml:568
147-#: ../plugins/wifi//NetworkDetails.qml:55
148-#: ../plugins/about//PageComponent.qml:167
149-#: ../plugins/security-privacy//PageComponent.qml:140
150-#: ../plugins/security-privacy//PhoneLocking.qml:78
151-#: ../plugins/security-privacy//PhoneLocking.qml:87
152-#: ../plugins/battery//PageComponent.qml:315
153-#: ../plugins/battery//PageComponent.qml:324
154-#: ../plugins/battery//SleepValues.qml:106
155-msgid "Never"
156-msgstr ""
157-
158-#: ../plugins/system-update//Configuration.qml:53
159-msgid "When on wi-fi"
160-msgstr ""
161-
162-#: ../plugins/system-update//Configuration.qml:54
163-msgid "On any data connection"
164-msgstr ""
165-
166-#: ../plugins/system-update//Configuration.qml:55
167-msgid "Data charges may apply."
168-msgstr ""
169-
170-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
171-#: ../plugins/system-update//PageComponent.qml:37
172-#: ../po/settings.js:4
173-msgid "Updates"
174-msgstr ""
175-
176-#: ../plugins/system-update//PageComponent.qml:94
177-msgid "Update System"
178-msgstr ""
179-
180-#: ../plugins/system-update//PageComponent.qml:95
181-msgid "The phone needs to restart to install the system update."
182-msgstr ""
183-
184-#: ../plugins/system-update//PageComponent.qml:95
185-msgid "Connect the phone to power before installing the system update."
186-msgstr ""
187-
188-#: ../plugins/system-update//PageComponent.qml:98
189-msgid "Install & Restart"
190-msgstr ""
191-
192-#: ../plugins/system-update//PageComponent.qml:108
193-msgid "Not Now"
194-msgstr ""
195-
196-#: ../plugins/system-update//PageComponent.qml:114
197-msgid "Install"
198-msgstr ""
199-
200-#: ../plugins/system-update//PageComponent.qml:135
201-msgid "Software is up to date"
202-msgstr ""
203-
204-#: ../plugins/system-update//PageComponent.qml:243
205-msgid "Checking for updates…"
206-msgstr ""
207-
208-#: ../plugins/system-update//PageComponent.qml:261
209-#, qt-format
210-msgid "Install %1 update…"
211-msgid_plural "Install %1 updates…"
212-msgstr[0] ""
213-msgstr[1] ""
214-
215-#: ../plugins/system-update//PageComponent.qml:262
216-#, qt-format
217-msgid "Install %1 update"
218-msgid_plural "Install %1 updates"
219-msgstr[0] ""
220-msgstr[1] ""
221-
222-#: ../plugins/system-update//PageComponent.qml:263
223-msgid "Pause All"
224-msgstr ""
225-
226-#: ../plugins/system-update//PageComponent.qml:317
227-msgid "Retry"
228-msgstr ""
229-
230-#: ../plugins/system-update//PageComponent.qml:333
231-msgid "Download"
232-msgstr ""
233-
234-#: ../plugins/system-update//PageComponent.qml:333
235-msgid "Update"
236-msgstr ""
237-
238-#: ../plugins/system-update//PageComponent.qml:334
239-msgid "Resume"
240-msgstr ""
241-
242-#: ../plugins/system-update//PageComponent.qml:335
243-msgid "Pause"
244-msgstr ""
245-
246-#: ../plugins/system-update//PageComponent.qml:393
247-msgid "Installing"
248-msgstr ""
249-
250-#: ../plugins/system-update//PageComponent.qml:426
251-msgid "Installed"
252-msgstr ""
253-
254-#: ../plugins/system-update//PageComponent.qml:452
255-msgid "Version: "
256-msgstr ""
257-
258-#: ../plugins/system-update//PageComponent.qml:474
259-msgid "Sign in to Ubuntu One to receive updates for apps."
260-msgstr ""
261-
262-#: ../plugins/system-update//PageComponent.qml:483
263-msgid "Sign In…"
264-msgstr ""
265-
266-#: ../plugins/system-update//PageComponent.qml:550
267-msgid "Installing update…"
268-msgstr ""
269-
270-#: ../plugins/system-update//PageComponent.qml:570
271-msgid "On wi-fi"
272-msgstr ""
273-
274-#: ../plugins/system-update//PageComponent.qml:572
275-msgid "Always"
276-msgstr ""
277-
278-#: ../plugins/system-update//PageComponent.qml:587
279-msgid " bytes"
280-msgstr ""
281-
282-#: ../plugins/system-update//PageComponent.qml:590
283-msgid " KiB"
284-msgstr ""
285-
286-#: ../plugins/system-update//PageComponent.qml:593
287-msgid " MiB"
288-msgstr ""
289-
290-#: ../plugins/system-update//PageComponent.qml:596
291-msgid " GiB"
292-msgstr ""
293-
294-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
295-#: ../plugins/phone//PageComponent.qml:32
296-#: ../plugins/bluetooth//PageComponent.qml:93
297-#: ../po/settings.js:46
298-msgid "Phone"
299-msgstr ""
300-
301-#: ../plugins/phone//PageComponent.qml:109
302-#: ../plugins/sound//PageComponent.qml:153
303-msgid "Dialpad sounds"
304-msgstr ""
305-
306-#: ../plugins/phone//ServiceInfo.qml:109
307-#, qt-format
308-msgid "Last called %1"
309-msgstr ""
310-
311-#: ../plugins/phone//ServiceInfo.qml:119
312-msgid "Call"
313-msgstr ""
314-
315-#: ../plugins/phone//CallForwarding.qml:32
316-#: ../plugins/phone//CallForwarding.qml:76 ../plugins/phone//NoSims.qml:28
317-#: ../plugins/phone//SingleSim.qml:33 ../plugins/phone//MultiSim.qml:36
318-#: ../plugins/phone//MultiSim.qml:74
319-msgid "Call forwarding"
320-msgstr ""
321-
322-#: ../plugins/phone//CallForwarding.qml:91
323+#: ../plugins/reset//ResetAllSettings.qml:29
324 msgid ""
325-"Redirects phone calls to another number whenever you don't answer, or your "
326-"phone is busy, turned off, or out of range."
327-msgstr ""
328-
329-#: ../plugins/phone//CallForwarding.qml:101
330-msgid "Forward to"
331-msgstr ""
332-
333-#: ../plugins/phone//CallForwarding.qml:139
334-#: ../plugins/background//Preview.qml:102
335-#: ../plugins/language//DisplayLanguage.qml:98
336-#: ../plugins/language//RebootNecessary.qml:47
337+"The contents and layout of the launcher, and the filters in the home screen "
338+"will be returned to their original settings."
339+msgstr ""
340+
341+#: ../plugins/reset//ResetAllSettings.qml:31
342+msgid "Reset all system settings"
343+msgstr ""
344+
345+#: ../plugins/reset//ResetAllSettings.qml:38
346+#: ../plugins/reset//EraseEverything.qml:54
347+#: ../plugins/reset//ResetLauncherHome.qml:55
348+#: ../plugins/time-date//TimePicker.qml:173
349+#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:55
350 #: ../plugins/bluetooth//ProvidePasskeyDialog.qml:54
351 #: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:49
352-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:55
353-#: ../plugins/wifi//OtherNetwork.qml:288
354+#: ../plugins/phone//CallForwarding.qml:139
355 #: ../plugins/security-privacy//SimPin.qml:149
356 #: ../plugins/security-privacy//SimPin.qml:266
357 #: ../plugins/security-privacy//LockSecurity.qml:283
358-#: ../plugins/time-date//TimePicker.qml:173
359-#: ../plugins/reset//ResetLauncherHome.qml:55
360-#: ../plugins/reset//EraseEverything.qml:54
361-#: ../plugins/reset//ResetAllSettings.qml:38
362+#: ../plugins/background//Preview.qml:102
363+#: ../plugins/language//RebootNecessary.qml:47
364+#: ../plugins/language//DisplayLanguage.qml:98
365+#: ../plugins/wifi//OtherNetwork.qml:288
366 #: ../plugins/cellular//HotspotSetup.qml:85
367 #: ../plugins/background//Components//AddRemove.qml:42
368 #: ../plugins/cellular//Components//SimEditor.qml:189
369 msgid "Cancel"
370 msgstr ""
371
372+#: ../plugins/reset//EraseEverything.qml:41
373+msgid ""
374+"All documents, saved games, settings, and other items will be permanently "
375+"deleted from this phone."
376+msgstr ""
377+
378+#: ../plugins/reset//EraseEverything.qml:44
379+msgid "Erase & Reset Everything"
380+msgstr ""
381+
382+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
383+#: ../plugins/reset//PageComponent.qml:32
384+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:8
385+msgid "Reset phone"
386+msgstr ""
387+
388+#: ../plugins/reset//PageComponent.qml:73
389+#: ../plugins/reset//ResetLauncherHome.qml:44
390+msgid "Reset Launcher"
391+msgstr ""
392+
393+#: ../plugins/reset//PageComponent.qml:87
394+msgid "Reset all system settings…"
395+msgstr ""
396+
397+#: ../plugins/reset//PageComponent.qml:101
398+msgid "Erase & Reset Everything…"
399+msgstr ""
400+
401+#: ../plugins/reset//ResetLauncherHome.qml:40
402+msgid "The Launcher will be returned to its original contents."
403+msgstr ""
404+
405+#: ../plugins/reset//ResetLauncherHome.qml:59
406+#: ../plugins/language//RebootNecessary.qml:34
407+msgid "The phone needs to restart for changes to take effect."
408+msgstr ""
409+
410+#: ../plugins/time-date//ChooseTimeZone.qml:28
411+msgid "Time zone"
412+msgstr ""
413+
414+#: ../plugins/time-date//ChooseTimeZone.qml:46
415+msgid "Set the time zone:"
416+msgstr ""
417+
418+#: ../plugins/time-date//ChooseTimeZone.qml:47
419+#: ../plugins/time-date//PageComponent.qml:69
420+#: ../plugins/cellular//PageChooseCarrier.qml:103
421+msgid "Automatically"
422+msgstr ""
423+
424+#: ../plugins/time-date//ChooseTimeZone.qml:47
425+#: ../plugins/time-date//PageComponent.qml:69
426+#: ../plugins/security-privacy//PageComponent.qml:149
427+#: ../plugins/cellular//PageChooseCarrier.qml:103
428+msgid "Manually"
429+msgstr ""
430+
431+#: ../plugins/time-date//ChooseTimeZone.qml:126
432+msgid "Enter your current location."
433+msgstr ""
434+
435+#: ../plugins/time-date//ChooseTimeZone.qml:127
436+msgid "No matching place"
437+msgstr ""
438+
439+#: ../plugins/time-date//TimePicker.qml:26
440+msgid "Set time & date"
441+msgstr ""
442+
443+#: ../plugins/time-date//TimePicker.qml:68
444+msgid "Time"
445+msgstr ""
446+
447+#: ../plugins/time-date//TimePicker.qml:81
448+msgid "Hour"
449+msgstr ""
450+
451+#: ../plugins/time-date//TimePicker.qml:95
452+msgid "Minute"
453+msgstr ""
454+
455+#: ../plugins/time-date//TimePicker.qml:109
456+msgid "Second"
457+msgstr ""
458+
459+#: ../plugins/time-date//TimePicker.qml:118
460+msgid "Date"
461+msgstr ""
462+
463+#: ../plugins/time-date//TimePicker.qml:130
464+msgid "Day"
465+msgstr ""
466+
467+#: ../plugins/time-date//TimePicker.qml:144
468+msgid "Month"
469+msgstr ""
470+
471+#: ../plugins/time-date//TimePicker.qml:162
472+msgid "Year"
473+msgstr ""
474+
475+#: ../plugins/time-date//TimePicker.qml:182
476 #: ../plugins/phone//CallForwarding.qml:152
477+#: ../plugins/security-privacy//LockSecurity.qml:304
478 #: ../plugins/background//Preview.qml:109
479-#: ../plugins/security-privacy//LockSecurity.qml:304
480-#: ../plugins/time-date//TimePicker.qml:182
481 msgid "Set"
482 msgstr ""
483
484-#. TRANSLATORS: %1 is the name of the (network) carrier
485-#: ../plugins/phone//Services.qml:34 ../plugins/phone//SingleSim.qml:51
486+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
487+#: ../plugins/time-date//PageComponent.qml:29
488+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:20
489+msgid "Time & Date"
490+msgstr ""
491+
492+#: ../plugins/time-date//PageComponent.qml:53
493+msgid "Time zone:"
494+msgstr ""
495+
496+#: ../plugins/time-date//PageComponent.qml:68
497+msgid "Set the time and date:"
498+msgstr ""
499+
500+#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:28
501+#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:28
502+#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:28
503+msgid "Bluetooth Pairing Request"
504+msgstr ""
505+
506+#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:36
507+#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:36
508 #, qt-format
509-msgid "%1 Services"
510-msgstr ""
511-
512-#: ../plugins/phone//NoSims.qml:34 ../plugins/phone//SingleSim.qml:40
513-#: ../plugins/phone//MultiSim.qml:46 ../plugins/phone//MultiSim.qml:84
514-#: ../plugins/phone//CallWaiting.qml:31 ../plugins/phone//CallWaiting.qml:74
515-msgid "Call waiting"
516-msgstr ""
517-
518-#: ../plugins/phone//NoSims.qml:42 ../plugins/phone//MultiSim.qml:56
519-#: ../plugins/phone//MultiSim.qml:94
520-msgid "Services"
521-msgstr ""
522-
523-#: ../plugins/phone//SingleSim.qml:29
524-msgid "SIM"
525-msgstr ""
526-
527-#: ../plugins/phone//CallWaiting.qml:89
528-msgid ""
529-"Lets you answer or start a new call while on another call, and switch "
530-"between them"
531-msgstr ""
532-
533-#: ../plugins/background//Preview.qml:70
534-msgid "Preview"
535-msgstr ""
536-
537-#: ../plugins/background//Preview.qml:102
538-msgid "Remove image"
539-msgstr ""
540-
541-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
542-#: ../plugins/background//MainPage.qml:35
543-#: ../po/settings.js:64
544-msgid "Background"
545-msgstr ""
546-
547-#: ../plugins/background//MainPage.qml:99
548-msgid "Ubuntu Art"
549-msgstr ""
550-
551-#: ../plugins/background//MainPage.qml:115
552-msgid "Custom"
553-msgstr ""
554-
555-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
556-#: ../plugins/language//PageComponent.qml:34
557-#: ../po/settings.js:80
558-msgid "Language & Text"
559-msgstr ""
560-
561-#: ../plugins/language//PageComponent.qml:100
562-msgid "Display language…"
563-msgstr ""
564-
565-#: ../plugins/language//PageComponent.qml:117
566-#: ../plugins/language//KeyboardLayouts.qml:26
567-msgid "Keyboard layouts"
568-msgstr ""
569-
570-#: ../plugins/language//PageComponent.qml:132
571-#: ../plugins/language//PageComponent.qml:142
572-#: ../plugins/language//SpellChecking.qml:27
573-#: ../plugins/language//SpellChecking.qml:36
574-msgid "Spell checking"
575-msgstr ""
576-
577-#: ../plugins/language//PageComponent.qml:152
578-msgid "Auto correction"
579-msgstr ""
580-
581-#: ../plugins/language//PageComponent.qml:162
582-msgid "Word suggestions"
583-msgstr ""
584-
585-#: ../plugins/language//PageComponent.qml:175
586-msgid "Auto capitalization"
587-msgstr ""
588-
589-#: ../plugins/language//PageComponent.qml:185
590-msgid "Turns on Shift to capitalize the first letter of each sentence."
591-msgstr ""
592-
593-#: ../plugins/language//PageComponent.qml:192
594-msgid "Auto punctuation"
595-msgstr ""
596-
597-#: ../plugins/language//PageComponent.qml:202
598-msgid ""
599-"Adds a period, and any missing quotes or brackets, when you tap Space twice."
600-msgstr ""
601-
602-#: ../plugins/language//PageComponent.qml:209
603-#: ../plugins/sound//PageComponent.qml:196
604-msgid "Keyboard sound"
605-msgstr ""
606-
607-#: ../plugins/language//PageComponent.qml:219
608-msgid "Keyboard vibration"
609-msgstr ""
610-
611-#: ../plugins/language//SpellChecking.qml:53
612-msgid "Current spelling languages:"
613-msgstr ""
614-
615-#: ../plugins/language//SpellChecking.qml:54
616-msgid "All languages available:"
617-msgstr ""
618-
619-#: ../plugins/language//KeyboardLayouts.qml:39
620-msgid "Current layouts:"
621-msgstr ""
622-
623-#: ../plugins/language//KeyboardLayouts.qml:40
624-msgid "All layouts available:"
625-msgstr ""
626-
627-#: ../plugins/language//DisplayLanguage.qml:36
628-msgid "Display language"
629-msgstr ""
630-
631-#: ../plugins/language//DisplayLanguage.qml:118
632-msgid "Confirm"
633-msgstr ""
634-
635-#: ../plugins/language//RebootNecessary.qml:34
636-#: ../plugins/reset//ResetLauncherHome.qml:59
637-msgid "The phone needs to restart for changes to take effect."
638-msgstr ""
639-
640-#: ../plugins/language//RebootNecessary.qml:38
641-msgid "Restart Now"
642+msgid "PIN for '%1'"
643+msgstr ""
644+
645+#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:63
646+#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:62
647+msgid "Pair"
648 msgstr ""
649
650 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
651 #: ../plugins/bluetooth//PageComponent.qml:32
652 #: ../plugins/bluetooth//PageComponent.qml:147
653 #: ../plugins/battery//PageComponent.qml:363
654-#: ../po/settings.js:114
655+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:30
656 msgid "Bluetooth"
657 msgstr ""
658
659@@ -424,6 +234,13 @@
660 msgid "Computer"
661 msgstr ""
662
663+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
664+#: ../plugins/bluetooth//PageComponent.qml:93
665+#: ../plugins/phone//PageComponent.qml:32
666+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:54
667+msgid "Phone"
668+msgstr ""
669+
670 #: ../plugins/bluetooth//PageComponent.qml:94
671 msgid "Modem"
672 msgstr ""
673@@ -530,7 +347,7 @@
674 msgstr ""
675
676 #: ../plugins/bluetooth//PageComponent.qml:346
677-#: ../plugins/wifi//NetworkDetails.qml:43
678+#: ../plugins/wifi//NetworkDetails.qml:45
679 msgid "Name"
680 msgstr ""
681
682@@ -560,23 +377,6 @@
683 msgid "Forget this device"
684 msgstr ""
685
686-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:28
687-#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:28
688-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:28
689-msgid "Bluetooth Pairing Request"
690-msgstr ""
691-
692-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:36
693-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:36
694-#, qt-format
695-msgid "PIN for '%1'"
696-msgstr ""
697-
698-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:62
699-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:63
700-msgid "Pair"
701-msgstr ""
702-
703 #. TRANSLATORS: %1 is the name of the bluetooth device being paired
704 #: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:37
705 #, qt-format
706@@ -587,13 +387,67 @@
707 msgid "Confirm PIN"
708 msgstr ""
709
710-#: ../plugins/sound//SilentModeWarning.qml:31
711-msgid "The phone is in Silent Mode."
712+#: ../plugins/phone//CallWaiting.qml:31 ../plugins/phone//CallWaiting.qml:74
713+#: ../plugins/phone//MultiSim.qml:46 ../plugins/phone//MultiSim.qml:84
714+#: ../plugins/phone//SingleSim.qml:40 ../plugins/phone//NoSims.qml:34
715+msgid "Call waiting"
716+msgstr ""
717+
718+#: ../plugins/phone//CallWaiting.qml:89
719+msgid ""
720+"Lets you answer or start a new call while on another call, and switch "
721+"between them"
722+msgstr ""
723+
724+#: ../plugins/phone//CallForwarding.qml:32
725+#: ../plugins/phone//CallForwarding.qml:76 ../plugins/phone//MultiSim.qml:36
726+#: ../plugins/phone//MultiSim.qml:74 ../plugins/phone//SingleSim.qml:33
727+#: ../plugins/phone//NoSims.qml:28
728+msgid "Call forwarding"
729+msgstr ""
730+
731+#: ../plugins/phone//CallForwarding.qml:91
732+msgid ""
733+"Redirects phone calls to another number whenever you don't answer, or your "
734+"phone is busy, turned off, or out of range."
735+msgstr ""
736+
737+#: ../plugins/phone//CallForwarding.qml:101
738+msgid "Forward to"
739+msgstr ""
740+
741+#. TRANSLATORS: %1 is the name of the (network) carrier
742+#: ../plugins/phone//Services.qml:34 ../plugins/phone//SingleSim.qml:51
743+#, qt-format
744+msgid "%1 Services"
745+msgstr ""
746+
747+#: ../plugins/phone//PageComponent.qml:109
748+#: ../plugins/sound//PageComponent.qml:153
749+msgid "Dialpad sounds"
750+msgstr ""
751+
752+#: ../plugins/phone//MultiSim.qml:56 ../plugins/phone//MultiSim.qml:94
753+#: ../plugins/phone//NoSims.qml:42
754+msgid "Services"
755+msgstr ""
756+
757+#: ../plugins/phone//SingleSim.qml:29
758+msgid "SIM"
759+msgstr ""
760+
761+#: ../plugins/phone//ServiceInfo.qml:109
762+#, qt-format
763+msgid "Last called %1"
764+msgstr ""
765+
766+#: ../plugins/phone//ServiceInfo.qml:119
767+msgid "Call"
768 msgstr ""
769
770 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
771 #: ../plugins/sound//PageComponent.qml:37
772-#: ../po/settings.js:144
773+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:72
774 msgid "Sound"
775 msgstr ""
776
777@@ -640,6 +494,11 @@
778 msgid "Other sounds:"
779 msgstr ""
780
781+#: ../plugins/sound//PageComponent.qml:196
782+#: ../plugins/language//PageComponent.qml:209
783+msgid "Keyboard sound"
784+msgstr ""
785+
786 #: ../plugins/sound//PageComponent.qml:210
787 msgid "Lock sound"
788 msgstr ""
789@@ -648,378 +507,13 @@
790 msgid "Stop playing"
791 msgstr ""
792
793-#: ../plugins/wifi//NetworkDetails.qml:36
794-msgid "Network details"
795-msgstr ""
796-
797-#: ../plugins/wifi//NetworkDetails.qml:51
798-msgid "Last connected"
799-msgstr ""
800-
801-#: ../plugins/wifi//NetworkDetails.qml:61
802-#: ../plugins/wifi//OtherNetwork.qml:222
803-msgid "Password"
804-msgstr ""
805-
806-#: ../plugins/wifi//NetworkDetails.qml:73
807-#: ../plugins/wifi//OtherNetwork.qml:256
808-msgid "Show password"
809-msgstr ""
810-
811-#: ../plugins/wifi//NetworkDetails.qml:83
812-msgid "Forget network"
813-msgstr ""
814-
815-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
816-#: ../plugins/wifi//PageComponent.qml:28
817-#: ../plugins/battery//PageComponent.qml:333
818-#: ../po/settings.js:162
819-msgid "Wi-Fi"
820-msgstr ""
821-
822-#: ../plugins/wifi//PageComponent.qml:131
823-#: ../plugins/wifi//PreviousNetworks.qml:26
824-msgid "Previous networks"
825-msgstr ""
826-
827-#: ../plugins/wifi//PageComponent.qml:138
828-msgid "Connect to hidden network…"
829-msgstr ""
830-
831-#: ../plugins/wifi//OtherNetwork.qml:96
832-msgid "Connect to Hidden Network"
833-msgstr ""
834-
835-#: ../plugins/wifi//OtherNetwork.qml:187
836-msgid "Network name"
837-msgstr ""
838-
839-#: ../plugins/wifi//OtherNetwork.qml:203
840-#: ../plugins/security-privacy//PageComponent.qml:126
841-msgid "Security"
842-msgstr ""
843-
844-#: ../plugins/wifi//OtherNetwork.qml:215
845-msgid "WPA & WPA2 Personal"
846-msgstr ""
847-
848-#: ../plugins/wifi//OtherNetwork.qml:216
849-msgid "WEP"
850-msgstr ""
851-
852-#: ../plugins/wifi//RemoveBackground.qml:28
853-msgid "Clear"
854-msgstr ""
855-
856-#: ../plugins/wifi//Common.qml:36
857-msgid "Unknown error"
858-msgstr ""
859-
860-#: ../plugins/wifi//Common.qml:38
861-msgid "No reason given"
862-msgstr ""
863-
864-#: ../plugins/wifi//Common.qml:40
865-msgid "Device is now managed"
866-msgstr ""
867-
868-#: ../plugins/wifi//Common.qml:42
869-msgid "Device is now unmanaged"
870-msgstr ""
871-
872-#: ../plugins/wifi//Common.qml:44
873-msgid "The device could not be readied for configuration"
874-msgstr ""
875-
876-#: ../plugins/wifi//Common.qml:46
877-msgid ""
878-"IP configuration could not be reserved (no available address, timeout, etc.)"
879-msgstr ""
880-
881-#: ../plugins/wifi//Common.qml:48
882-msgid "The IP configuration is no longer valid"
883-msgstr ""
884-
885-#: ../plugins/wifi//Common.qml:50
886-msgid "Your authentication details were incorrect"
887-msgstr ""
888-
889-#: ../plugins/wifi//Common.qml:52
890-msgid "802.1X supplicant disconnected"
891-msgstr ""
892-
893-#: ../plugins/wifi//Common.qml:54
894-msgid "802.1X supplicant configuration failed"
895-msgstr ""
896-
897-#: ../plugins/wifi//Common.qml:56
898-msgid "802.1X supplicant failed"
899-msgstr ""
900-
901-#: ../plugins/wifi//Common.qml:58
902-msgid "802.1X supplicant took too long to authenticate"
903-msgstr ""
904-
905-#: ../plugins/wifi//Common.qml:60
906-msgid "DHCP client failed to start"
907-msgstr ""
908-
909-#: ../plugins/wifi//Common.qml:62
910-msgid "DHCP client error"
911-msgstr ""
912-
913-#: ../plugins/wifi//Common.qml:64
914-msgid "DHCP client failed"
915-msgstr ""
916-
917-#: ../plugins/wifi//Common.qml:66
918-msgid "Shared connection service failed to start"
919-msgstr ""
920-
921-#: ../plugins/wifi//Common.qml:68
922-msgid "Shared connection service failed"
923-msgstr ""
924-
925-#: ../plugins/wifi//Common.qml:70
926-msgid "Necessary firmware for the device may be missing"
927-msgstr ""
928-
929-#: ../plugins/wifi//Common.qml:72
930-msgid "The device was removed"
931-msgstr ""
932-
933-#: ../plugins/wifi//Common.qml:74
934-msgid "NetworkManager went to sleep"
935-msgstr ""
936-
937-#: ../plugins/wifi//Common.qml:76
938-msgid "The device's active connection disappeared"
939-msgstr ""
940-
941-#: ../plugins/wifi//Common.qml:78
942-msgid "Device disconnected by user or client"
943-msgstr ""
944-
945-#: ../plugins/wifi//Common.qml:80
946-msgid "The device's existing connection was assumed"
947-msgstr ""
948-
949-#: ../plugins/wifi//Common.qml:82
950-msgid "The supplicant is now available"
951-msgstr ""
952-
953-#: ../plugins/wifi//Common.qml:84
954-msgid "The modem could not be found"
955-msgstr ""
956-
957-#: ../plugins/wifi//Common.qml:86
958-msgid "The Bluetooth connection failed or timed out"
959-msgstr ""
960-
961-#: ../plugins/wifi//Common.qml:88
962-msgid "A dependency of the connection failed"
963-msgstr ""
964-
965-#: ../plugins/wifi//Common.qml:90
966-msgid "ModemManager is unavailable"
967-msgstr ""
968-
969-#: ../plugins/wifi//Common.qml:92
970-msgid "The Wi-Fi network could not be found"
971-msgstr ""
972-
973-#: ../plugins/wifi//Common.qml:94
974-msgid "A secondary connection of the base connection failed"
975-msgstr ""
976-
977-#: ../plugins/wifi//NetworkDetailsBrief.qml:58
978-msgid "IP address"
979-msgstr ""
980-
981-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
982-#: ../plugins/notifications//PageComponent.qml:29
983-#: ../po/settings.js:182
984-msgid "Notifications"
985-msgstr ""
986-
987-#: ../plugins/notifications//PageComponent.qml:40
988-msgid ""
989-"Selected apps can alert you using notification bubbles, sounds, vibrations, "
990-"and the Notification Center."
991-msgstr ""
992-
993-#: ../plugins/about//License.qml:30
994-msgid "Sorry, this license could not be displayed."
995-msgstr ""
996-
997-#: ../plugins/about//Storage.qml:33 ../plugins/about//PageComponent.qml:143
998-msgid "Storage"
999-msgstr ""
1000-
1001-#: ../plugins/about//Storage.qml:85
1002-msgid "Used by Ubuntu"
1003-msgstr ""
1004-
1005-#: ../plugins/about//Storage.qml:86
1006-msgid "Videos"
1007-msgstr ""
1008-
1009-#: ../plugins/about//Storage.qml:87
1010-msgid "Audio"
1011-msgstr ""
1012-
1013-#: ../plugins/about//Storage.qml:88
1014-msgid "Pictures"
1015-msgstr ""
1016-
1017-#: ../plugins/about//Storage.qml:89
1018-msgid "Other files"
1019-msgstr ""
1020-
1021-#: ../plugins/about//Storage.qml:90
1022-msgid "Used by apps"
1023-msgstr ""
1024-
1025-#: ../plugins/about//Storage.qml:140
1026-msgid "Total storage"
1027-msgstr ""
1028-
1029-#: ../plugins/about//Storage.qml:152
1030-msgid "Free space"
1031-msgstr ""
1032-
1033-#: ../plugins/about//Storage.qml:172
1034-msgid "By name"
1035-msgstr ""
1036-
1037-#: ../plugins/about//Storage.qml:172
1038-msgid "By size"
1039-msgstr ""
1040-
1041-#: ../plugins/about//Storage.qml:203
1042-#: ../plugins/cellular//PageChooseCarriers.qml:49
1043-#: ../plugins/cellular//PageChooseCarriers.qml:65
1044-#: ../plugins/battery//PageComponent.qml:131
1045-#: ../plugins/battery//PageComponent.qml:287
1046-#: ../plugins/cellular//Components//NoSim.qml:48
1047-#: ../plugins/cellular//Components//SingleSim.qml:62
1048-msgid "N/A"
1049-msgstr ""
1050-
1051-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
1052-#: ../plugins/about//PageComponent.qml:34
1053-#: ../po/settings.js:206
1054-msgid "About this phone"
1055-msgstr ""
1056-
1057-#: ../plugins/about//PageComponent.qml:109
1058-msgid "Serial"
1059-msgstr ""
1060-
1061-#: ../plugins/about//PageComponent.qml:124
1062-msgid "Wi-Fi address"
1063-msgstr ""
1064-
1065-#: ../plugins/about//PageComponent.qml:132
1066-msgid "Bluetooth address"
1067-msgstr ""
1068-
1069-#: ../plugins/about//PageComponent.qml:144
1070-#, qt-format
1071-msgid "%1 free"
1072-msgstr ""
1073-
1074-#: ../plugins/about//PageComponent.qml:151
1075-msgid "Software:"
1076-msgstr ""
1077-
1078-#: ../plugins/about//PageComponent.qml:156
1079-msgid "OS"
1080-msgstr ""
1081-
1082-#: ../plugins/about//PageComponent.qml:165
1083-msgid "Last updated"
1084-msgstr ""
1085-
1086-#: ../plugins/about//PageComponent.qml:173
1087-msgid "Check for updates"
1088-msgstr ""
1089-
1090-#: ../plugins/about//PageComponent.qml:182
1091-msgid "Legal:"
1092-msgstr ""
1093-
1094-#: ../plugins/about//PageComponent.qml:187 ../plugins/about//Software.qml:11
1095-msgid "Software licenses"
1096-msgstr ""
1097-
1098-#: ../plugins/about//PageComponent.qml:195
1099-msgid "Regulatory info"
1100-msgstr ""
1101-
1102-#: ../plugins/about//PageComponent.qml:203
1103-msgid "Developer mode"
1104-msgstr ""
1105-
1106-#: ../plugins/about//Version.qml:36
1107-msgid "OS Build Details"
1108-msgstr ""
1109-
1110-#: ../plugins/about//Version.qml:61
1111-msgid "OS build number"
1112-msgstr ""
1113-
1114-#: ../plugins/about//Version.qml:67
1115-msgid "Ubuntu Image part"
1116-msgstr ""
1117-
1118-#: ../plugins/about//Version.qml:75
1119-msgid "Ubuntu build description"
1120-msgstr ""
1121-
1122-#: ../plugins/about//Version.qml:81
1123-msgid "Device Image part"
1124-msgstr ""
1125-
1126-#: ../plugins/about//Version.qml:88
1127-msgid "Device build description"
1128-msgstr ""
1129-
1130-#: ../plugins/about//Version.qml:95
1131-msgid "Customization Image part"
1132-msgstr ""
1133-
1134-#: ../plugins/about//PhoneNumber.qml:36
1135-msgid "Phone number"
1136-msgstr ""
1137-
1138-#: ../plugins/about//PhoneNumbers.qml:31
1139-msgid "Phone number:"
1140-msgstr ""
1141-
1142-#: ../plugins/about//DevMode.qml:35 ../plugins/about//DevMode.qml:90
1143-msgid "Developer Mode"
1144-msgstr ""
1145-
1146-#: ../plugins/about//DevMode.qml:84
1147-msgid ""
1148-"In Developer Mode, anyone can access, change or delete anything on this "
1149-"phone by connecting it to another device."
1150-msgstr ""
1151-
1152-#: ../plugins/about//DevMode.qml:110
1153-msgid "You need a PIN code or passphrase set to use Developer Mode."
1154-msgstr ""
1155-
1156-#: ../plugins/about//DevMode.qml:116
1157-#: ../plugins/security-privacy//PhoneLocking.qml:49
1158-#: ../plugins/security-privacy//LockSecurity.qml:32
1159-msgid "Lock security"
1160+#: ../plugins/sound//SilentModeWarning.qml:31
1161+msgid "The phone is in Silent Mode."
1162 msgstr ""
1163
1164 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
1165 #: ../plugins/security-privacy//PageComponent.qml:37
1166-#: ../po/settings.js:242
1167+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:90
1168 msgid "Security & Privacy"
1169 msgstr ""
1170
1171@@ -1035,6 +529,11 @@
1172 msgid "Phone only"
1173 msgstr ""
1174
1175+#: ../plugins/security-privacy//PageComponent.qml:126
1176+#: ../plugins/wifi//OtherNetwork.qml:203
1177+msgid "Security"
1178+msgstr ""
1179+
1180 #: ../plugins/security-privacy//PageComponent.qml:131
1181 msgid "Lock phone"
1182 msgstr ""
1183@@ -1042,25 +541,31 @@
1184 #. TRANSLATORS: %1 is the number of minutes
1185 #: ../plugins/security-privacy//PageComponent.qml:137
1186 #: ../plugins/security-privacy//PageComponent.qml:146
1187-#: ../plugins/battery//PageComponent.qml:312
1188-#: ../plugins/battery//PageComponent.qml:321
1189 #: ../plugins/battery//SleepValues.qml:83
1190 #: ../plugins/battery//SleepValues.qml:87
1191 #: ../plugins/battery//SleepValues.qml:91
1192 #: ../plugins/battery//SleepValues.qml:95
1193 #: ../plugins/battery//SleepValues.qml:99
1194 #: ../plugins/battery//SleepValues.qml:103
1195+#: ../plugins/battery//PageComponent.qml:312
1196+#: ../plugins/battery//PageComponent.qml:321
1197 #, qt-format
1198 msgid "After %1 minute"
1199 msgid_plural "After %1 minutes"
1200 msgstr[0] ""
1201 msgstr[1] ""
1202
1203-#: ../plugins/security-privacy//PageComponent.qml:149
1204-#: ../plugins/time-date//PageComponent.qml:69
1205-#: ../plugins/time-date//ChooseTimeZone.qml:47
1206-#: ../plugins/cellular//PageChooseCarrier.qml:103
1207-msgid "Manually"
1208+#: ../plugins/security-privacy//PageComponent.qml:140
1209+#: ../plugins/security-privacy//PhoneLocking.qml:78
1210+#: ../plugins/security-privacy//PhoneLocking.qml:87
1211+#: ../plugins/system-update//Configuration.qml:52
1212+#: ../plugins/system-update//PageComponent.qml:689
1213+#: ../plugins/wifi//NetworkDetails.qml:58
1214+#: ../plugins/about//PageComponent.qml:167
1215+#: ../plugins/battery//SleepValues.qml:106
1216+#: ../plugins/battery//PageComponent.qml:315
1217+#: ../plugins/battery//PageComponent.qml:324
1218+msgid "Never"
1219 msgstr ""
1220
1221 #: ../plugins/security-privacy//PageComponent.qml:158
1222@@ -1076,9 +581,9 @@
1223
1224 #: ../plugins/security-privacy//PageComponent.qml:165
1225 #: ../plugins/security-privacy//PageComponent.qml:244
1226+#: ../plugins/cellular//Components//CellularSingleSim.qml:50
1227 #: ../plugins/cellular//Components//CellularMultiSim.qml:30
1228 #: ../plugins/cellular//Components//NoSim.qml:32
1229-#: ../plugins/cellular//Components//CellularSingleSim.qml:50
1230 msgid "Off"
1231 msgstr ""
1232
1233@@ -1135,63 +640,158 @@
1234 msgid "Not sent"
1235 msgstr ""
1236
1237+#: ../plugins/security-privacy//AppAccess.qml:35
1238+msgid "Apps that you have granted and have requested access to:"
1239+msgstr ""
1240+
1241+#: ../plugins/security-privacy//AppAccess.qml:42
1242+msgid "Apps that have requested access to your camera"
1243+msgstr ""
1244+
1245+#: ../plugins/security-privacy//AppAccess.qml:46
1246+msgid "Mic"
1247+msgstr ""
1248+
1249+#: ../plugins/security-privacy//AppAccess.qml:47
1250+msgid "Apps that have requested access to your mic"
1251+msgstr ""
1252+
1253+#: ../plugins/security-privacy//AppAccess.qml:59
1254+#, qt-format
1255+msgid "%1/%2"
1256+msgstr ""
1257+
1258+#: ../plugins/security-privacy//AppAccess.qml:60
1259+msgid "0"
1260+msgstr ""
1261+
1262 #: ../plugins/security-privacy//Dash.qml:45
1263 msgid "Return results from:"
1264 msgstr ""
1265
1266+#: ../plugins/security-privacy//PhoneLocking.qml:31
1267+msgid "Phone locking"
1268+msgstr ""
1269+
1270+#: ../plugins/security-privacy//PhoneLocking.qml:45
1271+msgctxt "Unlock with swipe"
1272+msgid "None"
1273+msgstr ""
1274+
1275+#: ../plugins/security-privacy//PhoneLocking.qml:46
1276+#: ../wizard/qml/Pages//30-passwd-type.qml:95
1277+msgid "Passcode"
1278+msgstr ""
1279+
1280+#: ../plugins/security-privacy//PhoneLocking.qml:47
1281+#: ../plugins/security-privacy//LockSecurity.qml:350
1282+#: ../wizard/qml/Pages//30-passwd-type.qml:98
1283+msgid "Passphrase"
1284+msgstr ""
1285+
1286+#: ../plugins/security-privacy//PhoneLocking.qml:49
1287+#: ../plugins/security-privacy//LockSecurity.qml:32
1288+#: ../plugins/about//DevMode.qml:116
1289+#: ../wizard/qml/Pages//30-passwd-type.qml:37
1290+msgid "Lock security"
1291+msgstr ""
1292+
1293+#: ../plugins/security-privacy//PhoneLocking.qml:68
1294+#: ../plugins/battery//PageComponent.qml:306
1295+msgid "Lock when idle"
1296+msgstr ""
1297+
1298+#: ../plugins/security-privacy//PhoneLocking.qml:69
1299+#: ../plugins/battery//PageComponent.qml:306
1300+msgid "Sleep when idle"
1301+msgstr ""
1302+
1303+#. TRANSLATORS: %1 is the number of minutes
1304+#: ../plugins/security-privacy//PhoneLocking.qml:75
1305+#: ../plugins/security-privacy//PhoneLocking.qml:84
1306+#, qt-format
1307+msgid "%1 minute"
1308+msgid_plural "%1 minutes"
1309+msgstr[0] ""
1310+msgstr[1] ""
1311+
1312+#: ../plugins/security-privacy//PhoneLocking.qml:101
1313+msgid "Sleep locks immediately"
1314+msgstr ""
1315+
1316+#: ../plugins/security-privacy//PhoneLocking.qml:106
1317+msgid "When locked, allow:"
1318+msgstr ""
1319+
1320+#: ../plugins/security-privacy//PhoneLocking.qml:110
1321+msgid "Launcher"
1322+msgstr ""
1323+
1324+#: ../plugins/security-privacy//PhoneLocking.qml:120
1325+msgid "Notifications and quick settings"
1326+msgstr ""
1327+
1328+#: ../plugins/security-privacy//PhoneLocking.qml:131
1329+msgid "Turn on lock security to restrict access when the phone is locked."
1330+msgstr ""
1331+
1332+#: ../plugins/security-privacy//PhoneLocking.qml:132
1333+msgid "Other apps and functions will prompt you to unlock."
1334+msgstr ""
1335+
1336 #: ../plugins/security-privacy//Location.qml:31
1337-#: ../wizard/qml/Pages//30-location.qml:25
1338+#: ../wizard/qml/Pages//50-location.qml:25
1339 msgid "Location"
1340 msgstr ""
1341
1342-#: ../plugins/security-privacy//Location.qml:49
1343+#: ../plugins/security-privacy//Location.qml:59
1344 msgid "Location detection"
1345 msgstr ""
1346
1347-#: ../plugins/security-privacy//Location.qml:71
1348+#: ../plugins/security-privacy//Location.qml:81
1349 msgid ""
1350 "Uses GPS to detect your rough location. When off, GPS turns off to save "
1351 "battery."
1352 msgstr ""
1353
1354-#: ../plugins/security-privacy//Location.qml:73
1355+#: ../plugins/security-privacy//Location.qml:83
1356 msgid ""
1357 "Uses wi-fi and GPS to detect your rough location. Turning off location "
1358 "detection saves battery."
1359 msgstr ""
1360
1361-#: ../plugins/security-privacy//Location.qml:75
1362+#: ../plugins/security-privacy//Location.qml:85
1363 msgid ""
1364 "Uses wi-fi (currently off) and GPS to detect your rough location. Turning "
1365 "off location detection saves battery."
1366 msgstr ""
1367
1368-#: ../plugins/security-privacy//Location.qml:77
1369+#: ../plugins/security-privacy//Location.qml:87
1370 msgid ""
1371 "Uses wi-fi, cell tower locations, and GPS to detect your rough location. "
1372 "Turning off location detection saves battery."
1373 msgstr ""
1374
1375-#: ../plugins/security-privacy//Location.qml:79
1376+#: ../plugins/security-privacy//Location.qml:89
1377 msgid ""
1378 "Uses wi-fi, cell tower locations (no current cellular connection), and GPS "
1379 "to detect your rough location. Turning off location detection saves battery."
1380 msgstr ""
1381
1382-#: ../plugins/security-privacy//Location.qml:81
1383+#: ../plugins/security-privacy//Location.qml:91
1384 msgid ""
1385 "Uses wi-fi (currently off), cell tower locations, and GPS to detect your "
1386 "rough location. Turning off location detection saves battery."
1387 msgstr ""
1388
1389-#: ../plugins/security-privacy//Location.qml:83
1390+#: ../plugins/security-privacy//Location.qml:93
1391 msgid ""
1392 "Uses wi-fi (currently off), cell tower locations (no current cellular "
1393 "connection), and GPS to detect your rough location. Turning off location "
1394 "detection saves battery."
1395 msgstr ""
1396
1397-#: ../plugins/security-privacy//Location.qml:90
1398+#: ../plugins/security-privacy//Location.qml:100
1399 msgid "Allow access to location:"
1400 msgstr ""
1401
1402@@ -1275,97 +875,9 @@
1403 msgid "Entering an incorrect PIN repeatedly may lock the SIM permanently."
1404 msgstr ""
1405
1406-#: ../plugins/security-privacy//PhoneLocking.qml:31
1407-msgid "Phone locking"
1408-msgstr ""
1409-
1410-#: ../plugins/security-privacy//PhoneLocking.qml:45
1411-msgctxt "Unlock with swipe"
1412-msgid "None"
1413-msgstr ""
1414-
1415-#: ../plugins/security-privacy//PhoneLocking.qml:46
1416-#: ../wizard/qml/Pages//15-passwd.qml:106
1417-msgid "PIN code"
1418-msgstr ""
1419-
1420-#: ../plugins/security-privacy//PhoneLocking.qml:47
1421-#: ../plugins/security-privacy//LockSecurity.qml:350
1422-#: ../wizard/qml/Pages//15-passwd.qml:108
1423-msgid "Passphrase"
1424-msgstr ""
1425-
1426-#: ../plugins/security-privacy//PhoneLocking.qml:68
1427-#: ../plugins/battery//PageComponent.qml:306
1428-msgid "Lock when idle"
1429-msgstr ""
1430-
1431-#: ../plugins/security-privacy//PhoneLocking.qml:69
1432-#: ../plugins/battery//PageComponent.qml:306
1433-msgid "Sleep when idle"
1434-msgstr ""
1435-
1436-#. TRANSLATORS: %1 is the number of minutes
1437-#: ../plugins/security-privacy//PhoneLocking.qml:75
1438-#: ../plugins/security-privacy//PhoneLocking.qml:84
1439-#, qt-format
1440-msgid "%1 minute"
1441-msgid_plural "%1 minutes"
1442-msgstr[0] ""
1443-msgstr[1] ""
1444-
1445-#: ../plugins/security-privacy//PhoneLocking.qml:101
1446-msgid "Sleep locks immediately"
1447-msgstr ""
1448-
1449-#: ../plugins/security-privacy//PhoneLocking.qml:106
1450-msgid "When locked, allow:"
1451-msgstr ""
1452-
1453-#: ../plugins/security-privacy//PhoneLocking.qml:110
1454-msgid "Launcher"
1455-msgstr ""
1456-
1457-#: ../plugins/security-privacy//PhoneLocking.qml:120
1458-msgid "Notifications and quick settings"
1459-msgstr ""
1460-
1461-#: ../plugins/security-privacy//PhoneLocking.qml:131
1462-msgid "Turn on lock security to restrict access when the phone is locked."
1463-msgstr ""
1464-
1465-#: ../plugins/security-privacy//PhoneLocking.qml:132
1466-msgid "Other apps and functions will prompt you to unlock."
1467-msgstr ""
1468-
1469-#: ../plugins/security-privacy//AppAccess.qml:35
1470-msgid "Apps that you have granted and have requested access to:"
1471-msgstr ""
1472-
1473-#: ../plugins/security-privacy//AppAccess.qml:42
1474-msgid "Apps that have requested access to your camera"
1475-msgstr ""
1476-
1477-#: ../plugins/security-privacy//AppAccess.qml:46
1478-msgid "Mic"
1479-msgstr ""
1480-
1481-#: ../plugins/security-privacy//AppAccess.qml:47
1482-msgid "Apps that have requested access to your mic"
1483-msgstr ""
1484-
1485-#: ../plugins/security-privacy//AppAccess.qml:59
1486-#, qt-format
1487-msgid "%1/%2"
1488-msgstr ""
1489-
1490-#: ../plugins/security-privacy//AppAccess.qml:60
1491-msgid "0"
1492-msgstr ""
1493-
1494 #: ../plugins/security-privacy//LockSecurity.qml:96
1495 #: ../plugins/security-privacy//LockSecurity.qml:384
1496-msgid "Change PIN code…"
1497+msgid "Change passcode…"
1498 msgstr ""
1499
1500 #: ../plugins/security-privacy//LockSecurity.qml:98
1501@@ -1378,7 +890,7 @@
1502 msgstr ""
1503
1504 #: ../plugins/security-privacy//LockSecurity.qml:107
1505-msgid "Switch to PIN code"
1506+msgid "Switch to passcode"
1507 msgstr ""
1508
1509 #: ../plugins/security-privacy//LockSecurity.qml:109
1510@@ -1386,7 +898,7 @@
1511 msgstr ""
1512
1513 #: ../plugins/security-privacy//LockSecurity.qml:118
1514-msgid "Existing PIN code"
1515+msgid "Existing passcode"
1516 msgstr ""
1517
1518 #: ../plugins/security-privacy//LockSecurity.qml:120
1519@@ -1394,7 +906,7 @@
1520 msgstr ""
1521
1522 #: ../plugins/security-privacy//LockSecurity.qml:174
1523-msgid "Choose PIN code"
1524+msgid "Choose passcode"
1525 msgstr ""
1526
1527 #: ../plugins/security-privacy//LockSecurity.qml:176
1528@@ -1402,15 +914,17 @@
1529 msgstr ""
1530
1531 #: ../plugins/security-privacy//LockSecurity.qml:220
1532-msgid "Confirm PIN code"
1533+#: ../wizard/qml/Pages//passwd-confirm.qml:48
1534+msgid "Confirm passcode"
1535 msgstr ""
1536
1537 #: ../plugins/security-privacy//LockSecurity.qml:222
1538+#: ../wizard/qml/Pages//passwd-confirm.qml:47
1539 msgid "Confirm passphrase"
1540 msgstr ""
1541
1542 #: ../plugins/security-privacy//LockSecurity.qml:265
1543-msgid "Those PIN codes don't match. Try again."
1544+msgid "Those passcodes don't match. Try again."
1545 msgstr ""
1546
1547 #: ../plugins/security-privacy//LockSecurity.qml:268
1548@@ -1430,7 +944,7 @@
1549 msgstr ""
1550
1551 #: ../plugins/security-privacy//LockSecurity.qml:349
1552-msgid "4-digit PIN code"
1553+msgid "4-digit passcode"
1554 msgstr ""
1555
1556 #: ../plugins/security-privacy//LockSecurity.qml:351
1557@@ -1438,126 +952,651 @@
1558 msgstr ""
1559
1560 #: ../plugins/security-privacy//LockSecurity.qml:352
1561-msgid "4-digit PIN code…"
1562+msgid "4-digit passcode…"
1563 msgstr ""
1564
1565 #: ../plugins/security-privacy//LockSecurity.qml:353
1566 msgid "Passphrase…"
1567 msgstr ""
1568
1569-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
1570-#: ../plugins/time-date//PageComponent.qml:29
1571-#: ../po/settings.js:266
1572-msgid "Time & Date"
1573-msgstr ""
1574-
1575-#: ../plugins/time-date//PageComponent.qml:53
1576-msgid "Time zone:"
1577-msgstr ""
1578-
1579-#: ../plugins/time-date//PageComponent.qml:68
1580-msgid "Set the time and date:"
1581-msgstr ""
1582-
1583-#: ../plugins/time-date//PageComponent.qml:69
1584-#: ../plugins/time-date//ChooseTimeZone.qml:47
1585-#: ../plugins/cellular//PageChooseCarrier.qml:103
1586-msgid "Automatically"
1587-msgstr ""
1588-
1589-#: ../plugins/time-date//TimePicker.qml:26
1590-msgid "Set time & date"
1591-msgstr ""
1592-
1593-#: ../plugins/time-date//TimePicker.qml:68
1594-msgid "Time"
1595-msgstr ""
1596-
1597-#: ../plugins/time-date//TimePicker.qml:81
1598-msgid "Hour"
1599-msgstr ""
1600-
1601-#: ../plugins/time-date//TimePicker.qml:95
1602-msgid "Minute"
1603-msgstr ""
1604-
1605-#: ../plugins/time-date//TimePicker.qml:109
1606-msgid "Second"
1607-msgstr ""
1608-
1609-#: ../plugins/time-date//TimePicker.qml:118
1610-msgid "Date"
1611-msgstr ""
1612-
1613-#: ../plugins/time-date//TimePicker.qml:130
1614-msgid "Day"
1615-msgstr ""
1616-
1617-#: ../plugins/time-date//TimePicker.qml:144
1618-msgid "Month"
1619-msgstr ""
1620-
1621-#: ../plugins/time-date//TimePicker.qml:162
1622-msgid "Year"
1623-msgstr ""
1624-
1625-#: ../plugins/time-date//ChooseTimeZone.qml:28
1626-msgid "Time zone"
1627-msgstr ""
1628-
1629-#: ../plugins/time-date//ChooseTimeZone.qml:46
1630-msgid "Set the time zone:"
1631-msgstr ""
1632-
1633-#: ../plugins/time-date//ChooseTimeZone.qml:126
1634-msgid "Enter your current location."
1635-msgstr ""
1636-
1637-#: ../plugins/time-date//ChooseTimeZone.qml:127
1638-msgid "No matching place"
1639-msgstr ""
1640-
1641-#: ../plugins/reset//ResetLauncherHome.qml:40
1642-msgid "The Launcher will be returned to its original contents."
1643-msgstr ""
1644-
1645-#: ../plugins/reset//ResetLauncherHome.qml:44
1646-#: ../plugins/reset//PageComponent.qml:73
1647-msgid "Reset Launcher"
1648-msgstr ""
1649-
1650-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
1651-#: ../plugins/reset//PageComponent.qml:32
1652-#: ../po/settings.js:276
1653-msgid "Reset phone"
1654-msgstr ""
1655-
1656-#: ../plugins/reset//PageComponent.qml:87
1657-msgid "Reset all system settings…"
1658-msgstr ""
1659-
1660-#: ../plugins/reset//PageComponent.qml:101
1661-msgid "Erase & Reset Everything…"
1662-msgstr ""
1663-
1664-#: ../plugins/reset//EraseEverything.qml:41
1665-msgid ""
1666-"All documents, saved games, settings, and other items will be permanently "
1667-"deleted from this phone."
1668-msgstr ""
1669-
1670-#: ../plugins/reset//EraseEverything.qml:44
1671-msgid "Erase & Reset Everything"
1672-msgstr ""
1673-
1674-#: ../plugins/reset//ResetAllSettings.qml:29
1675-msgid ""
1676-"The contents and layout of the launcher, and the filters in the home screen "
1677-"will be returned to their original settings."
1678-msgstr ""
1679-
1680-#: ../plugins/reset//ResetAllSettings.qml:31
1681-msgid "Reset all system settings"
1682+#: ../plugins/system-update//Configuration.qml:29
1683+#: ../plugins/system-update//PageComponent.qml:686
1684+msgid "Auto download"
1685+msgstr ""
1686+
1687+#: ../plugins/system-update//Configuration.qml:34
1688+msgid "Download future updates automatically:"
1689+msgstr ""
1690+
1691+#: ../plugins/system-update//Configuration.qml:53
1692+msgid "When on wi-fi"
1693+msgstr ""
1694+
1695+#: ../plugins/system-update//Configuration.qml:54
1696+msgid "On any data connection"
1697+msgstr ""
1698+
1699+#: ../plugins/system-update//Configuration.qml:55
1700+msgid "Data charges may apply."
1701+msgstr ""
1702+
1703+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
1704+#: ../plugins/system-update//PageComponent.qml:37
1705+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:114
1706+msgid "Updates"
1707+msgstr ""
1708+
1709+#: ../plugins/system-update//PageComponent.qml:94
1710+msgid "Update System"
1711+msgstr ""
1712+
1713+#: ../plugins/system-update//PageComponent.qml:95
1714+msgid "The phone needs to restart to install the system update."
1715+msgstr ""
1716+
1717+#: ../plugins/system-update//PageComponent.qml:95
1718+msgid "Connect the phone to power before installing the system update."
1719+msgstr ""
1720+
1721+#: ../plugins/system-update//PageComponent.qml:98
1722+msgid "Install & Restart"
1723+msgstr ""
1724+
1725+#: ../plugins/system-update//PageComponent.qml:108
1726+msgid "Not Now"
1727+msgstr ""
1728+
1729+#: ../plugins/system-update//PageComponent.qml:114
1730+msgid "Install"
1731+msgstr ""
1732+
1733+#: ../plugins/system-update//PageComponent.qml:135
1734+msgid "Software is up to date"
1735+msgstr ""
1736+
1737+#: ../plugins/system-update//PageComponent.qml:201
1738+msgid "Restarting…"
1739+msgstr ""
1740+
1741+#: ../plugins/system-update//PageComponent.qml:246
1742+msgid "Checking for updates…"
1743+msgstr ""
1744+
1745+#: ../plugins/system-update//PageComponent.qml:265
1746+#, qt-format
1747+msgid "Install %1 update…"
1748+msgid_plural "Install %1 updates…"
1749+msgstr[0] ""
1750+msgstr[1] ""
1751+
1752+#: ../plugins/system-update//PageComponent.qml:266
1753+#, qt-format
1754+msgid "Install %1 update"
1755+msgid_plural "Install %1 updates"
1756+msgstr[0] ""
1757+msgstr[1] ""
1758+
1759+#: ../plugins/system-update//PageComponent.qml:267
1760+msgid "Pause All"
1761+msgstr ""
1762+
1763+#: ../plugins/system-update//PageComponent.qml:398
1764+msgid "Retry"
1765+msgstr ""
1766+
1767+#: ../plugins/system-update//PageComponent.qml:401
1768+msgid "Install…"
1769+msgstr ""
1770+
1771+#: ../plugins/system-update//PageComponent.qml:403
1772+msgid "Download"
1773+msgstr ""
1774+
1775+#: ../plugins/system-update//PageComponent.qml:407
1776+msgid "Pause"
1777+msgstr ""
1778+
1779+#: ../plugins/system-update//PageComponent.qml:409
1780+msgid "Resume"
1781+msgstr ""
1782+
1783+#: ../plugins/system-update//PageComponent.qml:411
1784+msgid "Update"
1785+msgstr ""
1786+
1787+#: ../plugins/system-update//PageComponent.qml:449
1788+msgid "Installing"
1789+msgstr ""
1790+
1791+#: ../plugins/system-update//PageComponent.qml:451
1792+msgid "Installed"
1793+msgstr ""
1794+
1795+#: ../plugins/system-update//PageComponent.qml:452
1796+msgid "Downloading"
1797+msgstr ""
1798+
1799+#: ../plugins/system-update//PageComponent.qml:463
1800+#, qt-format
1801+msgid "%1 of %2"
1802+msgstr ""
1803+
1804+#: ../plugins/system-update//PageComponent.qml:562
1805+msgid "Version: "
1806+msgstr ""
1807+
1808+#: ../plugins/system-update//PageComponent.qml:594
1809+msgid "Sign in to Ubuntu One to receive updates for apps."
1810+msgstr ""
1811+
1812+#: ../plugins/system-update//PageComponent.qml:603
1813+msgid "Sign In…"
1814+msgstr ""
1815+
1816+#: ../plugins/system-update//PageComponent.qml:647
1817+msgid "Installing update…"
1818+msgstr ""
1819+
1820+#: ../plugins/system-update//PageComponent.qml:691
1821+msgid "On wi-fi"
1822+msgstr ""
1823+
1824+#: ../plugins/system-update//PageComponent.qml:693
1825+msgid "Always"
1826+msgstr ""
1827+
1828+#: ../plugins/system-update//PageComponent.qml:708
1829+msgid " bytes"
1830+msgstr ""
1831+
1832+#: ../plugins/system-update//PageComponent.qml:711
1833+msgid " KiB"
1834+msgstr ""
1835+
1836+#: ../plugins/system-update//PageComponent.qml:714
1837+msgid " MiB"
1838+msgstr ""
1839+
1840+#: ../plugins/system-update//PageComponent.qml:717
1841+msgid " GiB"
1842+msgstr ""
1843+
1844+#: ../plugins/background//Preview.qml:70
1845+msgid "Preview"
1846+msgstr ""
1847+
1848+#: ../plugins/background//Preview.qml:102
1849+msgid "Remove image"
1850+msgstr ""
1851+
1852+#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
1853+#: ../plugins/background//MainPage.qml:35
1854+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:146
1855+msgid "Background"
1856+msgstr ""
1857+
1858+#: ../plugins/background//MainPage.qml:99
1859+msgid "Ubuntu Art"
1860+msgstr ""
1861+
1862+#: ../plugins/background//MainPage.qml:115
1863+msgid "Custom"
1864+msgstr ""
1865+
1866+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
1867+#: ../plugins/language//PageComponent.qml:34
1868+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:170
1869+msgid "Language & Text"
1870+msgstr ""
1871+
1872+#: ../plugins/language//PageComponent.qml:100
1873+msgid "Display language…"
1874+msgstr ""
1875+
1876+#: ../plugins/language//PageComponent.qml:117
1877+#: ../plugins/language//KeyboardLayouts.qml:26
1878+msgid "Keyboard layouts"
1879+msgstr ""
1880+
1881+#: ../plugins/language//PageComponent.qml:132
1882+#: ../plugins/language//PageComponent.qml:142
1883+#: ../plugins/language//SpellChecking.qml:27
1884+#: ../plugins/language//SpellChecking.qml:36
1885+msgid "Spell checking"
1886+msgstr ""
1887+
1888+#: ../plugins/language//PageComponent.qml:152
1889+msgid "Auto correction"
1890+msgstr ""
1891+
1892+#: ../plugins/language//PageComponent.qml:162
1893+msgid "Word suggestions"
1894+msgstr ""
1895+
1896+#: ../plugins/language//PageComponent.qml:175
1897+msgid "Auto capitalization"
1898+msgstr ""
1899+
1900+#: ../plugins/language//PageComponent.qml:185
1901+msgid "Turns on Shift to capitalize the first letter of each sentence."
1902+msgstr ""
1903+
1904+#: ../plugins/language//PageComponent.qml:192
1905+msgid "Auto punctuation"
1906+msgstr ""
1907+
1908+#: ../plugins/language//PageComponent.qml:202
1909+msgid ""
1910+"Adds a period, and any missing quotes or brackets, when you tap Space twice."
1911+msgstr ""
1912+
1913+#: ../plugins/language//PageComponent.qml:219
1914+msgid "Keyboard vibration"
1915+msgstr ""
1916+
1917+#: ../plugins/language//RebootNecessary.qml:38
1918+msgid "Restart Now"
1919+msgstr ""
1920+
1921+#: ../plugins/language//SpellChecking.qml:53
1922+msgid "Current spelling languages:"
1923+msgstr ""
1924+
1925+#: ../plugins/language//SpellChecking.qml:54
1926+msgid "All languages available:"
1927+msgstr ""
1928+
1929+#: ../plugins/language//KeyboardLayouts.qml:39
1930+msgid "Current layouts:"
1931+msgstr ""
1932+
1933+#: ../plugins/language//KeyboardLayouts.qml:40
1934+msgid "All layouts available:"
1935+msgstr ""
1936+
1937+#: ../plugins/language//DisplayLanguage.qml:36
1938+msgid "Display language"
1939+msgstr ""
1940+
1941+#: ../plugins/language//DisplayLanguage.qml:118
1942+msgid "Confirm"
1943+msgstr ""
1944+
1945+#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
1946+#: ../plugins/notifications//PageComponent.qml:29
1947+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:196
1948+msgid "Notifications"
1949+msgstr ""
1950+
1951+#: ../plugins/notifications//PageComponent.qml:40
1952+msgid ""
1953+"Selected apps can alert you using notification bubbles, sounds, vibrations, "
1954+"and the Notification Center."
1955+msgstr ""
1956+
1957+#: ../plugins/brightness//BrightnessSlider.qml:51
1958+#: ../plugins/battery//PageComponent.qml:296
1959+msgid "Display brightness"
1960+msgstr ""
1961+
1962+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
1963+#: ../plugins/brightness//PageComponent.qml:32
1964+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:220
1965+msgid "Brightness"
1966+msgstr ""
1967+
1968+#: ../plugins/brightness//PageComponent.qml:52
1969+msgid "Adjust automatically"
1970+msgstr ""
1971+
1972+#: ../plugins/brightness//PageComponent.qml:65
1973+msgid "Brightens and dims the display to suit the surroundings."
1974+msgstr ""
1975+
1976+#: ../plugins/wifi//NetworkDetails.qml:38
1977+msgid "Network details"
1978+msgstr ""
1979+
1980+#: ../plugins/wifi//NetworkDetails.qml:53
1981+msgid "Last connected"
1982+msgstr ""
1983+
1984+#: ../plugins/wifi//NetworkDetails.qml:64
1985+#: ../plugins/wifi//OtherNetwork.qml:222
1986+msgid "Password"
1987+msgstr ""
1988+
1989+#: ../plugins/wifi//NetworkDetails.qml:77
1990+#: ../plugins/wifi//OtherNetwork.qml:256
1991+msgid "Show password"
1992+msgstr ""
1993+
1994+#: ../plugins/wifi//NetworkDetails.qml:88
1995+msgid "Forget network"
1996+msgstr ""
1997+
1998+#: ../plugins/wifi//RemoveBackground.qml:28
1999+msgid "Clear"
2000+msgstr ""
2001+
2002+#: ../plugins/wifi//Common.qml:36
2003+msgid "Unknown error"
2004+msgstr ""
2005+
2006+#: ../plugins/wifi//Common.qml:38
2007+msgid "No reason given"
2008+msgstr ""
2009+
2010+#: ../plugins/wifi//Common.qml:40
2011+msgid "Device is now managed"
2012+msgstr ""
2013+
2014+#: ../plugins/wifi//Common.qml:42
2015+msgid "Device is now unmanaged"
2016+msgstr ""
2017+
2018+#: ../plugins/wifi//Common.qml:44
2019+msgid "The device could not be readied for configuration"
2020+msgstr ""
2021+
2022+#: ../plugins/wifi//Common.qml:46
2023+msgid ""
2024+"IP configuration could not be reserved (no available address, timeout, etc.)"
2025+msgstr ""
2026+
2027+#: ../plugins/wifi//Common.qml:48
2028+msgid "The IP configuration is no longer valid"
2029+msgstr ""
2030+
2031+#: ../plugins/wifi//Common.qml:50
2032+msgid "Your authentication details were incorrect"
2033+msgstr ""
2034+
2035+#: ../plugins/wifi//Common.qml:52
2036+msgid "802.1X supplicant disconnected"
2037+msgstr ""
2038+
2039+#: ../plugins/wifi//Common.qml:54
2040+msgid "802.1X supplicant configuration failed"
2041+msgstr ""
2042+
2043+#: ../plugins/wifi//Common.qml:56
2044+msgid "802.1X supplicant failed"
2045+msgstr ""
2046+
2047+#: ../plugins/wifi//Common.qml:58
2048+msgid "802.1X supplicant took too long to authenticate"
2049+msgstr ""
2050+
2051+#: ../plugins/wifi//Common.qml:60
2052+msgid "DHCP client failed to start"
2053+msgstr ""
2054+
2055+#: ../plugins/wifi//Common.qml:62
2056+msgid "DHCP client error"
2057+msgstr ""
2058+
2059+#: ../plugins/wifi//Common.qml:64
2060+msgid "DHCP client failed"
2061+msgstr ""
2062+
2063+#: ../plugins/wifi//Common.qml:66
2064+msgid "Shared connection service failed to start"
2065+msgstr ""
2066+
2067+#: ../plugins/wifi//Common.qml:68
2068+msgid "Shared connection service failed"
2069+msgstr ""
2070+
2071+#: ../plugins/wifi//Common.qml:70
2072+msgid "Necessary firmware for the device may be missing"
2073+msgstr ""
2074+
2075+#: ../plugins/wifi//Common.qml:72
2076+msgid "The device was removed"
2077+msgstr ""
2078+
2079+#: ../plugins/wifi//Common.qml:74
2080+msgid "NetworkManager went to sleep"
2081+msgstr ""
2082+
2083+#: ../plugins/wifi//Common.qml:76
2084+msgid "The device's active connection disappeared"
2085+msgstr ""
2086+
2087+#: ../plugins/wifi//Common.qml:78
2088+msgid "Device disconnected by user or client"
2089+msgstr ""
2090+
2091+#: ../plugins/wifi//Common.qml:80
2092+msgid "The device's existing connection was assumed"
2093+msgstr ""
2094+
2095+#: ../plugins/wifi//Common.qml:82
2096+msgid "The supplicant is now available"
2097+msgstr ""
2098+
2099+#: ../plugins/wifi//Common.qml:84
2100+msgid "The modem could not be found"
2101+msgstr ""
2102+
2103+#: ../plugins/wifi//Common.qml:86
2104+msgid "The Bluetooth connection failed or timed out"
2105+msgstr ""
2106+
2107+#: ../plugins/wifi//Common.qml:88
2108+msgid "A dependency of the connection failed"
2109+msgstr ""
2110+
2111+#: ../plugins/wifi//Common.qml:90
2112+msgid "ModemManager is unavailable"
2113+msgstr ""
2114+
2115+#: ../plugins/wifi//Common.qml:92
2116+msgid "The Wi-Fi network could not be found"
2117+msgstr ""
2118+
2119+#: ../plugins/wifi//Common.qml:94
2120+msgid "A secondary connection of the base connection failed"
2121+msgstr ""
2122+
2123+#: ../plugins/wifi//PreviousNetworks.qml:27
2124+#: ../plugins/wifi//PageComponent.qml:132
2125+msgid "Previous networks"
2126+msgstr ""
2127+
2128+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2129+#: ../plugins/wifi//PageComponent.qml:28
2130+#: ../plugins/battery//PageComponent.qml:333
2131+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:232
2132+msgid "Wi-Fi"
2133+msgstr ""
2134+
2135+#: ../plugins/wifi//PageComponent.qml:139
2136+msgid "Connect to hidden network…"
2137+msgstr ""
2138+
2139+#: ../plugins/wifi//OtherNetwork.qml:96
2140+msgid "Connect to Hidden Network"
2141+msgstr ""
2142+
2143+#: ../plugins/wifi//OtherNetwork.qml:187
2144+msgid "Network name"
2145+msgstr ""
2146+
2147+#: ../plugins/wifi//OtherNetwork.qml:215
2148+msgid "WPA & WPA2 Personal"
2149+msgstr ""
2150+
2151+#: ../plugins/wifi//OtherNetwork.qml:216
2152+msgid "WEP"
2153+msgstr ""
2154+
2155+#: ../plugins/wifi//NetworkDetailsBrief.qml:58
2156+msgid "IP address"
2157+msgstr ""
2158+
2159+#: ../plugins/about//Version.qml:36
2160+msgid "OS Build Details"
2161+msgstr ""
2162+
2163+#: ../plugins/about//Version.qml:61
2164+msgid "OS build number"
2165+msgstr ""
2166+
2167+#: ../plugins/about//Version.qml:67
2168+msgid "Ubuntu Image part"
2169+msgstr ""
2170+
2171+#: ../plugins/about//Version.qml:75
2172+msgid "Ubuntu build description"
2173+msgstr ""
2174+
2175+#: ../plugins/about//Version.qml:81
2176+msgid "Device Image part"
2177+msgstr ""
2178+
2179+#: ../plugins/about//Version.qml:88
2180+msgid "Device build description"
2181+msgstr ""
2182+
2183+#: ../plugins/about//Version.qml:95
2184+msgid "Customization Image part"
2185+msgstr ""
2186+
2187+#: ../plugins/about//PhoneNumber.qml:36
2188+msgid "Phone number"
2189+msgstr ""
2190+
2191+#: ../plugins/about//Storage.qml:33 ../plugins/about//PageComponent.qml:143
2192+msgid "Storage"
2193+msgstr ""
2194+
2195+#: ../plugins/about//Storage.qml:85
2196+msgid "Used by Ubuntu"
2197+msgstr ""
2198+
2199+#: ../plugins/about//Storage.qml:86
2200+msgid "Videos"
2201+msgstr ""
2202+
2203+#: ../plugins/about//Storage.qml:87
2204+msgid "Audio"
2205+msgstr ""
2206+
2207+#: ../plugins/about//Storage.qml:88
2208+msgid "Pictures"
2209+msgstr ""
2210+
2211+#: ../plugins/about//Storage.qml:89
2212+msgid "Other files"
2213+msgstr ""
2214+
2215+#: ../plugins/about//Storage.qml:90
2216+msgid "Used by apps"
2217+msgstr ""
2218+
2219+#: ../plugins/about//Storage.qml:140
2220+msgid "Total storage"
2221+msgstr ""
2222+
2223+#: ../plugins/about//Storage.qml:152
2224+msgid "Free space"
2225+msgstr ""
2226+
2227+#: ../plugins/about//Storage.qml:172
2228+msgid "By name"
2229+msgstr ""
2230+
2231+#: ../plugins/about//Storage.qml:172
2232+msgid "By size"
2233+msgstr ""
2234+
2235+#: ../plugins/about//Storage.qml:203
2236+#: ../plugins/cellular//PageChooseCarriers.qml:49
2237+#: ../plugins/cellular//PageChooseCarriers.qml:65
2238+#: ../plugins/battery//PageComponent.qml:131
2239+#: ../plugins/battery//PageComponent.qml:287
2240+#: ../plugins/cellular//Components//SingleSim.qml:62
2241+#: ../plugins/cellular//Components//NoSim.qml:48
2242+msgid "N/A"
2243+msgstr ""
2244+
2245+#: ../plugins/about//License.qml:30
2246+msgid "Sorry, this license could not be displayed."
2247+msgstr ""
2248+
2249+#: ../plugins/about//PhoneNumbers.qml:31
2250+msgid "Phone number:"
2251+msgstr ""
2252+
2253+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2254+#: ../plugins/about//PageComponent.qml:34
2255+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:252
2256+msgid "About this phone"
2257+msgstr ""
2258+
2259+#: ../plugins/about//PageComponent.qml:109
2260+msgid "Serial"
2261+msgstr ""
2262+
2263+#: ../plugins/about//PageComponent.qml:124
2264+msgid "Wi-Fi address"
2265+msgstr ""
2266+
2267+#: ../plugins/about//PageComponent.qml:132
2268+msgid "Bluetooth address"
2269+msgstr ""
2270+
2271+#: ../plugins/about//PageComponent.qml:144
2272+#, qt-format
2273+msgid "%1 free"
2274+msgstr ""
2275+
2276+#: ../plugins/about//PageComponent.qml:151
2277+msgid "Software:"
2278+msgstr ""
2279+
2280+#: ../plugins/about//PageComponent.qml:156
2281+msgid "OS"
2282+msgstr ""
2283+
2284+#: ../plugins/about//PageComponent.qml:165
2285+msgid "Last updated"
2286+msgstr ""
2287+
2288+#: ../plugins/about//PageComponent.qml:173
2289+msgid "Check for updates"
2290+msgstr ""
2291+
2292+#: ../plugins/about//PageComponent.qml:182
2293+msgid "Legal:"
2294+msgstr ""
2295+
2296+#: ../plugins/about//PageComponent.qml:187 ../plugins/about//Software.qml:11
2297+msgid "Software licenses"
2298+msgstr ""
2299+
2300+#: ../plugins/about//PageComponent.qml:195
2301+msgid "Regulatory info"
2302+msgstr ""
2303+
2304+#: ../plugins/about//PageComponent.qml:203
2305+msgid "Developer mode"
2306+msgstr ""
2307+
2308+#: ../plugins/about//DevMode.qml:35 ../plugins/about//DevMode.qml:90
2309+msgid "Developer Mode"
2310+msgstr ""
2311+
2312+#: ../plugins/about//DevMode.qml:84
2313+msgid ""
2314+"In Developer Mode, anyone can access, change or delete anything on this "
2315+"phone by connecting it to another device."
2316+msgstr ""
2317+
2318+#: ../plugins/about//DevMode.qml:110
2319+msgid "You need a passcode or passphrase set to use Developer Mode."
2320 msgstr ""
2321
2322 #: ../plugins/cellular//HotspotSetup.qml:29
2323@@ -1576,27 +1615,20 @@
2324 msgid "Show key"
2325 msgstr ""
2326
2327+#: ../plugins/cellular//PageChooseCarriers.qml:28
2328+#: ../plugins/cellular//Components//MultiSim.qml:68
2329+msgid "Carriers"
2330+msgstr ""
2331+
2332 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2333 #: ../plugins/cellular//PageComponent.qml:32
2334-#: ../po/settings.js:288
2335+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:288
2336 msgid "Cellular"
2337 msgstr ""
2338
2339-#: ../plugins/cellular//PageChooseCarrier.qml:102
2340-msgid "Choose carrier:"
2341-msgstr ""
2342-
2343-#: ../plugins/cellular//PageChooseCarrier.qml:130
2344-msgid "Refresh"
2345-msgstr ""
2346-
2347-#: ../plugins/cellular//PageChooseCarrier.qml:151
2348-msgid "Searching"
2349-msgstr ""
2350-
2351 #: ../plugins/cellular//Hotspot.qml:29
2352+#: ../plugins/cellular//Components//MultiSim.qml:48
2353 #: ../plugins/cellular//Components//SingleSim.qml:43
2354-#: ../plugins/cellular//Components//MultiSim.qml:48
2355 msgid "Wi-Fi hotspot"
2356 msgstr ""
2357
2358@@ -1620,14 +1652,39 @@
2359 msgid "Set up hotspot"
2360 msgstr ""
2361
2362-#: ../plugins/cellular//PageChooseCarriers.qml:28
2363-#: ../plugins/cellular//Components//MultiSim.qml:68
2364-msgid "Carriers"
2365+#: ../plugins/cellular//PageChooseCarrier.qml:102
2366+msgid "Choose carrier:"
2367+msgstr ""
2368+
2369+#: ../plugins/cellular//PageChooseCarrier.qml:130
2370+msgid "Refresh"
2371+msgstr ""
2372+
2373+#: ../plugins/cellular//PageChooseCarrier.qml:151
2374+msgid "Searching"
2375+msgstr ""
2376+
2377+#: ../plugins/battery//SleepValues.qml:77
2378+msgid "Lock the phone when it's not in use:"
2379+msgstr ""
2380+
2381+#: ../plugins/battery//SleepValues.qml:77
2382+msgid "Put the phone to sleep when it is not in use:"
2383+msgstr ""
2384+
2385+#: ../plugins/battery//SleepValues.qml:117
2386+msgid ""
2387+"Shorter times are more secure. Phone won't lock during calls or video "
2388+"playback."
2389+msgstr ""
2390+
2391+#: ../plugins/battery//SleepValues.qml:117
2392+msgid "Phone won’t sleep during calls or video playback."
2393 msgstr ""
2394
2395 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2396 #: ../plugins/battery//PageComponent.qml:34
2397-#: ../po/settings.js:316
2398+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:316
2399 msgid "Battery"
2400 msgstr ""
2401
2402@@ -1699,11 +1756,6 @@
2403 msgid "Ways to reduce battery use:"
2404 msgstr ""
2405
2406-#: ../plugins/battery//PageComponent.qml:296
2407-#: ../plugins/brightness//BrightnessSlider.qml:51
2408-msgid "Display brightness"
2409-msgstr ""
2410-
2411 #: ../plugins/battery//PageComponent.qml:394
2412 msgid "GPS"
2413 msgstr ""
2414@@ -1712,57 +1764,6 @@
2415 msgid "Accurate location detection requires GPS and/or Wi-Fi."
2416 msgstr ""
2417
2418-#: ../plugins/battery//SleepValues.qml:77
2419-msgid "Lock the phone when it's not in use:"
2420-msgstr ""
2421-
2422-#: ../plugins/battery//SleepValues.qml:77
2423-msgid "Put the phone to sleep when it is not in use:"
2424-msgstr ""
2425-
2426-#: ../plugins/battery//SleepValues.qml:117
2427-msgid ""
2428-"Shorter times are more secure. Phone won't lock during calls or video "
2429-"playback."
2430-msgstr ""
2431-
2432-#: ../plugins/battery//SleepValues.qml:117
2433-msgid "Phone won’t sleep during calls or video playback."
2434-msgstr ""
2435-
2436-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2437-#: ../plugins/brightness//PageComponent.qml:32
2438-#: ../po/settings.js:332
2439-msgid "Brightness"
2440-msgstr ""
2441-
2442-#: ../plugins/brightness//PageComponent.qml:52
2443-msgid "Adjust automatically"
2444-msgstr ""
2445-
2446-#: ../plugins/brightness//PageComponent.qml:65
2447-msgid "Brightens and dims the display to suit the surroundings."
2448-msgstr ""
2449-
2450-#: ../plugins/background//Components//AddRemove.qml:52
2451-msgid "No images selected"
2452-msgstr ""
2453-
2454-#: ../plugins/background//Components//AddRemove.qml:65
2455-#, qt-format
2456-msgid "Remove %1 image"
2457-msgid_plural "Remove %1 images"
2458-msgstr[0] ""
2459-msgstr[1] ""
2460-
2461-#: ../plugins/background//Components//AddRemove.qml:80
2462-msgid "Add an image…"
2463-msgstr ""
2464-
2465-#: ../plugins/background//Components//AddRemove.qml:91
2466-msgid "Remove images…"
2467-msgstr ""
2468-
2469 #: ../plugins/security-privacy//diagnostics//PageComponent.qml:51
2470 msgid "Privacy policy"
2471 msgstr ""
2472@@ -1783,81 +1784,100 @@
2473 msgid "Includes info about what an app was doing when it failed."
2474 msgstr ""
2475
2476+#: ../plugins/background//Components//AddRemove.qml:52
2477+msgid "No images selected"
2478+msgstr ""
2479+
2480+#: ../plugins/background//Components//AddRemove.qml:65
2481+#, qt-format
2482+msgid "Remove %1 image"
2483+msgid_plural "Remove %1 images"
2484+msgstr[0] ""
2485+msgstr[1] ""
2486+
2487+#: ../plugins/background//Components//AddRemove.qml:80
2488+msgid "Add an image…"
2489+msgstr ""
2490+
2491+#: ../plugins/background//Components//AddRemove.qml:91
2492+msgid "Remove images…"
2493+msgstr ""
2494+
2495+#: ../plugins/cellular//Components//SimEditor.qml:77
2496+msgid "Edit SIM Name"
2497+msgstr ""
2498+
2499+#: ../plugins/cellular//Components//SimEditor.qml:200
2500+msgid "OK"
2501+msgstr ""
2502+
2503+#: ../plugins/cellular//Components//CellularSingleSim.qml:32
2504 #: ../plugins/cellular//Components//CellularMultiSim.qml:82
2505 #: ../plugins/cellular//Components//NoSim.qml:29
2506-#: ../plugins/cellular//Components//CellularSingleSim.qml:32
2507 msgid "Cellular data:"
2508 msgstr ""
2509
2510+#: ../plugins/cellular//Components//CellularSingleSim.qml:51
2511 #: ../plugins/cellular//Components//CellularMultiSim.qml:138
2512 #: ../plugins/cellular//Components//NoSim.qml:32
2513-#: ../plugins/cellular//Components//CellularSingleSim.qml:51
2514 msgid "2G only (saves battery)"
2515 msgstr ""
2516
2517+#: ../plugins/cellular//Components//CellularSingleSim.qml:52
2518 #: ../plugins/cellular//Components//CellularMultiSim.qml:139
2519-#: ../plugins/cellular//Components//CellularSingleSim.qml:52
2520 msgid "2G/3G (faster)"
2521 msgstr ""
2522
2523+#: ../plugins/cellular//Components//CellularSingleSim.qml:53
2524 #: ../plugins/cellular//Components//CellularMultiSim.qml:140
2525 #: ../plugins/cellular//Components//NoSim.qml:32
2526-#: ../plugins/cellular//Components//CellularSingleSim.qml:53
2527 msgid "2G/3G/4G (faster)"
2528 msgstr ""
2529
2530+#: ../plugins/cellular//Components//CellularSingleSim.qml:72
2531 #: ../plugins/cellular//Components//CellularMultiSim.qml:182
2532 #: ../plugins/cellular//Components//NoSim.qml:37
2533-#: ../plugins/cellular//Components//CellularSingleSim.qml:72
2534 msgid "Data roaming"
2535 msgstr ""
2536
2537-#: ../plugins/cellular//Components//SimEditor.qml:77
2538-msgid "Edit SIM Name"
2539-msgstr ""
2540-
2541-#: ../plugins/cellular//Components//SimEditor.qml:200
2542-msgid "OK"
2543-msgstr ""
2544-
2545-#: ../plugins/cellular//Components//NoSim.qml:47
2546-#: ../plugins/cellular//Components//SingleSim.qml:58
2547-#: ../plugins/cellular//Components//SingleSim.qml:66
2548-msgid "Carrier"
2549-msgstr ""
2550-
2551+#: ../plugins/cellular//Components//DefaultSim.qml:31
2552+msgid "Ask me each time"
2553+msgstr ""
2554+
2555+#: ../plugins/cellular//Components//DefaultSim.qml:36
2556+msgid "For outgoing calls, use:"
2557+msgstr ""
2558+
2559+#: ../plugins/cellular//Components//DefaultSim.qml:50
2560+msgid ""
2561+"You can change the SIM for individual calls, or for contacts in the address "
2562+"book."
2563+msgstr ""
2564+
2565+#: ../plugins/cellular//Components//DefaultSim.qml:57
2566+msgid "For messages, use:"
2567+msgstr ""
2568+
2569+#: ../plugins/cellular//Components//MultiSim.qml:42
2570 #: ../plugins/cellular//Components//SingleSim.qml:37
2571-#: ../plugins/cellular//Components//MultiSim.qml:42
2572 msgid "Hotspot disabled because Wi-Fi is off."
2573 msgstr ""
2574
2575+#: ../plugins/cellular//Components//MultiSim.qml:58
2576 #: ../plugins/cellular//Components//SingleSim.qml:52
2577-#: ../plugins/cellular//Components//MultiSim.qml:58
2578 msgid "Data usage statistics"
2579 msgstr ""
2580
2581+#: ../plugins/cellular//Components//SingleSim.qml:58
2582+#: ../plugins/cellular//Components//SingleSim.qml:66
2583+#: ../plugins/cellular//Components//NoSim.qml:47
2584+msgid "Carrier"
2585+msgstr ""
2586+
2587 #: ../plugins/cellular//Components//SingleSim.qml:72
2588 msgid "APN"
2589 msgstr ""
2590
2591-#: ../plugins/cellular//Components//DefaultSim.qml:29
2592-msgid "Ask me each time"
2593-msgstr ""
2594-
2595-#: ../plugins/cellular//Components//DefaultSim.qml:34
2596-msgid "For outgoing calls, use:"
2597-msgstr ""
2598-
2599-#: ../plugins/cellular//Components//DefaultSim.qml:48
2600-msgid ""
2601-"You can change the SIM for individual calls, or for contacts in the address "
2602-"book."
2603-msgstr ""
2604-
2605-#: ../plugins/cellular//Components//DefaultSim.qml:55
2606-msgid "For messages, use:"
2607-msgstr ""
2608-
2609 #: ../src/qml/MainWindow.qml:133
2610 msgid "Search"
2611 msgstr ""
2612@@ -1870,6 +1890,45 @@
2613 msgid "System"
2614 msgstr ""
2615
2616+#: ../wizard/qml/Components//StackButton.qml:40
2617+#, qt-format
2618+msgid "〈 %1"
2619+msgstr ""
2620+
2621+#: ../wizard/qml/Components//StackButton.qml:43
2622+#, qt-format
2623+msgid "%1 〉"
2624+msgstr ""
2625+
2626+#: ../wizard/qml/Components//Page.qml:89
2627+msgid "Back"
2628+msgstr ""
2629+
2630+#: ../wizard/qml/Pages//40-wifi.qml:27
2631+msgid "Connect to Wi‑Fi"
2632+msgstr ""
2633+
2634+#: ../wizard/qml/Pages//40-wifi.qml:146
2635+msgid "Available networks…"
2636+msgstr ""
2637+
2638+#: ../wizard/qml/Pages//40-wifi.qml:147
2639+msgid "No available networks."
2640+msgstr ""
2641+
2642+#: ../wizard/qml/Pages//40-wifi.qml:196
2643+#: ../wizard/qml/Pages//60-reporting.qml:50
2644+#: ../wizard/qml/Pages//50-location.qml:73
2645+#: ../wizard/qml/Pages//10-welcome.qml:85
2646+#: ../wizard/qml/Pages//30-passwd-type.qml:112
2647+msgid "Continue"
2648+msgstr ""
2649+
2650+#: ../wizard/qml/Pages//40-wifi.qml:196 ../wizard/qml/Pages//20-sim.qml:67
2651+#: ../wizard/qml/Pages//31-passwd-set.qml:77
2652+msgid "Skip"
2653+msgstr ""
2654+
2655 #: ../wizard/qml/Pages//80-finished.qml:22
2656 msgid "All done"
2657 msgstr ""
2658@@ -1878,88 +1937,64 @@
2659 msgid "Nice work!"
2660 msgstr ""
2661
2662-#: ../wizard/qml/Pages//80-finished.qml:45
2663+#: ../wizard/qml/Pages//80-finished.qml:44
2664 msgid "Your phone is now ready to use."
2665 msgstr ""
2666
2667-#: ../wizard/qml/Pages//80-finished.qml:52
2668+#: ../wizard/qml/Pages//80-finished.qml:51
2669 msgid "Finish"
2670 msgstr ""
2671
2672-#: ../wizard/qml/Pages//terms.qml:25
2673-msgid "Terms & Conditions"
2674-msgstr ""
2675-
2676-#: ../wizard/qml/Pages//15-passwd.qml:38
2677-msgid "Set lock security"
2678-msgstr ""
2679-
2680-#: ../wizard/qml/Pages//15-passwd.qml:104
2681-msgid "Swipe"
2682-msgstr ""
2683-
2684-#: ../wizard/qml/Pages//15-passwd.qml:154
2685-msgid "Those PIN codes don't match."
2686-msgstr ""
2687-
2688-#: ../wizard/qml/Pages//15-passwd.qml:156
2689-msgid "Those passphrases don't match."
2690-msgstr ""
2691-
2692-#: ../wizard/qml/Pages//15-passwd.qml:164
2693-msgid "PIN code must be at least four digits long."
2694-msgstr ""
2695-
2696-#: ../wizard/qml/Pages//15-passwd.qml:166
2697-msgid "Passphrase must be at least four characters long."
2698-msgstr ""
2699-
2700-#: ../wizard/qml/Pages//15-passwd.qml:178
2701-#: ../wizard/qml/Pages//30-location.qml:80
2702-#: ../wizard/qml/Pages//40-reporting.qml:50
2703-#: ../wizard/qml/Pages//10-welcome.qml:85 ../wizard/qml/Pages//20-wifi.qml:195
2704-msgid "Continue"
2705-msgstr ""
2706-
2707-#: ../wizard/qml/Pages//30-location.qml:60
2708-msgid "Use your mobile network and Wi-Fi to work out where you are"
2709+#: ../wizard/qml/Pages//passwd-confirm.qml:51
2710+msgid "Sorry, incorrect passphrase."
2711+msgstr ""
2712+
2713+#: ../wizard/qml/Pages//passwd-confirm.qml:51
2714+#: ../wizard/qml/Pages//passwd-confirm.qml:52
2715+msgid "Please try again."
2716+msgstr ""
2717+
2718+#: ../wizard/qml/Pages//passwd-confirm.qml:52
2719+msgid "Sorry, incorrect passcode."
2720+msgstr ""
2721+
2722+#: ../wizard/qml/Pages//60-reporting.qml:22
2723+msgid "Bug reporting"
2724+msgstr ""
2725+
2726+#: ../wizard/qml/Pages//60-reporting.qml:34
2727+msgid ""
2728+"Your phone is set up to automatically report errors to Canonical and its "
2729+"partners, the makers of the operating system."
2730+msgstr ""
2731+
2732+#: ../wizard/qml/Pages//60-reporting.qml:42
2733+msgid "This can be disabled here:"
2734+msgstr ""
2735+
2736+#: ../wizard/qml/Pages//60-reporting.qml:43
2737+msgid "System Settings &gt; Security &amp; Privacy"
2738+msgstr ""
2739+
2740+#: ../wizard/qml/Pages//50-location.qml:53
2741+msgid "Use your mobile network and Wi-Fi to determine where you are"
2742 msgstr ""
2743
2744 #. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
2745-#: ../wizard/qml/Pages//30-location.qml:70
2746+#: ../wizard/qml/Pages//50-location.qml:63
2747 msgid ""
2748-"I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</"
2749+"I have read and agreed to the HERE <a href='terms.qml'>Terms and Conditions</"
2750 "a>"
2751 msgstr ""
2752
2753-#: ../wizard/qml/Pages//40-reporting.qml:22
2754-msgid "Bug reporting"
2755-msgstr ""
2756-
2757-#: ../wizard/qml/Pages//40-reporting.qml:35
2758-msgid "Your phone is set up to automatically report errors to Canonical."
2759-msgstr ""
2760-
2761-#: ../wizard/qml/Pages//40-reporting.qml:43
2762-msgid "This can be disabled in System Settings."
2763-msgstr ""
2764-
2765-#: ../wizard/qml/Pages//no-sim.qml:22
2766-msgid "Add a SIM card"
2767-msgstr ""
2768-
2769-#: ../wizard/qml/Pages//no-sim.qml:33
2770-msgid "Please insert a SIM card before you continue."
2771-msgstr ""
2772-
2773-#: ../wizard/qml/Pages//no-sim.qml:35
2774+#: ../wizard/qml/Pages//20-sim.qml:23
2775+msgid "Add a SIM card and restart your device"
2776+msgstr ""
2777+
2778+#: ../wizard/qml/Pages//20-sim.qml:53
2779 msgid "Without it, you won’t be able to make calls or use text messaging."
2780 msgstr ""
2781
2782-#: ../wizard/qml/Pages//no-sim.qml:50 ../wizard/qml/Pages//20-wifi.qml:195
2783-msgid "Skip"
2784-msgstr ""
2785-
2786 #: ../wizard/qml/Pages//10-welcome.qml:25
2787 msgid "Hi!"
2788 msgstr ""
2789@@ -1972,756 +2007,758 @@
2790 msgid "Let’s get started."
2791 msgstr ""
2792
2793-#: ../wizard/qml/Pages//20-wifi.qml:27
2794-msgid "Connect to Wi‑Fi"
2795-msgstr ""
2796-
2797-#: ../wizard/qml/Pages//20-wifi.qml:146
2798-msgid "Available networks"
2799-msgstr ""
2800-
2801-#: ../wizard/qml/Components//Page.qml:83
2802-msgid "Back"
2803-msgstr ""
2804-
2805-#: ../wizard/qml/Components//StackButton.qml:51
2806-#, qt-format
2807-msgid "〈 %1"
2808-msgstr ""
2809-
2810-#: ../wizard/qml/Components//StackButton.qml:54
2811-#, qt-format
2812-msgid "%1 〉"
2813-msgstr ""
2814-
2815-#. TRANSLATORS: This is a keyword or name for the update-notification plugin which is used while searching
2816-#: ../po/settings.js:2
2817-msgid "Updates available"
2818-msgstr ""
2819-
2820-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2821-#: ../po/settings.js:6
2822+#: ../wizard/qml/Pages//here-terms.qml:25
2823+msgid "Terms & Conditions"
2824+msgstr ""
2825+
2826+#: ../wizard/qml/Pages//31-passwd-set.qml:48
2827+msgid "Enter passphrase"
2828+msgstr ""
2829+
2830+#: ../wizard/qml/Pages//31-passwd-set.qml:49
2831+msgid "Choose your passcode"
2832+msgstr ""
2833+
2834+#: ../wizard/qml/Pages//31-passwd-set.qml:56
2835+msgid "Passphrase must be 4 characters long"
2836+msgstr ""
2837+
2838+#: ../wizard/qml/Pages//30-passwd-type.qml:72
2839+msgid "Please select how you’d like to unlock your phone."
2840+msgstr ""
2841+
2842+#: ../wizard/qml/Pages//30-passwd-type.qml:92
2843+msgid "Swipe"
2844+msgstr ""
2845+
2846+#: ../wizard/qml/Pages//30-passwd-type.qml:93
2847+msgid "No security"
2848+msgstr ""
2849+
2850+#: ../wizard/qml/Pages//30-passwd-type.qml:96
2851+msgid "4 numbers"
2852+msgstr ""
2853+
2854+#: ../wizard/qml/Pages//30-passwd-type.qml:99
2855+msgid "Numbers and letters"
2856+msgstr ""
2857+
2858+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2859+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:2
2860+msgid "Accessibility"
2861+msgstr ""
2862+
2863+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2864+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:4
2865+msgid "accessibility"
2866+msgstr ""
2867+
2868+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2869+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:6
2870+msgid "a11y"
2871+msgstr ""
2872+
2873+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2874+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:10
2875+msgid "reset"
2876+msgstr ""
2877+
2878+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2879+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:12
2880+msgid "erase"
2881+msgstr ""
2882+
2883+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2884+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:14
2885+msgid "factory"
2886+msgstr ""
2887+
2888+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2889+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:16
2890+msgid "clear"
2891+msgstr ""
2892+
2893+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2894+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:18
2895+msgid "restore"
2896+msgstr ""
2897+
2898+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2899+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:22
2900+msgid "time"
2901+msgstr ""
2902+
2903+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2904+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:24
2905+msgid "date"
2906+msgstr ""
2907+
2908+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2909+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:26
2910+msgid "timezone"
2911+msgstr ""
2912+
2913+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2914+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2915+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2916+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2917+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:28
2918+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:124
2919+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:178
2920+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:228
2921+msgid "automatic"
2922+msgstr ""
2923+
2924+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2925+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:32
2926+msgid "bluetooth"
2927+msgstr ""
2928+
2929+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2930+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:34
2931+msgid "headset"
2932+msgstr ""
2933+
2934+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2935+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:36
2936+msgid "pair"
2937+msgstr ""
2938+
2939+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2940+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2941+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:38
2942+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:256
2943+msgid "device"
2944+msgstr ""
2945+
2946+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2947+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:40
2948+msgid "discover"
2949+msgstr ""
2950+
2951+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2952+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:42
2953+msgid "car"
2954+msgstr ""
2955+
2956+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2957+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:44
2958+msgid "handsfree"
2959+msgstr ""
2960+
2961+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2962+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2963+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:46
2964+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:236
2965+msgid "wireless"
2966+msgstr ""
2967+
2968+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2969+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2970+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:48
2971+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:242
2972+msgid "connect"
2973+msgstr ""
2974+
2975+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2976+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2977+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:50
2978+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:244
2979+msgid "disconnect"
2980+msgstr ""
2981+
2982+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2983+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:52
2984+msgid "stereo"
2985+msgstr ""
2986+
2987+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2988+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2989+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:56
2990+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:260
2991+msgid "phone"
2992+msgstr ""
2993+
2994+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2995+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:58
2996+msgid "services"
2997+msgstr ""
2998+
2999+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3000+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:60
3001+msgid "forwarding"
3002+msgstr ""
3003+
3004+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3005+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:62
3006+msgid "waiting"
3007+msgstr ""
3008+
3009+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3010+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:64
3011+msgid "call"
3012+msgstr ""
3013+
3014+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3015+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3016+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:66
3017+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:82
3018+msgid "dialpad"
3019+msgstr ""
3020+
3021+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3022+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:68
3023+msgid "shortcuts"
3024+msgstr ""
3025+
3026+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3027+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:70
3028+msgid "numbers"
3029+msgstr ""
3030+
3031+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3032+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:74
3033+msgid "sound"
3034+msgstr ""
3035+
3036+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3037+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:76
3038+msgid "silent"
3039+msgstr ""
3040+
3041+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3042+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:78
3043+msgid "ringtone"
3044+msgstr ""
3045+
3046+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3047+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:80
3048+msgid "vibrate"
3049+msgstr ""
3050+
3051+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3052+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:84
3053+msgid "message"
3054+msgstr ""
3055+
3056+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3057+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3058+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:86
3059+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:174
3060+msgid "keyboard"
3061+msgstr ""
3062+
3063+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3064+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:88
3065+msgid "volume"
3066+msgstr ""
3067+
3068+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3069+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:92
3070+msgid "security"
3071+msgstr ""
3072+
3073+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3074+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:94
3075+msgid "privacy"
3076+msgstr ""
3077+
3078+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3079+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3080+#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3081+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:96
3082+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:140
3083+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:326
3084+msgid "lock"
3085+msgstr ""
3086+
3087+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3088+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3089+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:98
3090+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:314
3091+msgid "sim"
3092+msgstr ""
3093+
3094+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3095+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:100
3096+msgid "pin"
3097+msgstr ""
3098+
3099+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3100+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:102
3101+msgid "code"
3102+msgstr ""
3103+
3104+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3105+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:104
3106+msgid "password"
3107+msgstr ""
3108+
3109+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3110+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:106
3111+msgid "passphrase"
3112+msgstr ""
3113+
3114+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3115+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:108
3116+msgid "swipe"
3117+msgstr ""
3118+
3119+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3120+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:110
3121+msgid "allow"
3122+msgstr ""
3123+
3124+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3125+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:112
3126+msgid "access"
3127+msgstr ""
3128+
3129+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3130+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:116
3131 msgid "system"
3132 msgstr ""
3133
3134 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3135 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3136 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3137-#: ../po/settings.js:8
3138-#: ../po/settings.js:184
3139-#: ../po/settings.js:230
3140+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:118
3141+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:198
3142+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:276
3143 msgid "software"
3144 msgstr ""
3145
3146 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3147-#: ../po/settings.js:10
3148+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:120
3149 msgid "update"
3150 msgstr ""
3151
3152 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3153 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3154 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3155-#: ../po/settings.js:12
3156-#: ../po/settings.js:44
3157-#: ../po/settings.js:188
3158+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:122
3159+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:144
3160+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:202
3161 msgid "apps"
3162 msgstr ""
3163
3164 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3165-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3166-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
3167-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3168-#: ../po/settings.js:14
3169-#: ../po/settings.js:88
3170-#: ../po/settings.js:274
3171-#: ../po/settings.js:340
3172-msgid "automatic"
3173-msgstr ""
3174-
3175-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3176-#: ../po/settings.js:16
3177+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:126
3178 msgid "download"
3179 msgstr ""
3180
3181 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3182-#: ../po/settings.js:18
3183+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:128
3184 msgid "upgrade"
3185 msgstr ""
3186
3187 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
3188-#: ../po/settings.js:20
3189+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:130
3190 msgid "click"
3191 msgstr ""
3192
3193-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3194-#: ../po/settings.js:22
3195-msgid "Flight Mode"
3196-msgstr ""
3197-
3198-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3199-#: ../po/settings.js:24
3200-msgid "flight"
3201-msgstr ""
3202-
3203-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3204-#: ../po/settings.js:26
3205-msgid "plane"
3206-msgstr ""
3207-
3208-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3209-#: ../po/settings.js:28
3210-msgid "offline"
3211-msgstr ""
3212-
3213-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3214-#: ../po/settings.js:30
3215-msgid "airplane"
3216-msgstr ""
3217-
3218-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3219-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3220-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3221-#: ../po/settings.js:32
3222-#: ../po/settings.js:164
3223-#: ../po/settings.js:292
3224-msgid "network"
3225+#. TRANSLATORS: This is a keyword or name for the update-notification plugin which is used while searching
3226+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:132
3227+msgid "Updates available"
3228 msgstr ""
3229
3230 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3231-#: ../po/settings.js:34
3232+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:134
3233 msgid "Orientation Lock"
3234 msgstr ""
3235
3236 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3237-#: ../po/settings.js:36
3238+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:136
3239 msgid "rotation"
3240 msgstr ""
3241
3242 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3243-#: ../po/settings.js:38
3244+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:138
3245 msgid "orientation"
3246 msgstr ""
3247
3248 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3249-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3250-#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3251-#: ../po/settings.js:40
3252-#: ../po/settings.js:248
3253-#: ../po/settings.js:326
3254-msgid "lock"
3255-msgstr ""
3256-
3257-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
3258 #. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3259-#: ../po/settings.js:42
3260-#: ../po/settings.js:338
3261+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:142
3262+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:226
3263 msgid "screen"
3264 msgstr ""
3265
3266-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3267-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3268-#: ../po/settings.js:48
3269-#: ../po/settings.js:214
3270-msgid "phone"
3271-msgstr ""
3272-
3273-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3274-#: ../po/settings.js:50
3275-msgid "services"
3276-msgstr ""
3277-
3278-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3279-#: ../po/settings.js:52
3280-msgid "forwarding"
3281-msgstr ""
3282-
3283-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3284-#: ../po/settings.js:54
3285-msgid "waiting"
3286-msgstr ""
3287-
3288-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3289-#: ../po/settings.js:56
3290-msgid "call"
3291-msgstr ""
3292-
3293-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3294-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3295-#: ../po/settings.js:58
3296-#: ../po/settings.js:154
3297-msgid "dialpad"
3298-msgstr ""
3299-
3300-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3301-#: ../po/settings.js:60
3302-msgid "shortcuts"
3303-msgstr ""
3304-
3305-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
3306-#: ../po/settings.js:62
3307-msgid "numbers"
3308-msgstr ""
3309-
3310 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3311-#: ../po/settings.js:66
3312+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:148
3313 msgid "appearance"
3314 msgstr ""
3315
3316 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3317-#: ../po/settings.js:68
3318+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:150
3319 msgid "background"
3320 msgstr ""
3321
3322 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3323-#: ../po/settings.js:70
3324+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:152
3325 msgid "wallpaper"
3326 msgstr ""
3327
3328 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3329-#: ../po/settings.js:72
3330+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:154
3331 msgid "art"
3332 msgstr ""
3333
3334 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3335-#: ../po/settings.js:74
3336+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:156
3337 msgid "photo"
3338 msgstr ""
3339
3340 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3341-#: ../po/settings.js:76
3342+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:158
3343 msgid "picture"
3344 msgstr ""
3345
3346 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
3347-#: ../po/settings.js:78
3348+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:160
3349 msgid "image"
3350 msgstr ""
3351
3352+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3353+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:162
3354+msgid "Example"
3355+msgstr ""
3356+
3357+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3358+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:164
3359+msgid "example"
3360+msgstr ""
3361+
3362+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3363+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:166
3364+msgid "test"
3365+msgstr ""
3366+
3367+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3368+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:168
3369+msgid "sample"
3370+msgstr ""
3371+
3372 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3373-#: ../po/settings.js:82
3374+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:172
3375 msgid "language"
3376 msgstr ""
3377
3378 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3379-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3380-#: ../po/settings.js:84
3381-#: ../po/settings.js:158
3382-msgid "keyboard"
3383-msgstr ""
3384-
3385-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3386-#: ../po/settings.js:86
3387+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:176
3388 msgid "spellcheck"
3389 msgstr ""
3390
3391 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3392-#: ../po/settings.js:90
3393+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:180
3394 msgid "correct"
3395 msgstr ""
3396
3397 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3398-#: ../po/settings.js:92
3399+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:182
3400 msgid "suggestions"
3401 msgstr ""
3402
3403 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3404-#: ../po/settings.js:94
3405+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:184
3406 msgid "capitalization"
3407 msgstr ""
3408
3409 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3410-#: ../po/settings.js:96
3411+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:186
3412 msgid "punctuation"
3413 msgstr ""
3414
3415 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3416-#: ../po/settings.js:98
3417+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:188
3418 msgid "layout"
3419 msgstr ""
3420
3421 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3422 #. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3423-#: ../po/settings.js:100
3424-#: ../po/settings.js:336
3425+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:190
3426+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:224
3427 msgid "display"
3428 msgstr ""
3429
3430 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3431-#: ../po/settings.js:102
3432+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:192
3433 msgid "words"
3434 msgstr ""
3435
3436 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
3437-#: ../po/settings.js:104
3438+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:194
3439 msgid "vibration"
3440 msgstr ""
3441
3442-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3443-#: ../po/settings.js:106
3444-msgid "Example"
3445-msgstr ""
3446-
3447-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3448-#: ../po/settings.js:108
3449-msgid "example"
3450-msgstr ""
3451-
3452-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3453-#: ../po/settings.js:110
3454-msgid "test"
3455-msgstr ""
3456-
3457-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
3458-#: ../po/settings.js:112
3459-msgid "sample"
3460-msgstr ""
3461-
3462-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3463-#: ../po/settings.js:116
3464-msgid "bluetooth"
3465-msgstr ""
3466-
3467-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3468-#: ../po/settings.js:118
3469-msgid "headset"
3470-msgstr ""
3471-
3472-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3473-#: ../po/settings.js:120
3474-msgid "pair"
3475-msgstr ""
3476-
3477-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3478-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3479-#: ../po/settings.js:122
3480-#: ../po/settings.js:210
3481-msgid "device"
3482-msgstr ""
3483-
3484-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3485-#: ../po/settings.js:124
3486-msgid "discover"
3487-msgstr ""
3488-
3489-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3490-#: ../po/settings.js:126
3491-msgid "car"
3492-msgstr ""
3493-
3494-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3495-#: ../po/settings.js:128
3496-msgid "handsfree"
3497-msgstr ""
3498-
3499-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3500-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3501-#: ../po/settings.js:130
3502-#: ../po/settings.js:166
3503-msgid "wireless"
3504-msgstr ""
3505-
3506-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3507-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3508-#: ../po/settings.js:132
3509-#: ../po/settings.js:172
3510-msgid "connect"
3511-msgstr ""
3512-
3513-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3514-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3515-#: ../po/settings.js:134
3516-#: ../po/settings.js:174
3517-msgid "disconnect"
3518-msgstr ""
3519-
3520-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
3521-#: ../po/settings.js:136
3522-msgid "stereo"
3523-msgstr ""
3524-
3525-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
3526-#: ../po/settings.js:138
3527-msgid "Accessibility"
3528-msgstr ""
3529-
3530-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
3531-#: ../po/settings.js:140
3532-msgid "accessibility"
3533-msgstr ""
3534-
3535-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
3536-#: ../po/settings.js:142
3537-msgid "a11y"
3538-msgstr ""
3539-
3540-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3541-#: ../po/settings.js:146
3542-msgid "sound"
3543-msgstr ""
3544-
3545-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3546-#: ../po/settings.js:148
3547-msgid "silent"
3548-msgstr ""
3549-
3550-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3551-#: ../po/settings.js:150
3552-msgid "ringtone"
3553-msgstr ""
3554-
3555-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3556-#: ../po/settings.js:152
3557-msgid "vibrate"
3558-msgstr ""
3559-
3560-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3561-#: ../po/settings.js:156
3562-msgid "message"
3563-msgstr ""
3564-
3565-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
3566-#: ../po/settings.js:160
3567-msgid "volume"
3568-msgstr ""
3569-
3570-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3571-#: ../po/settings.js:168
3572-msgid "wifi"
3573-msgstr ""
3574-
3575-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3576-#: ../po/settings.js:170
3577-msgid "wi-fi"
3578-msgstr ""
3579-
3580-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3581-#: ../po/settings.js:176
3582-msgid "hidden"
3583-msgstr ""
3584-
3585-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3586-#: ../po/settings.js:178
3587-msgid "ip"
3588-msgstr ""
3589-
3590-#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3591-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3592-#: ../po/settings.js:180
3593-#: ../po/settings.js:222
3594-msgid "address"
3595-msgstr ""
3596-
3597 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3598-#: ../po/settings.js:186
3599+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:200
3600 msgid "notifications"
3601 msgstr ""
3602
3603 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3604-#: ../po/settings.js:190
3605+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:204
3606 msgid "authorize"
3607 msgstr ""
3608
3609 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3610-#: ../po/settings.js:192
3611+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:206
3612 msgid "alerts"
3613 msgstr ""
3614
3615 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3616-#: ../po/settings.js:194
3617+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:208
3618 msgid "permissions"
3619 msgstr ""
3620
3621 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3622-#: ../po/settings.js:196
3623+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:210
3624 msgid "badges"
3625 msgstr ""
3626
3627 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3628-#: ../po/settings.js:198
3629+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:212
3630 msgid "facebook"
3631 msgstr ""
3632
3633 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3634-#: ../po/settings.js:200
3635+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:214
3636 msgid "twitter"
3637 msgstr ""
3638
3639 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3640-#: ../po/settings.js:202
3641+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:216
3642 msgid "flickr"
3643 msgstr ""
3644
3645 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
3646-#: ../po/settings.js:204
3647+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:218
3648 msgid "gmail"
3649 msgstr ""
3650
3651-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3652-#: ../po/settings.js:208
3653+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3654+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:222
3655+msgid "brightness"
3656+msgstr ""
3657+
3658+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3659+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:230
3660+msgid "adjust"
3661+msgstr ""
3662+
3663+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3664+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3665+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3666+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:234
3667+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:292
3668+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:342
3669+msgid "network"
3670+msgstr ""
3671+
3672+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3673+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:238
3674+msgid "wifi"
3675+msgstr ""
3676+
3677+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3678+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:240
3679+msgid "wi-fi"
3680+msgstr ""
3681+
3682+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3683+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:246
3684+msgid "hidden"
3685+msgstr ""
3686+
3687+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3688+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:248
3689+msgid "ip"
3690+msgstr ""
3691+
3692+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
3693+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3694+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:250
3695+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:268
3696+msgid "address"
3697+msgstr ""
3698+
3699+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3700+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:254
3701 msgid "about"
3702 msgstr ""
3703
3704 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3705-#: ../po/settings.js:212
3706+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:258
3707 msgid "info"
3708 msgstr ""
3709
3710 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3711-#: ../po/settings.js:216
3712+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:262
3713 msgid "number"
3714 msgstr ""
3715
3716 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3717-#: ../po/settings.js:218
3718+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:264
3719 msgid "imei"
3720 msgstr ""
3721
3722 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3723-#: ../po/settings.js:220
3724+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:266
3725 msgid "serial"
3726 msgstr ""
3727
3728 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3729-#: ../po/settings.js:224
3730+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:270
3731 msgid "mac"
3732 msgstr ""
3733
3734 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3735-#: ../po/settings.js:226
3736+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:272
3737 msgid "licenses"
3738 msgstr ""
3739
3740 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3741-#: ../po/settings.js:228
3742+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:274
3743 msgid "developer"
3744 msgstr ""
3745
3746 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3747-#: ../po/settings.js:232
3748+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:278
3749 msgid "storage"
3750 msgstr ""
3751
3752 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3753-#: ../po/settings.js:234
3754+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:280
3755 msgid "disk"
3756 msgstr ""
3757
3758 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3759-#: ../po/settings.js:236
3760+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:282
3761 msgid "space"
3762 msgstr ""
3763
3764 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3765-#: ../po/settings.js:238
3766+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:284
3767 msgid "version"
3768 msgstr ""
3769
3770 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
3771-#: ../po/settings.js:240
3772+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:286
3773 msgid "revision"
3774 msgstr ""
3775
3776-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3777-#: ../po/settings.js:244
3778-msgid "security"
3779-msgstr ""
3780-
3781-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3782-#: ../po/settings.js:246
3783-msgid "privacy"
3784-msgstr ""
3785-
3786-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3787-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3788-#: ../po/settings.js:250
3789-#: ../po/settings.js:314
3790-msgid "sim"
3791-msgstr ""
3792-
3793-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3794-#: ../po/settings.js:252
3795-msgid "pin"
3796-msgstr ""
3797-
3798-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3799-#: ../po/settings.js:254
3800-msgid "code"
3801-msgstr ""
3802-
3803-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3804-#: ../po/settings.js:256
3805-msgid "password"
3806-msgstr ""
3807-
3808-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3809-#: ../po/settings.js:258
3810-msgid "passphrase"
3811-msgstr ""
3812-
3813-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3814-#: ../po/settings.js:260
3815-msgid "swipe"
3816-msgstr ""
3817-
3818-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3819-#: ../po/settings.js:262
3820-msgid "allow"
3821-msgstr ""
3822-
3823-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
3824-#: ../po/settings.js:264
3825-msgid "access"
3826-msgstr ""
3827-
3828-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
3829-#: ../po/settings.js:268
3830-msgid "time"
3831-msgstr ""
3832-
3833-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
3834-#: ../po/settings.js:270
3835-msgid "date"
3836-msgstr ""
3837-
3838-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
3839-#: ../po/settings.js:272
3840-msgid "timezone"
3841-msgstr ""
3842-
3843-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
3844-#: ../po/settings.js:278
3845-msgid "reset"
3846-msgstr ""
3847-
3848-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
3849-#: ../po/settings.js:280
3850-msgid "erase"
3851-msgstr ""
3852-
3853-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
3854-#: ../po/settings.js:282
3855-msgid "factory"
3856-msgstr ""
3857-
3858-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
3859-#: ../po/settings.js:284
3860-msgid "clear"
3861-msgstr ""
3862-
3863-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
3864-#: ../po/settings.js:286
3865-msgid "restore"
3866-msgstr ""
3867-
3868-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3869-#: ../po/settings.js:290
3870+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3871+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:290
3872 msgid "cellular"
3873 msgstr ""
3874
3875 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3876-#: ../po/settings.js:294
3877+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:294
3878 msgid "mobile"
3879 msgstr ""
3880
3881 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3882-#: ../po/settings.js:296
3883+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:296
3884 msgid "gsm"
3885 msgstr ""
3886
3887 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3888-#: ../po/settings.js:298
3889+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:298
3890 msgid "data"
3891 msgstr ""
3892
3893 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3894-#: ../po/settings.js:300
3895+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:300
3896 msgid "carrier"
3897 msgstr ""
3898
3899 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3900-#: ../po/settings.js:302
3901+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:302
3902 msgid "4g"
3903 msgstr ""
3904
3905 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3906-#: ../po/settings.js:304
3907+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:304
3908 msgid "3g"
3909 msgstr ""
3910
3911 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3912-#: ../po/settings.js:306
3913+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:306
3914 msgid "2g"
3915 msgstr ""
3916
3917 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3918-#: ../po/settings.js:308
3919+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:308
3920 msgid "lte"
3921 msgstr ""
3922
3923 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3924-#: ../po/settings.js:310
3925+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:310
3926 msgid "apn"
3927 msgstr ""
3928
3929 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
3930-#: ../po/settings.js:312
3931+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:312
3932 msgid "roam"
3933 msgstr ""
3934
3935 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3936-#: ../po/settings.js:318
3937+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:318
3938 msgid "battery"
3939 msgstr ""
3940
3941 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3942-#: ../po/settings.js:320
3943+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:320
3944 msgid "power"
3945 msgstr ""
3946
3947 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3948-#: ../po/settings.js:322
3949+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:322
3950 msgid "charge"
3951 msgstr ""
3952
3953 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3954-#: ../po/settings.js:324
3955+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:324
3956 msgid "idle"
3957 msgstr ""
3958
3959 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3960-#: ../po/settings.js:328
3961+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:328
3962 msgid "disable"
3963 msgstr ""
3964
3965 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
3966-#: ../po/settings.js:330
3967+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:330
3968 msgid "enable"
3969 msgstr ""
3970
3971-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3972-#: ../po/settings.js:334
3973-msgid "brightness"
3974-msgstr ""
3975-
3976-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
3977-#: ../po/settings.js:342
3978-msgid "adjust"
3979-msgstr ""
3980-
3981-#: ../plugins/system-update//system_update.cpp:94
3982-msgid "Can't cancel current request (can't contact service)"
3983-msgstr ""
3984-
3985-#: ../plugins/system-update//system_update.cpp:100
3986-msgid "Can't pause current request (can't contact service)"
3987-msgstr ""
3988-
3989-#: ../plugins/about//click.cpp:171
3990-msgid "Unknown title"
3991+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3992+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:332
3993+msgid "Flight Mode"
3994+msgstr ""
3995+
3996+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
3997+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:334
3998+msgid "flight"
3999+msgstr ""
4000+
4001+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
4002+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:336
4003+msgid "plane"
4004+msgstr ""
4005+
4006+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
4007+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:338
4008+msgid "offline"
4009+msgstr ""
4010+
4011+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
4012+#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:340
4013+msgid "airplane"
4014 msgstr ""
4015
4016 #: ../plugins/security-privacy//securityprivacy.cpp:318
4017-msgid "Incorrect PIN code. Try again."
4018+msgid "Incorrect passcode. Try again."
4019 msgstr ""
4020
4021 #: ../plugins/security-privacy//securityprivacy.cpp:320
4022@@ -2740,6 +2777,18 @@
4023 msgid "Authentication token manipulation error"
4024 msgstr ""
4025
4026+#: ../plugins/system-update//system_update.cpp:96
4027+msgid "Can't cancel current request (can't contact service)"
4028+msgstr ""
4029+
4030+#: ../plugins/system-update//system_update.cpp:102
4031+msgid "Can't pause current request (can't contact service)"
4032+msgstr ""
4033+
4034+#: ../plugins/about//click.cpp:171
4035+msgid "Unknown title"
4036+msgstr ""
4037+
4038 #: ../push-helper/software_updates_helper.py:150
4039 msgid "There's an updated system image."
4040 msgstr ""
4041
4042=== modified file 'wizard/CMakeLists.txt'
4043--- wizard/CMakeLists.txt 2014-08-18 13:09:48 +0000
4044+++ wizard/CMakeLists.txt 2014-10-10 17:52:06 +0000
4045@@ -16,7 +16,7 @@
4046
4047 add_definitions(-DSHELL_PLUGINDIR="${SHELL_PLUGINDIR}")
4048
4049-set(WIZARD_ROOT "${CMAKE_INSTALL_PREFIX}/share/ubuntu/settings/wizard")
4050+set(WIZARD_ROOT "${CMAKE_INSTALL_PREFIX}/share")
4051 add_definitions(-DWIZARD_ROOT="${WIZARD_ROOT}")
4052
4053 file(GLOB_RECURSE QML_FILES
4054@@ -48,4 +48,4 @@
4055 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
4056 install(FILES 50-com.ubuntu.system-settings.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
4057
4058-install(DIRECTORY qml DESTINATION ${WIZARD_ROOT})
4059+install(DIRECTORY qml DESTINATION ${WIZARD_ROOT}/ubuntu/settings/wizard)
4060
4061=== modified file 'wizard/PageList.cpp'
4062--- wizard/PageList.cpp 2014-04-10 18:20:44 +0000
4063+++ wizard/PageList.cpp 2014-10-10 17:52:06 +0000
4064@@ -45,6 +45,11 @@
4065 QString disabledSuffix = ".disabled";
4066 QSet<QString> disabledPages;
4067 QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
4068+
4069+ QString rootDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT"); // for testing
4070+ if (!rootDir.isEmpty())
4071+ dataDirs = QStringList() << rootDir;
4072+
4073 Q_FOREACH(const QString &dataDir, dataDirs) {
4074 QDir dir(dataDir + "/ubuntu/settings/wizard/qml/Pages");
4075 QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
4076
4077=== modified file 'wizard/Utils/system.cpp'
4078--- wizard/Utils/system.cpp 2014-09-05 20:27:21 +0000
4079+++ wizard/Utils/system.cpp 2014-10-10 17:52:06 +0000
4080@@ -31,7 +31,7 @@
4081 : QObject(),
4082 m_accounts(nullptr),
4083 m_hereEnabled(false),
4084- m_hereLicensePath()
4085+ m_hereLicensePath(" ") // use a single space to indicate it is unasssigned
4086 {
4087 m_accounts = new QDBusInterface("org.freedesktop.Accounts",
4088 "/org/freedesktop/Accounts/User" + QString::number(geteuid()),
4089@@ -84,8 +84,12 @@
4090 if (!reply.isError()) {
4091 QVariant value = reply.argumentAt<0>();
4092 m_hereLicensePath = value.toString();
4093- Q_EMIT hereLicensePathChanged();
4094+ } else {
4095+ m_hereLicensePath = "";
4096 }
4097+
4098+ Q_EMIT hereLicensePathChanged();
4099+
4100 watcher->deleteLater();
4101 }
4102
4103
4104=== modified file 'wizard/main.cpp'
4105--- wizard/main.cpp 2014-08-29 19:46:45 +0000
4106+++ wizard/main.cpp 2014-10-10 17:52:06 +0000
4107@@ -59,16 +59,20 @@
4108 if (rootDir.isEmpty())
4109 rootDir = WIZARD_ROOT;
4110
4111+ QString modulesDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES"); // for testing
4112+ if (modulesDir.isEmpty())
4113+ modulesDir = PLUGIN_PRIVATE_MODULE_DIR;
4114+
4115 if (!isMirServer) {
4116- view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR "/Ubuntu/SystemSettings/Wizard/NonMir");
4117+ view->engine()->addImportPath(modulesDir + "/Ubuntu/SystemSettings/Wizard/NonMir");
4118 }
4119- view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
4120+ view->engine()->addImportPath(modulesDir);
4121 view->engine()->addImportPath(PLUGIN_QML_DIR);
4122 view->engine()->addImportPath(SHELL_PLUGINDIR);
4123
4124 PageList pageList;
4125 view->rootContext()->setContextProperty("pageList", &pageList);
4126- view->setSource(QUrl(rootDir + "/qml/main.qml"));
4127+ view->setSource(QUrl(rootDir + "/ubuntu/settings/wizard/qml/main.qml"));
4128 view->setColor("transparent");
4129
4130 QObject::connect(view->engine(), &QQmlEngine::quit, handleQuit);
4131
4132=== modified file 'wizard/qml/Components/Page.qml'
4133--- wizard/qml/Components/Page.qml 2014-09-18 12:59:25 +0000
4134+++ wizard/qml/Components/Page.qml 2014-10-10 17:52:06 +0000
4135@@ -26,6 +26,12 @@
4136 readonly property real leftMargin: units.gu(2)
4137 readonly property real rightMargin: units.gu(2)
4138
4139+ // If you want to skip a page, mark skipValid false while you figure out
4140+ // whether to skip, then set it to true once you've determined the value
4141+ // of the skip property.
4142+ property bool skipValid: true
4143+ property bool skip: false
4144+
4145 property bool hasBackButton: true
4146 property bool customBack: false
4147 property alias forwardButtonSourceComponent: forwardButton.sourceComponent
4148@@ -82,7 +88,7 @@
4149 z: 1
4150 text: i18n.tr("Back")
4151 visible: pageStack.depth > 1 && hasBackButton
4152- leftArrow: true
4153+ backArrow: true
4154
4155 onClicked: customBack ? backClicked() : pageStack.prev()
4156 }
4157
4158=== modified file 'wizard/qml/Components/StackButton.qml'
4159--- wizard/qml/Components/StackButton.qml 2014-08-27 20:24:23 +0000
4160+++ wizard/qml/Components/StackButton.qml 2014-10-10 17:52:06 +0000
4161@@ -21,46 +21,33 @@
4162 id: stackButton
4163
4164 property string text
4165- property bool leftArrow: false
4166- property bool rightArrow: false
4167+
4168+ property bool backArrow: false
4169
4170 signal clicked()
4171
4172- readonly property bool hasArrow: leftArrow || rightArrow
4173-
4174- width: button.width
4175- height: button.height
4176-
4177- Button {
4178- id: button
4179- anchors.fill: parent
4180- visible: !hasArrow
4181- text: stackButton.text
4182- onClicked: stackButton.clicked()
4183- }
4184+ width: label.width
4185+ height: label.height + units.gu(4)
4186
4187 Label {
4188 id: label
4189 anchors.verticalCenter: parent.verticalCenter
4190 anchors.left: parent.left
4191 anchors.right: parent.right
4192- visible: hasArrow
4193 text: {
4194- if (leftArrow) {
4195+ if (backArrow) {
4196 // Translators: This is the arrow for "Back" buttons
4197 return i18n.tr("〈 %1".arg(stackButton.text))
4198- } else if (rightArrow) {
4199+ } else {
4200 // Translators: This is the arrow for "Forward" buttons
4201 return i18n.tr("%1 〉".arg(stackButton.text))
4202- } else {
4203- return stackButton.text
4204 }
4205 }
4206- horizontalAlignment: leftArrow ? Text.AlignLeft : Text.AlignRight
4207+ horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
4208+ }
4209
4210- MouseArea {
4211- anchors.fill: parent
4212- onClicked: stackButton.clicked()
4213- }
4214+ MouseArea {
4215+ anchors.fill: parent
4216+ onClicked: stackButton.clicked()
4217 }
4218 }
4219
4220=== renamed file 'wizard/qml/Pages/no-sim.qml' => 'wizard/qml/Pages/20-sim.qml'
4221--- wizard/qml/Pages/no-sim.qml 2014-08-26 21:19:55 +0000
4222+++ wizard/qml/Pages/20-sim.qml 2014-10-10 17:52:06 +0000
4223@@ -15,25 +15,42 @@
4224 */
4225
4226 import QtQuick 2.0
4227+import MeeGo.QOfono 0.2
4228 import Ubuntu.Components 0.1
4229 import "../Components" as LocalComponents
4230
4231 LocalComponents.Page {
4232- title: i18n.tr("Add a SIM card")
4233+ title: i18n.tr("Add a SIM card and restart your device")
4234 forwardButtonSourceComponent: forwardButton
4235- hasBackButton: false
4236+
4237+ // No need for skipValid, since OfonoManager does everything synchronously
4238+ skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
4239+
4240+ OfonoManager {
4241+ id: manager
4242+ }
4243+
4244+ // Ideally we would query the system more cleverly than hardcoding two
4245+ // modems. But we don't yet have a more clever way. :(
4246+ OfonoSimManager {
4247+ id: simManager0
4248+ modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
4249+ }
4250+
4251+ OfonoSimManager {
4252+ id: simManager1
4253+ modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
4254+ }
4255
4256 Column {
4257 anchors.fill: content
4258+ spacing: units.gu(4)
4259
4260 Label {
4261 anchors.left: parent.left
4262 anchors.right: parent.right
4263 wrapMode: Text.Wrap
4264- text: i18n.tr("Please insert a SIM card before you continue.") +
4265- "\n\n" +
4266- i18n.tr("Without it, you won’t be able to make calls or use text messaging.") +
4267- "\n"
4268+ text: i18n.tr("Without it, you won’t be able to make calls or use text messaging.")
4269 }
4270
4271 Image {
4272@@ -48,7 +65,6 @@
4273 id: forwardButton
4274 LocalComponents.StackButton {
4275 text: i18n.tr("Skip")
4276- rightArrow: true
4277 onClicked: pageStack.next()
4278 }
4279 }
4280
4281=== renamed file 'wizard/qml/Pages/15-passwd.qml' => 'wizard/qml/Pages/30-passwd-type.qml'
4282--- wizard/qml/Pages/15-passwd.qml 2014-09-18 12:59:25 +0000
4283+++ wizard/qml/Pages/30-passwd-type.qml 2014-10-10 17:52:06 +0000
4284@@ -15,9 +15,8 @@
4285 */
4286
4287 import QtQuick 2.3
4288-import MeeGo.QOfono 0.2
4289 import Ubuntu.Components 1.1
4290-import Ubuntu.Components.ListItems 0.1
4291+import Ubuntu.Components.ListItems 1.0
4292 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
4293 import "../Components" as LocalComponents
4294
4295@@ -35,17 +34,9 @@
4296
4297 LocalComponents.Page {
4298 id: passwdPage
4299- title: i18n.tr("Set lock security")
4300+ title: i18n.tr("Lock security")
4301 forwardButtonSourceComponent: forwardButton
4302
4303- readonly property int method: indexToMethod(listview.currentIndex)
4304- readonly property string password: {
4305- if (method !== UbuntuSecurityPrivacyPanel.Swipe)
4306- return passwordInput.text
4307- else
4308- return ""
4309- }
4310-
4311 function indexToMethod(index) {
4312 if (index === 0)
4313 return UbuntuSecurityPrivacyPanel.Swipe
4314@@ -55,120 +46,63 @@
4315 return UbuntuSecurityPrivacyPanel.Passphrase
4316 }
4317
4318- OfonoManager {
4319- id: manager
4320- }
4321-
4322- // Ideally we would query the system more cleverly than hardcoding two
4323- // modems. But we don't yet have a more clever way. :(
4324- OfonoSimManager {
4325- id: simManager0
4326- modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
4327- }
4328-
4329- OfonoSimManager {
4330- id: simManager1
4331- modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
4332- }
4333-
4334- // Use a flickable for this so that we can properly clip the contents when
4335- // the OSK appears.
4336- Flickable {
4337+ function methodToIndex(method) {
4338+ if (method === UbuntuSecurityPrivacyPanel.Swipe)
4339+ return 0
4340+ else if (method === UbuntuSecurityPrivacyPanel.Passcode)
4341+ return 1
4342+ else
4343+ return 2
4344+ }
4345+
4346+ Connections {
4347+ target: root
4348+ onPasswordMethodChanged: selector.selectedIndex = methodToIndex(root.passwordMethod)
4349+ }
4350+
4351+ Column {
4352+ id: column
4353 anchors.fill: content
4354- clip: true
4355- contentHeight: column.height
4356- boundsBehavior: (contentHeight > height) ? Flickable.DragOverBounds : Flickable.StopAtBounds
4357-
4358- Column {
4359- id: column
4360- spacing: units.gu(2)
4361-
4362- ComboButton {
4363- id: combo
4364-
4365- text: listview.currentItem.text
4366- onClicked: {
4367- expanded = !expanded
4368- forceActiveFocus() // hides OSK if up
4369- }
4370- UbuntuListView {
4371- id: listview
4372- width: parent.width
4373- height: combo.comboListHeight
4374- model: 3
4375- currentIndex: 1
4376- delegate: Standard {
4377- text: {
4378- var method = indexToMethod(modelData)
4379- if (method === UbuntuSecurityPrivacyPanel.Swipe)
4380- return i18n.tr("Swipe")
4381- else if (method === UbuntuSecurityPrivacyPanel.Passcode)
4382- return i18n.tr("PIN code")
4383- else
4384- return i18n.tr("Passphrase")
4385- }
4386- onClicked: {
4387- listview.currentIndex = index
4388- combo.expanded = false
4389- }
4390- }
4391- }
4392- }
4393-
4394- TextField {
4395- id: passwordInput
4396- echoMode: TextInput.Password
4397- inputMethodHints: {
4398- var hints = Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData
4399- if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
4400- hints |= Qt.ImhDigitsOnly
4401- return hints
4402- }
4403- inputMask: {
4404- if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
4405- return "9999"
4406- else
4407- return ""
4408- }
4409- visible: passwdPage.method !== UbuntuSecurityPrivacyPanel.Swipe
4410- }
4411-
4412- TextField {
4413- id: confirmInput
4414- echoMode: passwordInput.echoMode
4415- inputMethodHints: passwordInput.inputMethodHints
4416- inputMask: passwordInput.inputMask
4417- visible: passwordInput.visible
4418- }
4419-
4420- Label {
4421- id: problem
4422- width: parent.width
4423- wrapMode: Text.Wrap
4424- visible: text !== ""
4425- color: UbuntuColors.red
4426- text: {
4427- if (passwordInput.visible) {
4428- if (passwordInput.text !== confirmInput.text) {
4429- if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
4430- return i18n.tr("Those PIN codes don't match.")
4431- else
4432- return i18n.tr("Those passphrases don't match.")
4433- } else if (passwordInput.text.length < 4) {
4434- // Note that the number four comes from PAM settings,
4435- // which we don't have a good way to interrogate. We
4436- // only do this matching instead of PAM because we want
4437- // to set the password via PAM in a different place
4438- // than this page. See comments at top of file.
4439- if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
4440- return i18n.tr("PIN code must be at least four digits long.")
4441- else
4442- return i18n.tr("Passphrase must be at least four characters long.")
4443- }
4444- }
4445- return ""
4446- }
4447- }
4448+ spacing: units.gu(4)
4449+
4450+ Label {
4451+ anchors.left: parent.left
4452+ anchors.right: parent.right
4453+ wrapMode: Text.Wrap
4454+ text: i18n.tr("Please select how you’d like to unlock your phone.")
4455+ }
4456+
4457+ ItemSelector {
4458+ id: selector
4459+ expanded: true
4460+ anchors.left: parent.left
4461+ anchors.right: parent.right
4462+
4463+ model: ["", "", ""] // otherwise the delegate will show the text itself and we only want subText
4464+
4465+ selectedIndex: methodToIndex(root.passwordMethod)
4466+
4467+ delegate: OptionSelectorDelegate {
4468+ // use subText because we want the text to be small, and we have no other way to control it
4469+ subText: {
4470+ var method = indexToMethod(index)
4471+ var name = ""
4472+ var desc = ""
4473+ if (method === UbuntuSecurityPrivacyPanel.Swipe) {
4474+ name = i18n.tr("Swipe")
4475+ desc = i18n.tr("No security")
4476+ } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
4477+ name = i18n.tr("Passcode")
4478+ desc = i18n.tr("4 numbers")
4479+ } else {
4480+ name = i18n.tr("Passphrase")
4481+ desc = i18n.tr("Numbers and letters")
4482+ }
4483+ return "<b>%1</b> (%2)".arg(name).arg(desc)
4484+ }
4485+ }
4486+
4487+ style: Item {}
4488 }
4489 }
4490
4491@@ -176,14 +110,9 @@
4492 id: forwardButton
4493 LocalComponents.StackButton {
4494 text: i18n.tr("Continue")
4495- enabled: !problem.visible
4496 onClicked: {
4497- root.passwordMethod = passwdPage.method
4498- root.password = passwdPage.password
4499- if (manager.modems.length == 0 || simManager0.present || simManager1.present)
4500- pageStack.next()
4501- else
4502- pageStack.push(Qt.resolvedUrl("no-sim.qml"))
4503+ root.passwordMethod = indexToMethod(selector.selectedIndex)
4504+ pageStack.next()
4505 }
4506 }
4507 }
4508
4509=== added file 'wizard/qml/Pages/31-passwd-set.qml'
4510--- wizard/qml/Pages/31-passwd-set.qml 1970-01-01 00:00:00 +0000
4511+++ wizard/qml/Pages/31-passwd-set.qml 2014-10-10 17:52:06 +0000
4512@@ -0,0 +1,86 @@
4513+/*
4514+ * Copyright (C) 2014 Canonical, Ltd.
4515+ *
4516+ * This program is free software; you can redistribute it and/or modify
4517+ * it under the terms of the GNU General Public License as published by
4518+ * the Free Software Foundation; version 3.
4519+ *
4520+ * This program is distributed in the hope that it will be useful,
4521+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4522+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4523+ * GNU General Public License for more details.
4524+ *
4525+ * You should have received a copy of the GNU General Public License
4526+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
4527+ */
4528+
4529+import QtQuick 2.3
4530+import Ubuntu.Components 1.1
4531+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
4532+import "../Components" as LocalComponents
4533+import "file:///usr/share/unity8/Components" as UnityComponents
4534+
4535+/**
4536+ * See the main passwd-type page for an explanation of why we don't actually
4537+ * directly set the password here.
4538+ */
4539+
4540+LocalComponents.Page {
4541+ id: passwdSetPage
4542+ forwardButtonSourceComponent: forwardButton
4543+
4544+ skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
4545+
4546+ // If we are entering this page, clear any saved password and get focus
4547+ onEnabledChanged: if (enabled) lockscreen.clear(false)
4548+
4549+ UnityComponents.Lockscreen {
4550+ id: lockscreen
4551+ anchors {
4552+ fill: parent
4553+ topMargin: topMargin
4554+ leftMargin: leftMargin
4555+ rightMargin: rightMargin
4556+ bottomMargin: buttonMargin
4557+ }
4558+
4559+ infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
4560+ i18n.tr("Enter passphrase") :
4561+ i18n.tr("Choose your passcode")
4562+
4563+ // Note that the number four comes from PAM settings,
4564+ // which we don't have a good way to interrogate. We
4565+ // only do this matching instead of PAM because we want
4566+ // to set the password via PAM in a different place
4567+ // than this page. See comments at top of passwd-type file.
4568+ errorText: i18n.tr("Passphrase must be 4 characters long")
4569+
4570+ showEmergencyCallButton: false
4571+ showCancelButton: false
4572+ alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
4573+ minPinLength: 4
4574+ maxPinLength: 4
4575+
4576+ onEntered: {
4577+ if (passphrase.length >= 4) {
4578+ root.password = passphrase
4579+ pageStack.load(Qt.resolvedUrl("passwd-confirm.qml"))
4580+ } else {
4581+ lockscreen.clear(true)
4582+ }
4583+ }
4584+ }
4585+
4586+ Component {
4587+ id: forwardButton
4588+ LocalComponents.StackButton {
4589+ text: i18n.tr("Skip")
4590+ onClicked: {
4591+ root.passwordMethod = UbuntuSecurityPrivacyPanel.Swipe
4592+ pageStack.prev()
4593+ pageStack.next()
4594+ }
4595+ visible: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passcode
4596+ }
4597+ }
4598+}
4599
4600=== renamed file 'wizard/qml/Pages/20-wifi.qml' => 'wizard/qml/Pages/40-wifi.qml'
4601--- wizard/qml/Pages/20-wifi.qml 2014-09-03 09:51:27 +0000
4602+++ wizard/qml/Pages/40-wifi.qml 2014-10-10 17:52:06 +0000
4603@@ -143,7 +143,8 @@
4604 anchors.right: parent.right
4605 anchors.rightMargin: rightMargin
4606 fontSize: "small"
4607- text: i18n.tr("Available networks")
4608+ text: mainMenu.count > 0 ? i18n.tr("Available networks…")
4609+ : i18n.tr("No available networks.")
4610 }
4611
4612 Flickable {
4613@@ -192,8 +193,7 @@
4614 Component {
4615 id: forwardButton
4616 LocalComponents.StackButton {
4617- text: connected ? i18n.tr("Continue") : i18n.tr("Skip")
4618- rightArrow: !connected
4619+ text: (connected || mainMenu.count === 0) ? i18n.tr("Continue") : i18n.tr("Skip")
4620 onClicked: pageStack.next()
4621 }
4622 }
4623
4624=== renamed file 'wizard/qml/Pages/30-location.qml' => 'wizard/qml/Pages/50-location.qml'
4625--- wizard/qml/Pages/30-location.qml 2014-09-18 13:30:14 +0000
4626+++ wizard/qml/Pages/50-location.qml 2014-10-10 17:52:06 +0000
4627@@ -1,5 +1,5 @@
4628 /*
4629- * Copyright (C) 2013 Canonical, Ltd.
4630+ * Copyright (C) 2013,2014 Canonical, Ltd.
4631 *
4632 * This program is free software; you can redistribute it and/or modify
4633 * it under the terms of the GNU General Public License as published by
4634@@ -15,7 +15,7 @@
4635 */
4636
4637 import QtQuick 2.3
4638-import QMenuModel 0.1
4639+import QMenuModel 0.1 as QMenuModel
4640 import Qt.labs.folderlistmodel 2.1
4641 import Ubuntu.Components 1.1
4642 import Ubuntu.SystemSettings.Wizard.Utils 0.1
4643@@ -25,16 +25,7 @@
4644 title: i18n.tr("Location")
4645 forwardButtonSourceComponent: forwardButton
4646
4647- QDBusActionGroup {
4648- id: locationActionGroup
4649- busType: DBus.SessionBus
4650- busName: "com.canonical.indicator.location"
4651- objectPath: "/com/canonical/indicator/location"
4652-
4653- property variant enabled: action("location-detection-enabled")
4654-
4655- Component.onCompleted: start()
4656- }
4657+ property bool hereInstalled: System.hereLicensePath !== "" && termsModel.count > 0
4658
4659 FolderListModel {
4660 id: termsModel
4661@@ -44,20 +35,33 @@
4662 showOnlyReadable: true
4663 }
4664
4665+ QMenuModel.QDBusActionGroup {
4666+ id: locationActionGroup
4667+ busType: QMenuModel.DBus.SessionBus
4668+ busName: "com.canonical.indicator.location"
4669+ objectPath: "/com/canonical/indicator/location"
4670+ property variant enabled: action("location-detection-enabled")
4671+ Component.onCompleted: start()
4672+ }
4673+
4674 Column {
4675 id: column
4676 anchors.fill: content
4677- spacing: units.gu(4)
4678+ spacing: units.gu(2)
4679
4680- Item { // spacer
4681- height: units.gu(1)
4682- width: units.gu(1) // needed else it will be ignored
4683+ Label {
4684+ anchors.left: parent.left
4685+ anchors.right: parent.right
4686+ visible: hereInstalled
4687+ wrapMode: Text.Wrap
4688+ // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
4689+ text: i18n.tr("Ubuntu includes location services provided by HERE, enabling apps to pinpoint your location.")
4690 }
4691
4692 LocalComponents.CheckableSetting {
4693 id: locationCheck
4694 showDivider: false
4695- text: i18n.tr("Use your mobile network and Wi-Fi to work out where you are")
4696+ text: i18n.tr("Allow apps to use your mobile and Wi-Fi networks to determine your location.")
4697 checked: locationActionGroup.enabled.state
4698 onTriggered: locationActionGroup.enabled.activate()
4699 }
4700@@ -65,13 +69,21 @@
4701 LocalComponents.CheckableSetting {
4702 id: termsCheck
4703 showDivider: false
4704- visible: System.hereLicensePath !== "" && termsModel.count > 0
4705+ visible: hereInstalled
4706 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
4707- text: i18n.tr("I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</a>")
4708- onLinkActivated: pageStack.push(Qt.resolvedUrl(link))
4709+ text: i18n.tr("Accept the HERE <a href='terms.qml'>terms and conditions</a> to enable these services.")
4710+ onLinkActivated: pageStack.load(Qt.resolvedUrl(link))
4711 checked: System.hereEnabled
4712 onTriggered: System.hereEnabled = checked
4713 }
4714+
4715+ Label {
4716+ anchors.left: parent.left
4717+ anchors.right: parent.right
4718+ visible: hereInstalled
4719+ wrapMode: Text.Wrap
4720+ text: i18n.tr("This service can be disabled at any time from the <b>System Settings</b> menu.")
4721+ }
4722 }
4723
4724 Component {
4725
4726=== renamed file 'wizard/qml/Pages/40-reporting.qml' => 'wizard/qml/Pages/60-reporting.qml'
4727--- wizard/qml/Pages/40-reporting.qml 2014-08-27 15:47:17 +0000
4728+++ wizard/qml/Pages/60-reporting.qml 2014-10-10 17:52:06 +0000
4729@@ -1,5 +1,5 @@
4730 /*
4731- * Copyright (C) 2013 Canonical, Ltd.
4732+ * Copyright (C) 2013,2014 Canonical, Ltd.
4733 *
4734 * This program is free software; you can redistribute it and/or modify
4735 * it under the terms of the GNU General Public License as published by
4736@@ -19,28 +19,26 @@
4737 import "../Components" as LocalComponents
4738
4739 LocalComponents.Page {
4740- title: i18n.tr("Bug reporting")
4741+ title: i18n.tr("Improving your experience")
4742 forwardButtonSourceComponent: forwardButton
4743
4744 Column {
4745 id: column
4746 anchors.fill: content
4747+ spacing: units.gu(2)
4748
4749 Label {
4750 anchors.left: parent.left
4751 anchors.right: parent.right
4752 wrapMode: Text.Wrap
4753- fontSize: "large"
4754- font.bold: true
4755- text: i18n.tr("Your phone is set up to automatically report errors to Canonical.")
4756+ text: i18n.tr("Your phone is set up to automatically report errors to Canonical and its partners, the makers of the operating system.")
4757 }
4758
4759 Label {
4760 anchors.left: parent.left
4761 anchors.right: parent.right
4762 wrapMode: Text.Wrap
4763- fontSize: "large"
4764- text: i18n.tr("This can be disabled in System Settings.")
4765+ text: i18n.tr("This can be disabled in <b>System Settings</b> under <b>Security &amp; Privacy</b>")
4766 }
4767 }
4768
4769
4770=== modified file 'wizard/qml/Pages/80-finished.qml'
4771--- wizard/qml/Pages/80-finished.qml 2014-08-27 15:47:17 +0000
4772+++ wizard/qml/Pages/80-finished.qml 2014-10-10 17:52:06 +0000
4773@@ -1,5 +1,5 @@
4774 /*
4775- * Copyright (C) 2013 Canonical, Ltd.
4776+ * Copyright (C) 2013,2014 Canonical, Ltd.
4777 *
4778 * This program is free software; you can redistribute it and/or modify
4779 * it under the terms of the GNU General Public License as published by
4780@@ -26,7 +26,7 @@
4781 Column {
4782 id: column
4783 anchors.fill: content
4784- spacing: units.gu(2)
4785+ spacing: units.gu(1)
4786
4787 Label {
4788 anchors.left: parent.left
4789@@ -41,7 +41,6 @@
4790 anchors.left: parent.left
4791 anchors.right: parent.right
4792 wrapMode: Text.Wrap
4793- fontSize: "large"
4794 text: i18n.tr("Your phone is now ready to use.")
4795 }
4796 }
4797
4798=== renamed file 'wizard/qml/Pages/terms.qml' => 'wizard/qml/Pages/here-terms.qml'
4799--- wizard/qml/Pages/terms.qml 2014-08-29 19:46:45 +0000
4800+++ wizard/qml/Pages/here-terms.qml 2014-10-10 17:52:06 +0000
4801@@ -96,7 +96,8 @@
4802
4803 Label {
4804 id: termsLabel
4805- anchors.fill: parent
4806+ anchors.left: parent.left
4807+ anchors.right: parent.right
4808 wrapMode: Text.Wrap
4809 linkColor: Theme.palette.normal.foregroundText
4810 onLinkActivated: {
4811@@ -107,7 +108,8 @@
4812
4813 WebView {
4814 id: webview
4815- anchors.fill: parent
4816+ anchors.left: parent.left
4817+ anchors.right: parent.right
4818 visible: !termsLabel.visible
4819 }
4820 }
4821
4822=== added file 'wizard/qml/Pages/passwd-confirm.qml'
4823--- wizard/qml/Pages/passwd-confirm.qml 1970-01-01 00:00:00 +0000
4824+++ wizard/qml/Pages/passwd-confirm.qml 2014-10-10 17:52:06 +0000
4825@@ -0,0 +1,68 @@
4826+/*
4827+ * Copyright (C) 2014 Canonical, Ltd.
4828+ *
4829+ * This program is free software; you can redistribute it and/or modify
4830+ * it under the terms of the GNU General Public License as published by
4831+ * the Free Software Foundation; version 3.
4832+ *
4833+ * This program is distributed in the hope that it will be useful,
4834+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4835+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4836+ * GNU General Public License for more details.
4837+ *
4838+ * You should have received a copy of the GNU General Public License
4839+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
4840+ */
4841+
4842+import QtQuick 2.3
4843+import Ubuntu.Components 1.1
4844+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
4845+import "../Components" as LocalComponents
4846+import "file:///usr/share/unity8/Components" as UnityComponents
4847+
4848+/**
4849+ * See the main passwd-type page for an explanation of why we don't actually
4850+ * directly set the password here.
4851+ */
4852+
4853+LocalComponents.Page {
4854+ id: passwdSetPage
4855+
4856+ skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
4857+
4858+ // If we are entering this page, clear any saved password and get focus
4859+ onEnabledChanged: if (enabled) lockscreen.clear(false)
4860+
4861+ UnityComponents.Lockscreen {
4862+ id: lockscreen
4863+ anchors {
4864+ fill: parent
4865+ topMargin: topMargin
4866+ leftMargin: leftMargin
4867+ rightMargin: rightMargin
4868+ bottomMargin: buttonMargin
4869+ }
4870+
4871+ infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
4872+ i18n.tr("Confirm passphrase") :
4873+ i18n.tr("Confirm passcode")
4874+
4875+ errorText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
4876+ i18n.tr("Sorry, incorrect passphrase.") + "\n" + i18n.tr("Please try again.") :
4877+ i18n.tr("Sorry, incorrect passcode.") + "\n" + i18n.tr("Please try again.")
4878+
4879+ showEmergencyCallButton: false
4880+ showCancelButton: false
4881+ alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
4882+ minPinLength: 4
4883+ maxPinLength: 4
4884+
4885+ onEntered: {
4886+ if (passphrase === root.password) {
4887+ pageStack.next()
4888+ } else {
4889+ clear(true)
4890+ }
4891+ }
4892+ }
4893+}
4894
4895=== modified file 'wizard/qml/main.qml'
4896--- wizard/qml/main.qml 2014-09-18 12:59:25 +0000
4897+++ wizard/qml/main.qml 2014-10-10 17:52:06 +0000
4898@@ -30,11 +30,13 @@
4899
4900 // These should be set by a security page and we apply the settings when
4901 // the user exits the wizard.
4902- property int passwordMethod: UbuntuSecurityPrivacyPanel.Swipe
4903+ property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode
4904 property string password: ""
4905
4906 Component.onCompleted: {
4907 Theme.name = "Ubuntu.Components.Themes.SuruGradient"
4908+ // A visible selected background looks bad in ListItem widgets with our theme
4909+ Theme.palette.selected.background = "#00000000"
4910 i18n.domain = "ubuntu-system-settings"
4911 }
4912
4913@@ -101,13 +103,50 @@
4914 // continuing so back button returns to the previous main page.
4915 while (pageList.index < pageStack.depth - 1)
4916 pop()
4917- push(pageList.next())
4918+ load(pageList.next())
4919 }
4920
4921 function prev() {
4922 if (pageList.index >= pageStack.depth - 1)
4923 pageList.prev() // update pageList.index, but not for extra pages
4924 pop()
4925+ if (!currentPage || currentPage.opacity === 0) { // undo skipped pages
4926+ prev()
4927+ } else {
4928+ currentPage.enabled = true
4929+ }
4930+ }
4931+
4932+ function load(path) {
4933+ if (currentPage) {
4934+ currentPage.enabled = false
4935+ }
4936+
4937+ // First load it invisible, check that we should actually use
4938+ // this page, and either skip it or continue.
4939+ push(path, {"opacity": 0, "enabled": false})
4940+
4941+ // Check for immediate skip or not. We may have to wait for
4942+ // skipValid to be assigned (see Connections object below)
4943+ _checkSkip()
4944+ }
4945+
4946+ function _checkSkip() {
4947+ if (!currentPage) { // may have had a parse error
4948+ next()
4949+ } else if (currentPage.skipValid) {
4950+ if (currentPage.skip) {
4951+ next()
4952+ } else {
4953+ currentPage.opacity = 1
4954+ currentPage.enabled = true
4955+ }
4956+ }
4957+ }
4958+
4959+ Connections {
4960+ target: pageStack.currentPage
4961+ onSkipValidChanged: pageStack._checkSkip()
4962 }
4963
4964 Component.onCompleted: next()
4965
4966=== modified file 'wizard/test.sh'
4967--- wizard/test.sh 2014-03-06 18:39:42 +0000
4968+++ wizard/test.sh 2014-10-10 17:52:06 +0000
4969@@ -5,8 +5,8 @@
4970 LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)
4971 if [ -n ${LOCAL_PRIVATE_DIR} ]; then
4972 echo "Testing against locally built version"
4973- export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/wizard"
4974- export XDG_DATA_DIRS="${TOPDIR}/debian/tmp/usr/share:${XDG_DATA_DIRS}"
4975+ export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/debian/tmp/usr/share"
4976+ export UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES="${LOCAL_PRIVATE_DIR}"
4977 export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}
4978 export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}
4979 else

Subscribers

People subscribed via source and target branches