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

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 :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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 :
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
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 :
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 :
review: Needs Fixing (continuous-integration)
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
=== modified file 'plugins/about/DevMode.qml'
--- plugins/about/DevMode.qml 2014-09-24 12:31:29 +0000
+++ plugins/about/DevMode.qml 2014-10-10 17:52:06 +0000
@@ -107,7 +107,7 @@
107 anchors.horizontalCenter: parent.horizontalCenter107 anchors.horizontalCenter: parent.horizontalCenter
108 horizontalAlignment: Text.AlignHCenter108 horizontalAlignment: Text.AlignHCenter
109 wrapMode: Text.WordWrap109 wrapMode: Text.WordWrap
110 text: i18n.tr("You need a PIN code or passphrase set to use Developer Mode.")110 text: i18n.tr("You need a passcode or passphrase set to use Developer Mode.")
111 }111 }
112 }112 }
113113
114114
=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml 2014-08-28 18:43:10 +0000
+++ plugins/security-privacy/LockSecurity.qml 2014-10-10 17:52:06 +0000
@@ -93,7 +93,7 @@
93 changeSecurityDialog.oldMethod) { // Changing existing93 changeSecurityDialog.oldMethod) { // Changing existing
94 switch (changeSecurityDialog.newMethod) {94 switch (changeSecurityDialog.newMethod) {
95 case UbuntuSecurityPrivacyPanel.Passcode:95 case UbuntuSecurityPrivacyPanel.Passcode:
96 return i18n.tr("Change PIN code…")96 return i18n.tr("Change passcode…")
97 case UbuntuSecurityPrivacyPanel.Passphrase:97 case UbuntuSecurityPrivacyPanel.Passphrase:
98 return i18n.tr("Change passphrase…")98 return i18n.tr("Change passphrase…")
99 default: // To stop the runtime complaining99 default: // To stop the runtime complaining
@@ -104,7 +104,7 @@
104 case UbuntuSecurityPrivacyPanel.Swipe:104 case UbuntuSecurityPrivacyPanel.Swipe:
105 return i18n.tr("Switch to swipe")105 return i18n.tr("Switch to swipe")
106 case UbuntuSecurityPrivacyPanel.Passcode:106 case UbuntuSecurityPrivacyPanel.Passcode:
107 return i18n.tr("Switch to PIN code")107 return i18n.tr("Switch to passcode")
108 case UbuntuSecurityPrivacyPanel.Passphrase:108 case UbuntuSecurityPrivacyPanel.Passphrase:
109 return i18n.tr("Switch to passphrase")109 return i18n.tr("Switch to passphrase")
110 }110 }
@@ -115,7 +115,7 @@
115 text: {115 text: {
116 switch (changeSecurityDialog.oldMethod) {116 switch (changeSecurityDialog.oldMethod) {
117 case UbuntuSecurityPrivacyPanel.Passcode:117 case UbuntuSecurityPrivacyPanel.Passcode:
118 return i18n.tr("Existing PIN code")118 return i18n.tr("Existing passcode")
119 case UbuntuSecurityPrivacyPanel.Passphrase:119 case UbuntuSecurityPrivacyPanel.Passphrase:
120 return i18n.tr("Existing passphrase")120 return i18n.tr("Existing passphrase")
121 // Shouldn't be reached when visible but still evaluated121 // Shouldn't be reached when visible but still evaluated
@@ -171,7 +171,7 @@
171 text: {171 text: {
172 switch (changeSecurityDialog.newMethod) {172 switch (changeSecurityDialog.newMethod) {
173 case UbuntuSecurityPrivacyPanel.Passcode:173 case UbuntuSecurityPrivacyPanel.Passcode:
174 return i18n.tr("Choose PIN code")174 return i18n.tr("Choose passcode")
175 case UbuntuSecurityPrivacyPanel.Passphrase:175 case UbuntuSecurityPrivacyPanel.Passphrase:
176 return i18n.tr("Choose passphrase")176 return i18n.tr("Choose passphrase")
177 // Shouldn't be reached when visible but still evaluated177 // Shouldn't be reached when visible but still evaluated
@@ -217,7 +217,7 @@
217 text: {217 text: {
218 switch (changeSecurityDialog.newMethod) {218 switch (changeSecurityDialog.newMethod) {
219 case UbuntuSecurityPrivacyPanel.Passcode:219 case UbuntuSecurityPrivacyPanel.Passcode:
220 return i18n.tr("Confirm PIN code")220 return i18n.tr("Confirm passcode")
221 case UbuntuSecurityPrivacyPanel.Passphrase:221 case UbuntuSecurityPrivacyPanel.Passphrase:
222 return i18n.tr("Confirm passphrase")222 return i18n.tr("Confirm passphrase")
223 // Shouldn't be reached when visible but still evaluated223 // Shouldn't be reached when visible but still evaluated
@@ -262,7 +262,7 @@
262 text: {262 text: {
263 if (changeSecurityDialog.newMethod ===263 if (changeSecurityDialog.newMethod ===
264 UbuntuSecurityPrivacyPanel.Passcode)264 UbuntuSecurityPrivacyPanel.Passcode)
265 return i18n.tr("Those PIN codes don't match. Try again.")265 return i18n.tr("Those passcodes don't match. Try again.")
266 if (changeSecurityDialog.newMethod ===266 if (changeSecurityDialog.newMethod ===
267 UbuntuSecurityPrivacyPanel.Passphrase)267 UbuntuSecurityPrivacyPanel.Passphrase)
268 return i18n.tr("Those passphrases don't match. Try again.")268 return i18n.tr("Those passphrases don't match. Try again.")
@@ -346,10 +346,10 @@
346346
347 ListItem.ItemSelector {347 ListItem.ItemSelector {
348 property string swipe: i18n.tr("Swipe (no security)")348 property string swipe: i18n.tr("Swipe (no security)")
349 property string passcode: i18n.tr("4-digit PIN code")349 property string passcode: i18n.tr("4-digit passcode")
350 property string passphrase: i18n.tr("Passphrase")350 property string passphrase: i18n.tr("Passphrase")
351 property string swipeAlt: i18n.tr("Swipe (no security)… ")351 property string swipeAlt: i18n.tr("Swipe (no security)… ")
352 property string passcodeAlt: i18n.tr("4-digit PIN code…")352 property string passcodeAlt: i18n.tr("4-digit passcode…")
353 property string passphraseAlt: i18n.tr("Passphrase…")353 property string passphraseAlt: i18n.tr("Passphrase…")
354354
355 id: unlockMethod355 id: unlockMethod
@@ -381,7 +381,7 @@
381 UbuntuSecurityPrivacyPanel.Swipe381 UbuntuSecurityPrivacyPanel.Swipe
382382
383 control: Button {383 control: Button {
384 property string changePasscode: i18n.tr("Change PIN code…")384 property string changePasscode: i18n.tr("Change passcode…")
385 property string changePassphrase: i18n.tr("Change passphrase…")385 property string changePassphrase: i18n.tr("Change passphrase…")
386386
387 property bool passcode: securityPrivacy.securityType ===387 property bool passcode: securityPrivacy.securityType ===
388388
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml 2014-09-02 09:44:12 +0000
+++ plugins/security-privacy/PhoneLocking.qml 2014-10-10 17:52:06 +0000
@@ -43,7 +43,7 @@
4343
44 ListItem.SingleValue {44 ListItem.SingleValue {
45 property string swipe: qsTr("None", "Unlock with swipe")45 property string swipe: qsTr("None", "Unlock with swipe")
46 property string passcode: i18n.tr("PIN code")46 property string passcode: i18n.tr("Passcode")
47 property string passphrase: i18n.tr("Passphrase")47 property string passphrase: i18n.tr("Passphrase")
4848
49 text: i18n.tr("Lock security")49 text: i18n.tr("Lock security")
5050
=== modified file 'plugins/security-privacy/securityprivacy.cpp'
--- plugins/security-privacy/securityprivacy.cpp 2014-09-08 21:00:58 +0000
+++ plugins/security-privacy/securityprivacy.cpp 2014-10-10 17:52:06 +0000
@@ -315,7 +315,7 @@
315{315{
316 switch (type) {316 switch (type) {
317 case SecurityPrivacy::Passcode:317 case SecurityPrivacy::Passcode:
318 return _("Incorrect PIN code. Try again.");318 return _("Incorrect passcode. Try again.");
319 case SecurityPrivacy::Passphrase:319 case SecurityPrivacy::Passphrase:
320 return _("Incorrect passphrase. Try again.");320 return _("Incorrect passphrase. Try again.");
321 default:321 default:
322322
=== modified file 'po/ubuntu-system-settings.pot'
--- po/ubuntu-system-settings.pot 2014-09-26 18:46:56 +0000
+++ po/ubuntu-system-settings.pot 2014-10-10 17:52:06 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-system-settings\n"9"Project-Id-Version: ubuntu-system-settings\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-26 12:27-0400\n"11"POT-Creation-Date: 2014-10-03 09:12-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,373 +30,183 @@
30msgid "Preferences;Settings;"30msgid "Preferences;Settings;"
31msgstr ""31msgstr ""
3232
33#: ../plugins/system-update//Configuration.qml:2933#: ../plugins/reset//ResetAllSettings.qml:29
34#: ../plugins/system-update//PageComponent.qml:565
35msgid "Auto download"
36msgstr ""
37
38#: ../plugins/system-update//Configuration.qml:34
39msgid "Download future updates automatically:"
40msgstr ""
41
42#: ../plugins/system-update//Configuration.qml:52
43#: ../plugins/system-update//PageComponent.qml:568
44#: ../plugins/wifi//NetworkDetails.qml:55
45#: ../plugins/about//PageComponent.qml:167
46#: ../plugins/security-privacy//PageComponent.qml:140
47#: ../plugins/security-privacy//PhoneLocking.qml:78
48#: ../plugins/security-privacy//PhoneLocking.qml:87
49#: ../plugins/battery//PageComponent.qml:315
50#: ../plugins/battery//PageComponent.qml:324
51#: ../plugins/battery//SleepValues.qml:106
52msgid "Never"
53msgstr ""
54
55#: ../plugins/system-update//Configuration.qml:53
56msgid "When on wi-fi"
57msgstr ""
58
59#: ../plugins/system-update//Configuration.qml:54
60msgid "On any data connection"
61msgstr ""
62
63#: ../plugins/system-update//Configuration.qml:55
64msgid "Data charges may apply."
65msgstr ""
66
67#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
68#: ../plugins/system-update//PageComponent.qml:37
69#: ../po/settings.js:4
70msgid "Updates"
71msgstr ""
72
73#: ../plugins/system-update//PageComponent.qml:94
74msgid "Update System"
75msgstr ""
76
77#: ../plugins/system-update//PageComponent.qml:95
78msgid "The phone needs to restart to install the system update."
79msgstr ""
80
81#: ../plugins/system-update//PageComponent.qml:95
82msgid "Connect the phone to power before installing the system update."
83msgstr ""
84
85#: ../plugins/system-update//PageComponent.qml:98
86msgid "Install & Restart"
87msgstr ""
88
89#: ../plugins/system-update//PageComponent.qml:108
90msgid "Not Now"
91msgstr ""
92
93#: ../plugins/system-update//PageComponent.qml:114
94msgid "Install"
95msgstr ""
96
97#: ../plugins/system-update//PageComponent.qml:135
98msgid "Software is up to date"
99msgstr ""
100
101#: ../plugins/system-update//PageComponent.qml:243
102msgid "Checking for updates…"
103msgstr ""
104
105#: ../plugins/system-update//PageComponent.qml:261
106#, qt-format
107msgid "Install %1 update…"
108msgid_plural "Install %1 updates…"
109msgstr[0] ""
110msgstr[1] ""
111
112#: ../plugins/system-update//PageComponent.qml:262
113#, qt-format
114msgid "Install %1 update"
115msgid_plural "Install %1 updates"
116msgstr[0] ""
117msgstr[1] ""
118
119#: ../plugins/system-update//PageComponent.qml:263
120msgid "Pause All"
121msgstr ""
122
123#: ../plugins/system-update//PageComponent.qml:317
124msgid "Retry"
125msgstr ""
126
127#: ../plugins/system-update//PageComponent.qml:333
128msgid "Download"
129msgstr ""
130
131#: ../plugins/system-update//PageComponent.qml:333
132msgid "Update"
133msgstr ""
134
135#: ../plugins/system-update//PageComponent.qml:334
136msgid "Resume"
137msgstr ""
138
139#: ../plugins/system-update//PageComponent.qml:335
140msgid "Pause"
141msgstr ""
142
143#: ../plugins/system-update//PageComponent.qml:393
144msgid "Installing"
145msgstr ""
146
147#: ../plugins/system-update//PageComponent.qml:426
148msgid "Installed"
149msgstr ""
150
151#: ../plugins/system-update//PageComponent.qml:452
152msgid "Version: "
153msgstr ""
154
155#: ../plugins/system-update//PageComponent.qml:474
156msgid "Sign in to Ubuntu One to receive updates for apps."
157msgstr ""
158
159#: ../plugins/system-update//PageComponent.qml:483
160msgid "Sign In…"
161msgstr ""
162
163#: ../plugins/system-update//PageComponent.qml:550
164msgid "Installing update…"
165msgstr ""
166
167#: ../plugins/system-update//PageComponent.qml:570
168msgid "On wi-fi"
169msgstr ""
170
171#: ../plugins/system-update//PageComponent.qml:572
172msgid "Always"
173msgstr ""
174
175#: ../plugins/system-update//PageComponent.qml:587
176msgid " bytes"
177msgstr ""
178
179#: ../plugins/system-update//PageComponent.qml:590
180msgid " KiB"
181msgstr ""
182
183#: ../plugins/system-update//PageComponent.qml:593
184msgid " MiB"
185msgstr ""
186
187#: ../plugins/system-update//PageComponent.qml:596
188msgid " GiB"
189msgstr ""
190
191#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
192#: ../plugins/phone//PageComponent.qml:32
193#: ../plugins/bluetooth//PageComponent.qml:93
194#: ../po/settings.js:46
195msgid "Phone"
196msgstr ""
197
198#: ../plugins/phone//PageComponent.qml:109
199#: ../plugins/sound//PageComponent.qml:153
200msgid "Dialpad sounds"
201msgstr ""
202
203#: ../plugins/phone//ServiceInfo.qml:109
204#, qt-format
205msgid "Last called %1"
206msgstr ""
207
208#: ../plugins/phone//ServiceInfo.qml:119
209msgid "Call"
210msgstr ""
211
212#: ../plugins/phone//CallForwarding.qml:32
213#: ../plugins/phone//CallForwarding.qml:76 ../plugins/phone//NoSims.qml:28
214#: ../plugins/phone//SingleSim.qml:33 ../plugins/phone//MultiSim.qml:36
215#: ../plugins/phone//MultiSim.qml:74
216msgid "Call forwarding"
217msgstr ""
218
219#: ../plugins/phone//CallForwarding.qml:91
220msgid ""34msgid ""
221"Redirects phone calls to another number whenever you don't answer, or your "35"The contents and layout of the launcher, and the filters in the home screen "
222"phone is busy, turned off, or out of range."36"will be returned to their original settings."
223msgstr ""37msgstr ""
22438
225#: ../plugins/phone//CallForwarding.qml:10139#: ../plugins/reset//ResetAllSettings.qml:31
226msgid "Forward to"40msgid "Reset all system settings"
227msgstr ""41msgstr ""
22842
229#: ../plugins/phone//CallForwarding.qml:13943#: ../plugins/reset//ResetAllSettings.qml:38
230#: ../plugins/background//Preview.qml:10244#: ../plugins/reset//EraseEverything.qml:54
231#: ../plugins/language//DisplayLanguage.qml:9845#: ../plugins/reset//ResetLauncherHome.qml:55
232#: ../plugins/language//RebootNecessary.qml:4746#: ../plugins/time-date//TimePicker.qml:173
47#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:55
233#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:5448#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:54
234#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:4949#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:49
235#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:5550#: ../plugins/phone//CallForwarding.qml:139
236#: ../plugins/wifi//OtherNetwork.qml:288
237#: ../plugins/security-privacy//SimPin.qml:14951#: ../plugins/security-privacy//SimPin.qml:149
238#: ../plugins/security-privacy//SimPin.qml:26652#: ../plugins/security-privacy//SimPin.qml:266
239#: ../plugins/security-privacy//LockSecurity.qml:28353#: ../plugins/security-privacy//LockSecurity.qml:283
240#: ../plugins/time-date//TimePicker.qml:17354#: ../plugins/background//Preview.qml:102
241#: ../plugins/reset//ResetLauncherHome.qml:5555#: ../plugins/language//RebootNecessary.qml:47
242#: ../plugins/reset//EraseEverything.qml:5456#: ../plugins/language//DisplayLanguage.qml:98
243#: ../plugins/reset//ResetAllSettings.qml:3857#: ../plugins/wifi//OtherNetwork.qml:288
244#: ../plugins/cellular//HotspotSetup.qml:8558#: ../plugins/cellular//HotspotSetup.qml:85
245#: ../plugins/background//Components//AddRemove.qml:4259#: ../plugins/background//Components//AddRemove.qml:42
246#: ../plugins/cellular//Components//SimEditor.qml:18960#: ../plugins/cellular//Components//SimEditor.qml:189
247msgid "Cancel"61msgid "Cancel"
248msgstr ""62msgstr ""
24963
64#: ../plugins/reset//EraseEverything.qml:41
65msgid ""
66"All documents, saved games, settings, and other items will be permanently "
67"deleted from this phone."
68msgstr ""
69
70#: ../plugins/reset//EraseEverything.qml:44
71msgid "Erase & Reset Everything"
72msgstr ""
73
74#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
75#: ../plugins/reset//PageComponent.qml:32
76#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:8
77msgid "Reset phone"
78msgstr ""
79
80#: ../plugins/reset//PageComponent.qml:73
81#: ../plugins/reset//ResetLauncherHome.qml:44
82msgid "Reset Launcher"
83msgstr ""
84
85#: ../plugins/reset//PageComponent.qml:87
86msgid "Reset all system settings…"
87msgstr ""
88
89#: ../plugins/reset//PageComponent.qml:101
90msgid "Erase & Reset Everything…"
91msgstr ""
92
93#: ../plugins/reset//ResetLauncherHome.qml:40
94msgid "The Launcher will be returned to its original contents."
95msgstr ""
96
97#: ../plugins/reset//ResetLauncherHome.qml:59
98#: ../plugins/language//RebootNecessary.qml:34
99msgid "The phone needs to restart for changes to take effect."
100msgstr ""
101
102#: ../plugins/time-date//ChooseTimeZone.qml:28
103msgid "Time zone"
104msgstr ""
105
106#: ../plugins/time-date//ChooseTimeZone.qml:46
107msgid "Set the time zone:"
108msgstr ""
109
110#: ../plugins/time-date//ChooseTimeZone.qml:47
111#: ../plugins/time-date//PageComponent.qml:69
112#: ../plugins/cellular//PageChooseCarrier.qml:103
113msgid "Automatically"
114msgstr ""
115
116#: ../plugins/time-date//ChooseTimeZone.qml:47
117#: ../plugins/time-date//PageComponent.qml:69
118#: ../plugins/security-privacy//PageComponent.qml:149
119#: ../plugins/cellular//PageChooseCarrier.qml:103
120msgid "Manually"
121msgstr ""
122
123#: ../plugins/time-date//ChooseTimeZone.qml:126
124msgid "Enter your current location."
125msgstr ""
126
127#: ../plugins/time-date//ChooseTimeZone.qml:127
128msgid "No matching place"
129msgstr ""
130
131#: ../plugins/time-date//TimePicker.qml:26
132msgid "Set time & date"
133msgstr ""
134
135#: ../plugins/time-date//TimePicker.qml:68
136msgid "Time"
137msgstr ""
138
139#: ../plugins/time-date//TimePicker.qml:81
140msgid "Hour"
141msgstr ""
142
143#: ../plugins/time-date//TimePicker.qml:95
144msgid "Minute"
145msgstr ""
146
147#: ../plugins/time-date//TimePicker.qml:109
148msgid "Second"
149msgstr ""
150
151#: ../plugins/time-date//TimePicker.qml:118
152msgid "Date"
153msgstr ""
154
155#: ../plugins/time-date//TimePicker.qml:130
156msgid "Day"
157msgstr ""
158
159#: ../plugins/time-date//TimePicker.qml:144
160msgid "Month"
161msgstr ""
162
163#: ../plugins/time-date//TimePicker.qml:162
164msgid "Year"
165msgstr ""
166
167#: ../plugins/time-date//TimePicker.qml:182
250#: ../plugins/phone//CallForwarding.qml:152168#: ../plugins/phone//CallForwarding.qml:152
169#: ../plugins/security-privacy//LockSecurity.qml:304
251#: ../plugins/background//Preview.qml:109170#: ../plugins/background//Preview.qml:109
252#: ../plugins/security-privacy//LockSecurity.qml:304
253#: ../plugins/time-date//TimePicker.qml:182
254msgid "Set"171msgid "Set"
255msgstr ""172msgstr ""
256173
257#. TRANSLATORS: %1 is the name of the (network) carrier174#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
258#: ../plugins/phone//Services.qml:34 ../plugins/phone//SingleSim.qml:51175#: ../plugins/time-date//PageComponent.qml:29
176#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:20
177msgid "Time & Date"
178msgstr ""
179
180#: ../plugins/time-date//PageComponent.qml:53
181msgid "Time zone:"
182msgstr ""
183
184#: ../plugins/time-date//PageComponent.qml:68
185msgid "Set the time and date:"
186msgstr ""
187
188#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:28
189#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:28
190#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:28
191msgid "Bluetooth Pairing Request"
192msgstr ""
193
194#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:36
195#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:36
259#, qt-format196#, qt-format
260msgid "%1 Services"197msgid "PIN for '%1'"
261msgstr ""198msgstr ""
262199
263#: ../plugins/phone//NoSims.qml:34 ../plugins/phone//SingleSim.qml:40200#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:63
264#: ../plugins/phone//MultiSim.qml:46 ../plugins/phone//MultiSim.qml:84201#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:62
265#: ../plugins/phone//CallWaiting.qml:31 ../plugins/phone//CallWaiting.qml:74202msgid "Pair"
266msgid "Call waiting"
267msgstr ""
268
269#: ../plugins/phone//NoSims.qml:42 ../plugins/phone//MultiSim.qml:56
270#: ../plugins/phone//MultiSim.qml:94
271msgid "Services"
272msgstr ""
273
274#: ../plugins/phone//SingleSim.qml:29
275msgid "SIM"
276msgstr ""
277
278#: ../plugins/phone//CallWaiting.qml:89
279msgid ""
280"Lets you answer or start a new call while on another call, and switch "
281"between them"
282msgstr ""
283
284#: ../plugins/background//Preview.qml:70
285msgid "Preview"
286msgstr ""
287
288#: ../plugins/background//Preview.qml:102
289msgid "Remove image"
290msgstr ""
291
292#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
293#: ../plugins/background//MainPage.qml:35
294#: ../po/settings.js:64
295msgid "Background"
296msgstr ""
297
298#: ../plugins/background//MainPage.qml:99
299msgid "Ubuntu Art"
300msgstr ""
301
302#: ../plugins/background//MainPage.qml:115
303msgid "Custom"
304msgstr ""
305
306#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
307#: ../plugins/language//PageComponent.qml:34
308#: ../po/settings.js:80
309msgid "Language & Text"
310msgstr ""
311
312#: ../plugins/language//PageComponent.qml:100
313msgid "Display language…"
314msgstr ""
315
316#: ../plugins/language//PageComponent.qml:117
317#: ../plugins/language//KeyboardLayouts.qml:26
318msgid "Keyboard layouts"
319msgstr ""
320
321#: ../plugins/language//PageComponent.qml:132
322#: ../plugins/language//PageComponent.qml:142
323#: ../plugins/language//SpellChecking.qml:27
324#: ../plugins/language//SpellChecking.qml:36
325msgid "Spell checking"
326msgstr ""
327
328#: ../plugins/language//PageComponent.qml:152
329msgid "Auto correction"
330msgstr ""
331
332#: ../plugins/language//PageComponent.qml:162
333msgid "Word suggestions"
334msgstr ""
335
336#: ../plugins/language//PageComponent.qml:175
337msgid "Auto capitalization"
338msgstr ""
339
340#: ../plugins/language//PageComponent.qml:185
341msgid "Turns on Shift to capitalize the first letter of each sentence."
342msgstr ""
343
344#: ../plugins/language//PageComponent.qml:192
345msgid "Auto punctuation"
346msgstr ""
347
348#: ../plugins/language//PageComponent.qml:202
349msgid ""
350"Adds a period, and any missing quotes or brackets, when you tap Space twice."
351msgstr ""
352
353#: ../plugins/language//PageComponent.qml:209
354#: ../plugins/sound//PageComponent.qml:196
355msgid "Keyboard sound"
356msgstr ""
357
358#: ../plugins/language//PageComponent.qml:219
359msgid "Keyboard vibration"
360msgstr ""
361
362#: ../plugins/language//SpellChecking.qml:53
363msgid "Current spelling languages:"
364msgstr ""
365
366#: ../plugins/language//SpellChecking.qml:54
367msgid "All languages available:"
368msgstr ""
369
370#: ../plugins/language//KeyboardLayouts.qml:39
371msgid "Current layouts:"
372msgstr ""
373
374#: ../plugins/language//KeyboardLayouts.qml:40
375msgid "All layouts available:"
376msgstr ""
377
378#: ../plugins/language//DisplayLanguage.qml:36
379msgid "Display language"
380msgstr ""
381
382#: ../plugins/language//DisplayLanguage.qml:118
383msgid "Confirm"
384msgstr ""
385
386#: ../plugins/language//RebootNecessary.qml:34
387#: ../plugins/reset//ResetLauncherHome.qml:59
388msgid "The phone needs to restart for changes to take effect."
389msgstr ""
390
391#: ../plugins/language//RebootNecessary.qml:38
392msgid "Restart Now"
393msgstr ""203msgstr ""
394204
395#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching205#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
396#: ../plugins/bluetooth//PageComponent.qml:32206#: ../plugins/bluetooth//PageComponent.qml:32
397#: ../plugins/bluetooth//PageComponent.qml:147207#: ../plugins/bluetooth//PageComponent.qml:147
398#: ../plugins/battery//PageComponent.qml:363208#: ../plugins/battery//PageComponent.qml:363
399#: ../po/settings.js:114209#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:30
400msgid "Bluetooth"210msgid "Bluetooth"
401msgstr ""211msgstr ""
402212
@@ -424,6 +234,13 @@
424msgid "Computer"234msgid "Computer"
425msgstr ""235msgstr ""
426236
237#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
238#: ../plugins/bluetooth//PageComponent.qml:93
239#: ../plugins/phone//PageComponent.qml:32
240#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:54
241msgid "Phone"
242msgstr ""
243
427#: ../plugins/bluetooth//PageComponent.qml:94244#: ../plugins/bluetooth//PageComponent.qml:94
428msgid "Modem"245msgid "Modem"
429msgstr ""246msgstr ""
@@ -530,7 +347,7 @@
530msgstr ""347msgstr ""
531348
532#: ../plugins/bluetooth//PageComponent.qml:346349#: ../plugins/bluetooth//PageComponent.qml:346
533#: ../plugins/wifi//NetworkDetails.qml:43350#: ../plugins/wifi//NetworkDetails.qml:45
534msgid "Name"351msgid "Name"
535msgstr ""352msgstr ""
536353
@@ -560,23 +377,6 @@
560msgid "Forget this device"377msgid "Forget this device"
561msgstr ""378msgstr ""
562379
563#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:28
564#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:28
565#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:28
566msgid "Bluetooth Pairing Request"
567msgstr ""
568
569#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:36
570#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:36
571#, qt-format
572msgid "PIN for '%1'"
573msgstr ""
574
575#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:62
576#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:63
577msgid "Pair"
578msgstr ""
579
580#. TRANSLATORS: %1 is the name of the bluetooth device being paired380#. TRANSLATORS: %1 is the name of the bluetooth device being paired
581#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:37381#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:37
582#, qt-format382#, qt-format
@@ -587,13 +387,67 @@
587msgid "Confirm PIN"387msgid "Confirm PIN"
588msgstr ""388msgstr ""
589389
590#: ../plugins/sound//SilentModeWarning.qml:31390#: ../plugins/phone//CallWaiting.qml:31 ../plugins/phone//CallWaiting.qml:74
591msgid "The phone is in Silent Mode."391#: ../plugins/phone//MultiSim.qml:46 ../plugins/phone//MultiSim.qml:84
392#: ../plugins/phone//SingleSim.qml:40 ../plugins/phone//NoSims.qml:34
393msgid "Call waiting"
394msgstr ""
395
396#: ../plugins/phone//CallWaiting.qml:89
397msgid ""
398"Lets you answer or start a new call while on another call, and switch "
399"between them"
400msgstr ""
401
402#: ../plugins/phone//CallForwarding.qml:32
403#: ../plugins/phone//CallForwarding.qml:76 ../plugins/phone//MultiSim.qml:36
404#: ../plugins/phone//MultiSim.qml:74 ../plugins/phone//SingleSim.qml:33
405#: ../plugins/phone//NoSims.qml:28
406msgid "Call forwarding"
407msgstr ""
408
409#: ../plugins/phone//CallForwarding.qml:91
410msgid ""
411"Redirects phone calls to another number whenever you don't answer, or your "
412"phone is busy, turned off, or out of range."
413msgstr ""
414
415#: ../plugins/phone//CallForwarding.qml:101
416msgid "Forward to"
417msgstr ""
418
419#. TRANSLATORS: %1 is the name of the (network) carrier
420#: ../plugins/phone//Services.qml:34 ../plugins/phone//SingleSim.qml:51
421#, qt-format
422msgid "%1 Services"
423msgstr ""
424
425#: ../plugins/phone//PageComponent.qml:109
426#: ../plugins/sound//PageComponent.qml:153
427msgid "Dialpad sounds"
428msgstr ""
429
430#: ../plugins/phone//MultiSim.qml:56 ../plugins/phone//MultiSim.qml:94
431#: ../plugins/phone//NoSims.qml:42
432msgid "Services"
433msgstr ""
434
435#: ../plugins/phone//SingleSim.qml:29
436msgid "SIM"
437msgstr ""
438
439#: ../plugins/phone//ServiceInfo.qml:109
440#, qt-format
441msgid "Last called %1"
442msgstr ""
443
444#: ../plugins/phone//ServiceInfo.qml:119
445msgid "Call"
592msgstr ""446msgstr ""
593447
594#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching448#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
595#: ../plugins/sound//PageComponent.qml:37449#: ../plugins/sound//PageComponent.qml:37
596#: ../po/settings.js:144450#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:72
597msgid "Sound"451msgid "Sound"
598msgstr ""452msgstr ""
599453
@@ -640,6 +494,11 @@
640msgid "Other sounds:"494msgid "Other sounds:"
641msgstr ""495msgstr ""
642496
497#: ../plugins/sound//PageComponent.qml:196
498#: ../plugins/language//PageComponent.qml:209
499msgid "Keyboard sound"
500msgstr ""
501
643#: ../plugins/sound//PageComponent.qml:210502#: ../plugins/sound//PageComponent.qml:210
644msgid "Lock sound"503msgid "Lock sound"
645msgstr ""504msgstr ""
@@ -648,378 +507,13 @@
648msgid "Stop playing"507msgid "Stop playing"
649msgstr ""508msgstr ""
650509
651#: ../plugins/wifi//NetworkDetails.qml:36510#: ../plugins/sound//SilentModeWarning.qml:31
652msgid "Network details"511msgid "The phone is in Silent Mode."
653msgstr ""
654
655#: ../plugins/wifi//NetworkDetails.qml:51
656msgid "Last connected"
657msgstr ""
658
659#: ../plugins/wifi//NetworkDetails.qml:61
660#: ../plugins/wifi//OtherNetwork.qml:222
661msgid "Password"
662msgstr ""
663
664#: ../plugins/wifi//NetworkDetails.qml:73
665#: ../plugins/wifi//OtherNetwork.qml:256
666msgid "Show password"
667msgstr ""
668
669#: ../plugins/wifi//NetworkDetails.qml:83
670msgid "Forget network"
671msgstr ""
672
673#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
674#: ../plugins/wifi//PageComponent.qml:28
675#: ../plugins/battery//PageComponent.qml:333
676#: ../po/settings.js:162
677msgid "Wi-Fi"
678msgstr ""
679
680#: ../plugins/wifi//PageComponent.qml:131
681#: ../plugins/wifi//PreviousNetworks.qml:26
682msgid "Previous networks"
683msgstr ""
684
685#: ../plugins/wifi//PageComponent.qml:138
686msgid "Connect to hidden network…"
687msgstr ""
688
689#: ../plugins/wifi//OtherNetwork.qml:96
690msgid "Connect to Hidden Network"
691msgstr ""
692
693#: ../plugins/wifi//OtherNetwork.qml:187
694msgid "Network name"
695msgstr ""
696
697#: ../plugins/wifi//OtherNetwork.qml:203
698#: ../plugins/security-privacy//PageComponent.qml:126
699msgid "Security"
700msgstr ""
701
702#: ../plugins/wifi//OtherNetwork.qml:215
703msgid "WPA & WPA2 Personal"
704msgstr ""
705
706#: ../plugins/wifi//OtherNetwork.qml:216
707msgid "WEP"
708msgstr ""
709
710#: ../plugins/wifi//RemoveBackground.qml:28
711msgid "Clear"
712msgstr ""
713
714#: ../plugins/wifi//Common.qml:36
715msgid "Unknown error"
716msgstr ""
717
718#: ../plugins/wifi//Common.qml:38
719msgid "No reason given"
720msgstr ""
721
722#: ../plugins/wifi//Common.qml:40
723msgid "Device is now managed"
724msgstr ""
725
726#: ../plugins/wifi//Common.qml:42
727msgid "Device is now unmanaged"
728msgstr ""
729
730#: ../plugins/wifi//Common.qml:44
731msgid "The device could not be readied for configuration"
732msgstr ""
733
734#: ../plugins/wifi//Common.qml:46
735msgid ""
736"IP configuration could not be reserved (no available address, timeout, etc.)"
737msgstr ""
738
739#: ../plugins/wifi//Common.qml:48
740msgid "The IP configuration is no longer valid"
741msgstr ""
742
743#: ../plugins/wifi//Common.qml:50
744msgid "Your authentication details were incorrect"
745msgstr ""
746
747#: ../plugins/wifi//Common.qml:52
748msgid "802.1X supplicant disconnected"
749msgstr ""
750
751#: ../plugins/wifi//Common.qml:54
752msgid "802.1X supplicant configuration failed"
753msgstr ""
754
755#: ../plugins/wifi//Common.qml:56
756msgid "802.1X supplicant failed"
757msgstr ""
758
759#: ../plugins/wifi//Common.qml:58
760msgid "802.1X supplicant took too long to authenticate"
761msgstr ""
762
763#: ../plugins/wifi//Common.qml:60
764msgid "DHCP client failed to start"
765msgstr ""
766
767#: ../plugins/wifi//Common.qml:62
768msgid "DHCP client error"
769msgstr ""
770
771#: ../plugins/wifi//Common.qml:64
772msgid "DHCP client failed"
773msgstr ""
774
775#: ../plugins/wifi//Common.qml:66
776msgid "Shared connection service failed to start"
777msgstr ""
778
779#: ../plugins/wifi//Common.qml:68
780msgid "Shared connection service failed"
781msgstr ""
782
783#: ../plugins/wifi//Common.qml:70
784msgid "Necessary firmware for the device may be missing"
785msgstr ""
786
787#: ../plugins/wifi//Common.qml:72
788msgid "The device was removed"
789msgstr ""
790
791#: ../plugins/wifi//Common.qml:74
792msgid "NetworkManager went to sleep"
793msgstr ""
794
795#: ../plugins/wifi//Common.qml:76
796msgid "The device's active connection disappeared"
797msgstr ""
798
799#: ../plugins/wifi//Common.qml:78
800msgid "Device disconnected by user or client"
801msgstr ""
802
803#: ../plugins/wifi//Common.qml:80
804msgid "The device's existing connection was assumed"
805msgstr ""
806
807#: ../plugins/wifi//Common.qml:82
808msgid "The supplicant is now available"
809msgstr ""
810
811#: ../plugins/wifi//Common.qml:84
812msgid "The modem could not be found"
813msgstr ""
814
815#: ../plugins/wifi//Common.qml:86
816msgid "The Bluetooth connection failed or timed out"
817msgstr ""
818
819#: ../plugins/wifi//Common.qml:88
820msgid "A dependency of the connection failed"
821msgstr ""
822
823#: ../plugins/wifi//Common.qml:90
824msgid "ModemManager is unavailable"
825msgstr ""
826
827#: ../plugins/wifi//Common.qml:92
828msgid "The Wi-Fi network could not be found"
829msgstr ""
830
831#: ../plugins/wifi//Common.qml:94
832msgid "A secondary connection of the base connection failed"
833msgstr ""
834
835#: ../plugins/wifi//NetworkDetailsBrief.qml:58
836msgid "IP address"
837msgstr ""
838
839#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
840#: ../plugins/notifications//PageComponent.qml:29
841#: ../po/settings.js:182
842msgid "Notifications"
843msgstr ""
844
845#: ../plugins/notifications//PageComponent.qml:40
846msgid ""
847"Selected apps can alert you using notification bubbles, sounds, vibrations, "
848"and the Notification Center."
849msgstr ""
850
851#: ../plugins/about//License.qml:30
852msgid "Sorry, this license could not be displayed."
853msgstr ""
854
855#: ../plugins/about//Storage.qml:33 ../plugins/about//PageComponent.qml:143
856msgid "Storage"
857msgstr ""
858
859#: ../plugins/about//Storage.qml:85
860msgid "Used by Ubuntu"
861msgstr ""
862
863#: ../plugins/about//Storage.qml:86
864msgid "Videos"
865msgstr ""
866
867#: ../plugins/about//Storage.qml:87
868msgid "Audio"
869msgstr ""
870
871#: ../plugins/about//Storage.qml:88
872msgid "Pictures"
873msgstr ""
874
875#: ../plugins/about//Storage.qml:89
876msgid "Other files"
877msgstr ""
878
879#: ../plugins/about//Storage.qml:90
880msgid "Used by apps"
881msgstr ""
882
883#: ../plugins/about//Storage.qml:140
884msgid "Total storage"
885msgstr ""
886
887#: ../plugins/about//Storage.qml:152
888msgid "Free space"
889msgstr ""
890
891#: ../plugins/about//Storage.qml:172
892msgid "By name"
893msgstr ""
894
895#: ../plugins/about//Storage.qml:172
896msgid "By size"
897msgstr ""
898
899#: ../plugins/about//Storage.qml:203
900#: ../plugins/cellular//PageChooseCarriers.qml:49
901#: ../plugins/cellular//PageChooseCarriers.qml:65
902#: ../plugins/battery//PageComponent.qml:131
903#: ../plugins/battery//PageComponent.qml:287
904#: ../plugins/cellular//Components//NoSim.qml:48
905#: ../plugins/cellular//Components//SingleSim.qml:62
906msgid "N/A"
907msgstr ""
908
909#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
910#: ../plugins/about//PageComponent.qml:34
911#: ../po/settings.js:206
912msgid "About this phone"
913msgstr ""
914
915#: ../plugins/about//PageComponent.qml:109
916msgid "Serial"
917msgstr ""
918
919#: ../plugins/about//PageComponent.qml:124
920msgid "Wi-Fi address"
921msgstr ""
922
923#: ../plugins/about//PageComponent.qml:132
924msgid "Bluetooth address"
925msgstr ""
926
927#: ../plugins/about//PageComponent.qml:144
928#, qt-format
929msgid "%1 free"
930msgstr ""
931
932#: ../plugins/about//PageComponent.qml:151
933msgid "Software:"
934msgstr ""
935
936#: ../plugins/about//PageComponent.qml:156
937msgid "OS"
938msgstr ""
939
940#: ../plugins/about//PageComponent.qml:165
941msgid "Last updated"
942msgstr ""
943
944#: ../plugins/about//PageComponent.qml:173
945msgid "Check for updates"
946msgstr ""
947
948#: ../plugins/about//PageComponent.qml:182
949msgid "Legal:"
950msgstr ""
951
952#: ../plugins/about//PageComponent.qml:187 ../plugins/about//Software.qml:11
953msgid "Software licenses"
954msgstr ""
955
956#: ../plugins/about//PageComponent.qml:195
957msgid "Regulatory info"
958msgstr ""
959
960#: ../plugins/about//PageComponent.qml:203
961msgid "Developer mode"
962msgstr ""
963
964#: ../plugins/about//Version.qml:36
965msgid "OS Build Details"
966msgstr ""
967
968#: ../plugins/about//Version.qml:61
969msgid "OS build number"
970msgstr ""
971
972#: ../plugins/about//Version.qml:67
973msgid "Ubuntu Image part"
974msgstr ""
975
976#: ../plugins/about//Version.qml:75
977msgid "Ubuntu build description"
978msgstr ""
979
980#: ../plugins/about//Version.qml:81
981msgid "Device Image part"
982msgstr ""
983
984#: ../plugins/about//Version.qml:88
985msgid "Device build description"
986msgstr ""
987
988#: ../plugins/about//Version.qml:95
989msgid "Customization Image part"
990msgstr ""
991
992#: ../plugins/about//PhoneNumber.qml:36
993msgid "Phone number"
994msgstr ""
995
996#: ../plugins/about//PhoneNumbers.qml:31
997msgid "Phone number:"
998msgstr ""
999
1000#: ../plugins/about//DevMode.qml:35 ../plugins/about//DevMode.qml:90
1001msgid "Developer Mode"
1002msgstr ""
1003
1004#: ../plugins/about//DevMode.qml:84
1005msgid ""
1006"In Developer Mode, anyone can access, change or delete anything on this "
1007"phone by connecting it to another device."
1008msgstr ""
1009
1010#: ../plugins/about//DevMode.qml:110
1011msgid "You need a PIN code or passphrase set to use Developer Mode."
1012msgstr ""
1013
1014#: ../plugins/about//DevMode.qml:116
1015#: ../plugins/security-privacy//PhoneLocking.qml:49
1016#: ../plugins/security-privacy//LockSecurity.qml:32
1017msgid "Lock security"
1018msgstr ""512msgstr ""
1019513
1020#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching514#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
1021#: ../plugins/security-privacy//PageComponent.qml:37515#: ../plugins/security-privacy//PageComponent.qml:37
1022#: ../po/settings.js:242516#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:90
1023msgid "Security & Privacy"517msgid "Security & Privacy"
1024msgstr ""518msgstr ""
1025519
@@ -1035,6 +529,11 @@
1035msgid "Phone only"529msgid "Phone only"
1036msgstr ""530msgstr ""
1037531
532#: ../plugins/security-privacy//PageComponent.qml:126
533#: ../plugins/wifi//OtherNetwork.qml:203
534msgid "Security"
535msgstr ""
536
1038#: ../plugins/security-privacy//PageComponent.qml:131537#: ../plugins/security-privacy//PageComponent.qml:131
1039msgid "Lock phone"538msgid "Lock phone"
1040msgstr ""539msgstr ""
@@ -1042,25 +541,31 @@
1042#. TRANSLATORS: %1 is the number of minutes541#. TRANSLATORS: %1 is the number of minutes
1043#: ../plugins/security-privacy//PageComponent.qml:137542#: ../plugins/security-privacy//PageComponent.qml:137
1044#: ../plugins/security-privacy//PageComponent.qml:146543#: ../plugins/security-privacy//PageComponent.qml:146
1045#: ../plugins/battery//PageComponent.qml:312
1046#: ../plugins/battery//PageComponent.qml:321
1047#: ../plugins/battery//SleepValues.qml:83544#: ../plugins/battery//SleepValues.qml:83
1048#: ../plugins/battery//SleepValues.qml:87545#: ../plugins/battery//SleepValues.qml:87
1049#: ../plugins/battery//SleepValues.qml:91546#: ../plugins/battery//SleepValues.qml:91
1050#: ../plugins/battery//SleepValues.qml:95547#: ../plugins/battery//SleepValues.qml:95
1051#: ../plugins/battery//SleepValues.qml:99548#: ../plugins/battery//SleepValues.qml:99
1052#: ../plugins/battery//SleepValues.qml:103549#: ../plugins/battery//SleepValues.qml:103
550#: ../plugins/battery//PageComponent.qml:312
551#: ../plugins/battery//PageComponent.qml:321
1053#, qt-format552#, qt-format
1054msgid "After %1 minute"553msgid "After %1 minute"
1055msgid_plural "After %1 minutes"554msgid_plural "After %1 minutes"
1056msgstr[0] ""555msgstr[0] ""
1057msgstr[1] ""556msgstr[1] ""
1058557
1059#: ../plugins/security-privacy//PageComponent.qml:149558#: ../plugins/security-privacy//PageComponent.qml:140
1060#: ../plugins/time-date//PageComponent.qml:69559#: ../plugins/security-privacy//PhoneLocking.qml:78
1061#: ../plugins/time-date//ChooseTimeZone.qml:47560#: ../plugins/security-privacy//PhoneLocking.qml:87
1062#: ../plugins/cellular//PageChooseCarrier.qml:103561#: ../plugins/system-update//Configuration.qml:52
1063msgid "Manually"562#: ../plugins/system-update//PageComponent.qml:689
563#: ../plugins/wifi//NetworkDetails.qml:58
564#: ../plugins/about//PageComponent.qml:167
565#: ../plugins/battery//SleepValues.qml:106
566#: ../plugins/battery//PageComponent.qml:315
567#: ../plugins/battery//PageComponent.qml:324
568msgid "Never"
1064msgstr ""569msgstr ""
1065570
1066#: ../plugins/security-privacy//PageComponent.qml:158571#: ../plugins/security-privacy//PageComponent.qml:158
@@ -1076,9 +581,9 @@
1076581
1077#: ../plugins/security-privacy//PageComponent.qml:165582#: ../plugins/security-privacy//PageComponent.qml:165
1078#: ../plugins/security-privacy//PageComponent.qml:244583#: ../plugins/security-privacy//PageComponent.qml:244
584#: ../plugins/cellular//Components//CellularSingleSim.qml:50
1079#: ../plugins/cellular//Components//CellularMultiSim.qml:30585#: ../plugins/cellular//Components//CellularMultiSim.qml:30
1080#: ../plugins/cellular//Components//NoSim.qml:32586#: ../plugins/cellular//Components//NoSim.qml:32
1081#: ../plugins/cellular//Components//CellularSingleSim.qml:50
1082msgid "Off"587msgid "Off"
1083msgstr ""588msgstr ""
1084589
@@ -1135,63 +640,158 @@
1135msgid "Not sent"640msgid "Not sent"
1136msgstr ""641msgstr ""
1137642
643#: ../plugins/security-privacy//AppAccess.qml:35
644msgid "Apps that you have granted and have requested access to:"
645msgstr ""
646
647#: ../plugins/security-privacy//AppAccess.qml:42
648msgid "Apps that have requested access to your camera"
649msgstr ""
650
651#: ../plugins/security-privacy//AppAccess.qml:46
652msgid "Mic"
653msgstr ""
654
655#: ../plugins/security-privacy//AppAccess.qml:47
656msgid "Apps that have requested access to your mic"
657msgstr ""
658
659#: ../plugins/security-privacy//AppAccess.qml:59
660#, qt-format
661msgid "%1/%2"
662msgstr ""
663
664#: ../plugins/security-privacy//AppAccess.qml:60
665msgid "0"
666msgstr ""
667
1138#: ../plugins/security-privacy//Dash.qml:45668#: ../plugins/security-privacy//Dash.qml:45
1139msgid "Return results from:"669msgid "Return results from:"
1140msgstr ""670msgstr ""
1141671
672#: ../plugins/security-privacy//PhoneLocking.qml:31
673msgid "Phone locking"
674msgstr ""
675
676#: ../plugins/security-privacy//PhoneLocking.qml:45
677msgctxt "Unlock with swipe"
678msgid "None"
679msgstr ""
680
681#: ../plugins/security-privacy//PhoneLocking.qml:46
682#: ../wizard/qml/Pages//30-passwd-type.qml:95
683msgid "Passcode"
684msgstr ""
685
686#: ../plugins/security-privacy//PhoneLocking.qml:47
687#: ../plugins/security-privacy//LockSecurity.qml:350
688#: ../wizard/qml/Pages//30-passwd-type.qml:98
689msgid "Passphrase"
690msgstr ""
691
692#: ../plugins/security-privacy//PhoneLocking.qml:49
693#: ../plugins/security-privacy//LockSecurity.qml:32
694#: ../plugins/about//DevMode.qml:116
695#: ../wizard/qml/Pages//30-passwd-type.qml:37
696msgid "Lock security"
697msgstr ""
698
699#: ../plugins/security-privacy//PhoneLocking.qml:68
700#: ../plugins/battery//PageComponent.qml:306
701msgid "Lock when idle"
702msgstr ""
703
704#: ../plugins/security-privacy//PhoneLocking.qml:69
705#: ../plugins/battery//PageComponent.qml:306
706msgid "Sleep when idle"
707msgstr ""
708
709#. TRANSLATORS: %1 is the number of minutes
710#: ../plugins/security-privacy//PhoneLocking.qml:75
711#: ../plugins/security-privacy//PhoneLocking.qml:84
712#, qt-format
713msgid "%1 minute"
714msgid_plural "%1 minutes"
715msgstr[0] ""
716msgstr[1] ""
717
718#: ../plugins/security-privacy//PhoneLocking.qml:101
719msgid "Sleep locks immediately"
720msgstr ""
721
722#: ../plugins/security-privacy//PhoneLocking.qml:106
723msgid "When locked, allow:"
724msgstr ""
725
726#: ../plugins/security-privacy//PhoneLocking.qml:110
727msgid "Launcher"
728msgstr ""
729
730#: ../plugins/security-privacy//PhoneLocking.qml:120
731msgid "Notifications and quick settings"
732msgstr ""
733
734#: ../plugins/security-privacy//PhoneLocking.qml:131
735msgid "Turn on lock security to restrict access when the phone is locked."
736msgstr ""
737
738#: ../plugins/security-privacy//PhoneLocking.qml:132
739msgid "Other apps and functions will prompt you to unlock."
740msgstr ""
741
1142#: ../plugins/security-privacy//Location.qml:31742#: ../plugins/security-privacy//Location.qml:31
1143#: ../wizard/qml/Pages//30-location.qml:25743#: ../wizard/qml/Pages//50-location.qml:25
1144msgid "Location"744msgid "Location"
1145msgstr ""745msgstr ""
1146746
1147#: ../plugins/security-privacy//Location.qml:49747#: ../plugins/security-privacy//Location.qml:59
1148msgid "Location detection"748msgid "Location detection"
1149msgstr ""749msgstr ""
1150750
1151#: ../plugins/security-privacy//Location.qml:71751#: ../plugins/security-privacy//Location.qml:81
1152msgid ""752msgid ""
1153"Uses GPS to detect your rough location. When off, GPS turns off to save "753"Uses GPS to detect your rough location. When off, GPS turns off to save "
1154"battery."754"battery."
1155msgstr ""755msgstr ""
1156756
1157#: ../plugins/security-privacy//Location.qml:73757#: ../plugins/security-privacy//Location.qml:83
1158msgid ""758msgid ""
1159"Uses wi-fi and GPS to detect your rough location. Turning off location "759"Uses wi-fi and GPS to detect your rough location. Turning off location "
1160"detection saves battery."760"detection saves battery."
1161msgstr ""761msgstr ""
1162762
1163#: ../plugins/security-privacy//Location.qml:75763#: ../plugins/security-privacy//Location.qml:85
1164msgid ""764msgid ""
1165"Uses wi-fi (currently off) and GPS to detect your rough location. Turning "765"Uses wi-fi (currently off) and GPS to detect your rough location. Turning "
1166"off location detection saves battery."766"off location detection saves battery."
1167msgstr ""767msgstr ""
1168768
1169#: ../plugins/security-privacy//Location.qml:77769#: ../plugins/security-privacy//Location.qml:87
1170msgid ""770msgid ""
1171"Uses wi-fi, cell tower locations, and GPS to detect your rough location. "771"Uses wi-fi, cell tower locations, and GPS to detect your rough location. "
1172"Turning off location detection saves battery."772"Turning off location detection saves battery."
1173msgstr ""773msgstr ""
1174774
1175#: ../plugins/security-privacy//Location.qml:79775#: ../plugins/security-privacy//Location.qml:89
1176msgid ""776msgid ""
1177"Uses wi-fi, cell tower locations (no current cellular connection), and GPS "777"Uses wi-fi, cell tower locations (no current cellular connection), and GPS "
1178"to detect your rough location. Turning off location detection saves battery."778"to detect your rough location. Turning off location detection saves battery."
1179msgstr ""779msgstr ""
1180780
1181#: ../plugins/security-privacy//Location.qml:81781#: ../plugins/security-privacy//Location.qml:91
1182msgid ""782msgid ""
1183"Uses wi-fi (currently off), cell tower locations, and GPS to detect your "783"Uses wi-fi (currently off), cell tower locations, and GPS to detect your "
1184"rough location. Turning off location detection saves battery."784"rough location. Turning off location detection saves battery."
1185msgstr ""785msgstr ""
1186786
1187#: ../plugins/security-privacy//Location.qml:83787#: ../plugins/security-privacy//Location.qml:93
1188msgid ""788msgid ""
1189"Uses wi-fi (currently off), cell tower locations (no current cellular "789"Uses wi-fi (currently off), cell tower locations (no current cellular "
1190"connection), and GPS to detect your rough location. Turning off location "790"connection), and GPS to detect your rough location. Turning off location "
1191"detection saves battery."791"detection saves battery."
1192msgstr ""792msgstr ""
1193793
1194#: ../plugins/security-privacy//Location.qml:90794#: ../plugins/security-privacy//Location.qml:100
1195msgid "Allow access to location:"795msgid "Allow access to location:"
1196msgstr ""796msgstr ""
1197797
@@ -1275,97 +875,9 @@
1275msgid "Entering an incorrect PIN repeatedly may lock the SIM permanently."875msgid "Entering an incorrect PIN repeatedly may lock the SIM permanently."
1276msgstr ""876msgstr ""
1277877
1278#: ../plugins/security-privacy//PhoneLocking.qml:31
1279msgid "Phone locking"
1280msgstr ""
1281
1282#: ../plugins/security-privacy//PhoneLocking.qml:45
1283msgctxt "Unlock with swipe"
1284msgid "None"
1285msgstr ""
1286
1287#: ../plugins/security-privacy//PhoneLocking.qml:46
1288#: ../wizard/qml/Pages//15-passwd.qml:106
1289msgid "PIN code"
1290msgstr ""
1291
1292#: ../plugins/security-privacy//PhoneLocking.qml:47
1293#: ../plugins/security-privacy//LockSecurity.qml:350
1294#: ../wizard/qml/Pages//15-passwd.qml:108
1295msgid "Passphrase"
1296msgstr ""
1297
1298#: ../plugins/security-privacy//PhoneLocking.qml:68
1299#: ../plugins/battery//PageComponent.qml:306
1300msgid "Lock when idle"
1301msgstr ""
1302
1303#: ../plugins/security-privacy//PhoneLocking.qml:69
1304#: ../plugins/battery//PageComponent.qml:306
1305msgid "Sleep when idle"
1306msgstr ""
1307
1308#. TRANSLATORS: %1 is the number of minutes
1309#: ../plugins/security-privacy//PhoneLocking.qml:75
1310#: ../plugins/security-privacy//PhoneLocking.qml:84
1311#, qt-format
1312msgid "%1 minute"
1313msgid_plural "%1 minutes"
1314msgstr[0] ""
1315msgstr[1] ""
1316
1317#: ../plugins/security-privacy//PhoneLocking.qml:101
1318msgid "Sleep locks immediately"
1319msgstr ""
1320
1321#: ../plugins/security-privacy//PhoneLocking.qml:106
1322msgid "When locked, allow:"
1323msgstr ""
1324
1325#: ../plugins/security-privacy//PhoneLocking.qml:110
1326msgid "Launcher"
1327msgstr ""
1328
1329#: ../plugins/security-privacy//PhoneLocking.qml:120
1330msgid "Notifications and quick settings"
1331msgstr ""
1332
1333#: ../plugins/security-privacy//PhoneLocking.qml:131
1334msgid "Turn on lock security to restrict access when the phone is locked."
1335msgstr ""
1336
1337#: ../plugins/security-privacy//PhoneLocking.qml:132
1338msgid "Other apps and functions will prompt you to unlock."
1339msgstr ""
1340
1341#: ../plugins/security-privacy//AppAccess.qml:35
1342msgid "Apps that you have granted and have requested access to:"
1343msgstr ""
1344
1345#: ../plugins/security-privacy//AppAccess.qml:42
1346msgid "Apps that have requested access to your camera"
1347msgstr ""
1348
1349#: ../plugins/security-privacy//AppAccess.qml:46
1350msgid "Mic"
1351msgstr ""
1352
1353#: ../plugins/security-privacy//AppAccess.qml:47
1354msgid "Apps that have requested access to your mic"
1355msgstr ""
1356
1357#: ../plugins/security-privacy//AppAccess.qml:59
1358#, qt-format
1359msgid "%1/%2"
1360msgstr ""
1361
1362#: ../plugins/security-privacy//AppAccess.qml:60
1363msgid "0"
1364msgstr ""
1365
1366#: ../plugins/security-privacy//LockSecurity.qml:96878#: ../plugins/security-privacy//LockSecurity.qml:96
1367#: ../plugins/security-privacy//LockSecurity.qml:384879#: ../plugins/security-privacy//LockSecurity.qml:384
1368msgid "Change PIN code…"880msgid "Change passcode…"
1369msgstr ""881msgstr ""
1370882
1371#: ../plugins/security-privacy//LockSecurity.qml:98883#: ../plugins/security-privacy//LockSecurity.qml:98
@@ -1378,7 +890,7 @@
1378msgstr ""890msgstr ""
1379891
1380#: ../plugins/security-privacy//LockSecurity.qml:107892#: ../plugins/security-privacy//LockSecurity.qml:107
1381msgid "Switch to PIN code"893msgid "Switch to passcode"
1382msgstr ""894msgstr ""
1383895
1384#: ../plugins/security-privacy//LockSecurity.qml:109896#: ../plugins/security-privacy//LockSecurity.qml:109
@@ -1386,7 +898,7 @@
1386msgstr ""898msgstr ""
1387899
1388#: ../plugins/security-privacy//LockSecurity.qml:118900#: ../plugins/security-privacy//LockSecurity.qml:118
1389msgid "Existing PIN code"901msgid "Existing passcode"
1390msgstr ""902msgstr ""
1391903
1392#: ../plugins/security-privacy//LockSecurity.qml:120904#: ../plugins/security-privacy//LockSecurity.qml:120
@@ -1394,7 +906,7 @@
1394msgstr ""906msgstr ""
1395907
1396#: ../plugins/security-privacy//LockSecurity.qml:174908#: ../plugins/security-privacy//LockSecurity.qml:174
1397msgid "Choose PIN code"909msgid "Choose passcode"
1398msgstr ""910msgstr ""
1399911
1400#: ../plugins/security-privacy//LockSecurity.qml:176912#: ../plugins/security-privacy//LockSecurity.qml:176
@@ -1402,15 +914,17 @@
1402msgstr ""914msgstr ""
1403915
1404#: ../plugins/security-privacy//LockSecurity.qml:220916#: ../plugins/security-privacy//LockSecurity.qml:220
1405msgid "Confirm PIN code"917#: ../wizard/qml/Pages//passwd-confirm.qml:48
918msgid "Confirm passcode"
1406msgstr ""919msgstr ""
1407920
1408#: ../plugins/security-privacy//LockSecurity.qml:222921#: ../plugins/security-privacy//LockSecurity.qml:222
922#: ../wizard/qml/Pages//passwd-confirm.qml:47
1409msgid "Confirm passphrase"923msgid "Confirm passphrase"
1410msgstr ""924msgstr ""
1411925
1412#: ../plugins/security-privacy//LockSecurity.qml:265926#: ../plugins/security-privacy//LockSecurity.qml:265
1413msgid "Those PIN codes don't match. Try again."927msgid "Those passcodes don't match. Try again."
1414msgstr ""928msgstr ""
1415929
1416#: ../plugins/security-privacy//LockSecurity.qml:268930#: ../plugins/security-privacy//LockSecurity.qml:268
@@ -1430,7 +944,7 @@
1430msgstr ""944msgstr ""
1431945
1432#: ../plugins/security-privacy//LockSecurity.qml:349946#: ../plugins/security-privacy//LockSecurity.qml:349
1433msgid "4-digit PIN code"947msgid "4-digit passcode"
1434msgstr ""948msgstr ""
1435949
1436#: ../plugins/security-privacy//LockSecurity.qml:351950#: ../plugins/security-privacy//LockSecurity.qml:351
@@ -1438,126 +952,651 @@
1438msgstr ""952msgstr ""
1439953
1440#: ../plugins/security-privacy//LockSecurity.qml:352954#: ../plugins/security-privacy//LockSecurity.qml:352
1441msgid "4-digit PIN code…"955msgid "4-digit passcode…"
1442msgstr ""956msgstr ""
1443957
1444#: ../plugins/security-privacy//LockSecurity.qml:353958#: ../plugins/security-privacy//LockSecurity.qml:353
1445msgid "Passphrase…"959msgid "Passphrase…"
1446msgstr ""960msgstr ""
1447961
1448#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching962#: ../plugins/system-update//Configuration.qml:29
1449#: ../plugins/time-date//PageComponent.qml:29963#: ../plugins/system-update//PageComponent.qml:686
1450#: ../po/settings.js:266964msgid "Auto download"
1451msgid "Time & Date"965msgstr ""
1452msgstr ""966
1453967#: ../plugins/system-update//Configuration.qml:34
1454#: ../plugins/time-date//PageComponent.qml:53968msgid "Download future updates automatically:"
1455msgid "Time zone:"969msgstr ""
1456msgstr ""970
1457971#: ../plugins/system-update//Configuration.qml:53
1458#: ../plugins/time-date//PageComponent.qml:68972msgid "When on wi-fi"
1459msgid "Set the time and date:"973msgstr ""
1460msgstr ""974
1461975#: ../plugins/system-update//Configuration.qml:54
1462#: ../plugins/time-date//PageComponent.qml:69976msgid "On any data connection"
1463#: ../plugins/time-date//ChooseTimeZone.qml:47977msgstr ""
1464#: ../plugins/cellular//PageChooseCarrier.qml:103978
1465msgid "Automatically"979#: ../plugins/system-update//Configuration.qml:55
1466msgstr ""980msgid "Data charges may apply."
1467981msgstr ""
1468#: ../plugins/time-date//TimePicker.qml:26982
1469msgid "Set time & date"983#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
1470msgstr ""984#: ../plugins/system-update//PageComponent.qml:37
1471985#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:114
1472#: ../plugins/time-date//TimePicker.qml:68986msgid "Updates"
1473msgid "Time"987msgstr ""
1474msgstr ""988
1475989#: ../plugins/system-update//PageComponent.qml:94
1476#: ../plugins/time-date//TimePicker.qml:81990msgid "Update System"
1477msgid "Hour"991msgstr ""
1478msgstr ""992
1479993#: ../plugins/system-update//PageComponent.qml:95
1480#: ../plugins/time-date//TimePicker.qml:95994msgid "The phone needs to restart to install the system update."
1481msgid "Minute"995msgstr ""
1482msgstr ""996
1483997#: ../plugins/system-update//PageComponent.qml:95
1484#: ../plugins/time-date//TimePicker.qml:109998msgid "Connect the phone to power before installing the system update."
1485msgid "Second"999msgstr ""
1486msgstr ""1000
14871001#: ../plugins/system-update//PageComponent.qml:98
1488#: ../plugins/time-date//TimePicker.qml:1181002msgid "Install & Restart"
1489msgid "Date"1003msgstr ""
1490msgstr ""1004
14911005#: ../plugins/system-update//PageComponent.qml:108
1492#: ../plugins/time-date//TimePicker.qml:1301006msgid "Not Now"
1493msgid "Day"1007msgstr ""
1494msgstr ""1008
14951009#: ../plugins/system-update//PageComponent.qml:114
1496#: ../plugins/time-date//TimePicker.qml:1441010msgid "Install"
1497msgid "Month"1011msgstr ""
1498msgstr ""1012
14991013#: ../plugins/system-update//PageComponent.qml:135
1500#: ../plugins/time-date//TimePicker.qml:1621014msgid "Software is up to date"
1501msgid "Year"1015msgstr ""
1502msgstr ""1016
15031017#: ../plugins/system-update//PageComponent.qml:201
1504#: ../plugins/time-date//ChooseTimeZone.qml:281018msgid "Restarting…"
1505msgid "Time zone"1019msgstr ""
1506msgstr ""1020
15071021#: ../plugins/system-update//PageComponent.qml:246
1508#: ../plugins/time-date//ChooseTimeZone.qml:461022msgid "Checking for updates…"
1509msgid "Set the time zone:"1023msgstr ""
1510msgstr ""1024
15111025#: ../plugins/system-update//PageComponent.qml:265
1512#: ../plugins/time-date//ChooseTimeZone.qml:1261026#, qt-format
1513msgid "Enter your current location."1027msgid "Install %1 update…"
1514msgstr ""1028msgid_plural "Install %1 updates…"
15151029msgstr[0] ""
1516#: ../plugins/time-date//ChooseTimeZone.qml:1271030msgstr[1] ""
1517msgid "No matching place"1031
1518msgstr ""1032#: ../plugins/system-update//PageComponent.qml:266
15191033#, qt-format
1520#: ../plugins/reset//ResetLauncherHome.qml:401034msgid "Install %1 update"
1521msgid "The Launcher will be returned to its original contents."1035msgid_plural "Install %1 updates"
1522msgstr ""1036msgstr[0] ""
15231037msgstr[1] ""
1524#: ../plugins/reset//ResetLauncherHome.qml:441038
1525#: ../plugins/reset//PageComponent.qml:731039#: ../plugins/system-update//PageComponent.qml:267
1526msgid "Reset Launcher"1040msgid "Pause All"
1527msgstr ""1041msgstr ""
15281042
1529#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching1043#: ../plugins/system-update//PageComponent.qml:398
1530#: ../plugins/reset//PageComponent.qml:321044msgid "Retry"
1531#: ../po/settings.js:2761045msgstr ""
1532msgid "Reset phone"1046
1533msgstr ""1047#: ../plugins/system-update//PageComponent.qml:401
15341048msgid "Install…"
1535#: ../plugins/reset//PageComponent.qml:871049msgstr ""
1536msgid "Reset all system settings…"1050
1537msgstr ""1051#: ../plugins/system-update//PageComponent.qml:403
15381052msgid "Download"
1539#: ../plugins/reset//PageComponent.qml:1011053msgstr ""
1540msgid "Erase & Reset Everything…"1054
1541msgstr ""1055#: ../plugins/system-update//PageComponent.qml:407
15421056msgid "Pause"
1543#: ../plugins/reset//EraseEverything.qml:411057msgstr ""
1544msgid ""1058
1545"All documents, saved games, settings, and other items will be permanently "1059#: ../plugins/system-update//PageComponent.qml:409
1546"deleted from this phone."1060msgid "Resume"
1547msgstr ""1061msgstr ""
15481062
1549#: ../plugins/reset//EraseEverything.qml:441063#: ../plugins/system-update//PageComponent.qml:411
1550msgid "Erase & Reset Everything"1064msgid "Update"
1551msgstr ""1065msgstr ""
15521066
1553#: ../plugins/reset//ResetAllSettings.qml:291067#: ../plugins/system-update//PageComponent.qml:449
1554msgid ""1068msgid "Installing"
1555"The contents and layout of the launcher, and the filters in the home screen "1069msgstr ""
1556"will be returned to their original settings."1070
1557msgstr ""1071#: ../plugins/system-update//PageComponent.qml:451
15581072msgid "Installed"
1559#: ../plugins/reset//ResetAllSettings.qml:311073msgstr ""
1560msgid "Reset all system settings"1074
1075#: ../plugins/system-update//PageComponent.qml:452
1076msgid "Downloading"
1077msgstr ""
1078
1079#: ../plugins/system-update//PageComponent.qml:463
1080#, qt-format
1081msgid "%1 of %2"
1082msgstr ""
1083
1084#: ../plugins/system-update//PageComponent.qml:562
1085msgid "Version: "
1086msgstr ""
1087
1088#: ../plugins/system-update//PageComponent.qml:594
1089msgid "Sign in to Ubuntu One to receive updates for apps."
1090msgstr ""
1091
1092#: ../plugins/system-update//PageComponent.qml:603
1093msgid "Sign In…"
1094msgstr ""
1095
1096#: ../plugins/system-update//PageComponent.qml:647
1097msgid "Installing update…"
1098msgstr ""
1099
1100#: ../plugins/system-update//PageComponent.qml:691
1101msgid "On wi-fi"
1102msgstr ""
1103
1104#: ../plugins/system-update//PageComponent.qml:693
1105msgid "Always"
1106msgstr ""
1107
1108#: ../plugins/system-update//PageComponent.qml:708
1109msgid " bytes"
1110msgstr ""
1111
1112#: ../plugins/system-update//PageComponent.qml:711
1113msgid " KiB"
1114msgstr ""
1115
1116#: ../plugins/system-update//PageComponent.qml:714
1117msgid " MiB"
1118msgstr ""
1119
1120#: ../plugins/system-update//PageComponent.qml:717
1121msgid " GiB"
1122msgstr ""
1123
1124#: ../plugins/background//Preview.qml:70
1125msgid "Preview"
1126msgstr ""
1127
1128#: ../plugins/background//Preview.qml:102
1129msgid "Remove image"
1130msgstr ""
1131
1132#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
1133#: ../plugins/background//MainPage.qml:35
1134#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:146
1135msgid "Background"
1136msgstr ""
1137
1138#: ../plugins/background//MainPage.qml:99
1139msgid "Ubuntu Art"
1140msgstr ""
1141
1142#: ../plugins/background//MainPage.qml:115
1143msgid "Custom"
1144msgstr ""
1145
1146#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
1147#: ../plugins/language//PageComponent.qml:34
1148#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:170
1149msgid "Language & Text"
1150msgstr ""
1151
1152#: ../plugins/language//PageComponent.qml:100
1153msgid "Display language…"
1154msgstr ""
1155
1156#: ../plugins/language//PageComponent.qml:117
1157#: ../plugins/language//KeyboardLayouts.qml:26
1158msgid "Keyboard layouts"
1159msgstr ""
1160
1161#: ../plugins/language//PageComponent.qml:132
1162#: ../plugins/language//PageComponent.qml:142
1163#: ../plugins/language//SpellChecking.qml:27
1164#: ../plugins/language//SpellChecking.qml:36
1165msgid "Spell checking"
1166msgstr ""
1167
1168#: ../plugins/language//PageComponent.qml:152
1169msgid "Auto correction"
1170msgstr ""
1171
1172#: ../plugins/language//PageComponent.qml:162
1173msgid "Word suggestions"
1174msgstr ""
1175
1176#: ../plugins/language//PageComponent.qml:175
1177msgid "Auto capitalization"
1178msgstr ""
1179
1180#: ../plugins/language//PageComponent.qml:185
1181msgid "Turns on Shift to capitalize the first letter of each sentence."
1182msgstr ""
1183
1184#: ../plugins/language//PageComponent.qml:192
1185msgid "Auto punctuation"
1186msgstr ""
1187
1188#: ../plugins/language//PageComponent.qml:202
1189msgid ""
1190"Adds a period, and any missing quotes or brackets, when you tap Space twice."
1191msgstr ""
1192
1193#: ../plugins/language//PageComponent.qml:219
1194msgid "Keyboard vibration"
1195msgstr ""
1196
1197#: ../plugins/language//RebootNecessary.qml:38
1198msgid "Restart Now"
1199msgstr ""
1200
1201#: ../plugins/language//SpellChecking.qml:53
1202msgid "Current spelling languages:"
1203msgstr ""
1204
1205#: ../plugins/language//SpellChecking.qml:54
1206msgid "All languages available:"
1207msgstr ""
1208
1209#: ../plugins/language//KeyboardLayouts.qml:39
1210msgid "Current layouts:"
1211msgstr ""
1212
1213#: ../plugins/language//KeyboardLayouts.qml:40
1214msgid "All layouts available:"
1215msgstr ""
1216
1217#: ../plugins/language//DisplayLanguage.qml:36
1218msgid "Display language"
1219msgstr ""
1220
1221#: ../plugins/language//DisplayLanguage.qml:118
1222msgid "Confirm"
1223msgstr ""
1224
1225#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
1226#: ../plugins/notifications//PageComponent.qml:29
1227#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:196
1228msgid "Notifications"
1229msgstr ""
1230
1231#: ../plugins/notifications//PageComponent.qml:40
1232msgid ""
1233"Selected apps can alert you using notification bubbles, sounds, vibrations, "
1234"and the Notification Center."
1235msgstr ""
1236
1237#: ../plugins/brightness//BrightnessSlider.qml:51
1238#: ../plugins/battery//PageComponent.qml:296
1239msgid "Display brightness"
1240msgstr ""
1241
1242#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
1243#: ../plugins/brightness//PageComponent.qml:32
1244#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:220
1245msgid "Brightness"
1246msgstr ""
1247
1248#: ../plugins/brightness//PageComponent.qml:52
1249msgid "Adjust automatically"
1250msgstr ""
1251
1252#: ../plugins/brightness//PageComponent.qml:65
1253msgid "Brightens and dims the display to suit the surroundings."
1254msgstr ""
1255
1256#: ../plugins/wifi//NetworkDetails.qml:38
1257msgid "Network details"
1258msgstr ""
1259
1260#: ../plugins/wifi//NetworkDetails.qml:53
1261msgid "Last connected"
1262msgstr ""
1263
1264#: ../plugins/wifi//NetworkDetails.qml:64
1265#: ../plugins/wifi//OtherNetwork.qml:222
1266msgid "Password"
1267msgstr ""
1268
1269#: ../plugins/wifi//NetworkDetails.qml:77
1270#: ../plugins/wifi//OtherNetwork.qml:256
1271msgid "Show password"
1272msgstr ""
1273
1274#: ../plugins/wifi//NetworkDetails.qml:88
1275msgid "Forget network"
1276msgstr ""
1277
1278#: ../plugins/wifi//RemoveBackground.qml:28
1279msgid "Clear"
1280msgstr ""
1281
1282#: ../plugins/wifi//Common.qml:36
1283msgid "Unknown error"
1284msgstr ""
1285
1286#: ../plugins/wifi//Common.qml:38
1287msgid "No reason given"
1288msgstr ""
1289
1290#: ../plugins/wifi//Common.qml:40
1291msgid "Device is now managed"
1292msgstr ""
1293
1294#: ../plugins/wifi//Common.qml:42
1295msgid "Device is now unmanaged"
1296msgstr ""
1297
1298#: ../plugins/wifi//Common.qml:44
1299msgid "The device could not be readied for configuration"
1300msgstr ""
1301
1302#: ../plugins/wifi//Common.qml:46
1303msgid ""
1304"IP configuration could not be reserved (no available address, timeout, etc.)"
1305msgstr ""
1306
1307#: ../plugins/wifi//Common.qml:48
1308msgid "The IP configuration is no longer valid"
1309msgstr ""
1310
1311#: ../plugins/wifi//Common.qml:50
1312msgid "Your authentication details were incorrect"
1313msgstr ""
1314
1315#: ../plugins/wifi//Common.qml:52
1316msgid "802.1X supplicant disconnected"
1317msgstr ""
1318
1319#: ../plugins/wifi//Common.qml:54
1320msgid "802.1X supplicant configuration failed"
1321msgstr ""
1322
1323#: ../plugins/wifi//Common.qml:56
1324msgid "802.1X supplicant failed"
1325msgstr ""
1326
1327#: ../plugins/wifi//Common.qml:58
1328msgid "802.1X supplicant took too long to authenticate"
1329msgstr ""
1330
1331#: ../plugins/wifi//Common.qml:60
1332msgid "DHCP client failed to start"
1333msgstr ""
1334
1335#: ../plugins/wifi//Common.qml:62
1336msgid "DHCP client error"
1337msgstr ""
1338
1339#: ../plugins/wifi//Common.qml:64
1340msgid "DHCP client failed"
1341msgstr ""
1342
1343#: ../plugins/wifi//Common.qml:66
1344msgid "Shared connection service failed to start"
1345msgstr ""
1346
1347#: ../plugins/wifi//Common.qml:68
1348msgid "Shared connection service failed"
1349msgstr ""
1350
1351#: ../plugins/wifi//Common.qml:70
1352msgid "Necessary firmware for the device may be missing"
1353msgstr ""
1354
1355#: ../plugins/wifi//Common.qml:72
1356msgid "The device was removed"
1357msgstr ""
1358
1359#: ../plugins/wifi//Common.qml:74
1360msgid "NetworkManager went to sleep"
1361msgstr ""
1362
1363#: ../plugins/wifi//Common.qml:76
1364msgid "The device's active connection disappeared"
1365msgstr ""
1366
1367#: ../plugins/wifi//Common.qml:78
1368msgid "Device disconnected by user or client"
1369msgstr ""
1370
1371#: ../plugins/wifi//Common.qml:80
1372msgid "The device's existing connection was assumed"
1373msgstr ""
1374
1375#: ../plugins/wifi//Common.qml:82
1376msgid "The supplicant is now available"
1377msgstr ""
1378
1379#: ../plugins/wifi//Common.qml:84
1380msgid "The modem could not be found"
1381msgstr ""
1382
1383#: ../plugins/wifi//Common.qml:86
1384msgid "The Bluetooth connection failed or timed out"
1385msgstr ""
1386
1387#: ../plugins/wifi//Common.qml:88
1388msgid "A dependency of the connection failed"
1389msgstr ""
1390
1391#: ../plugins/wifi//Common.qml:90
1392msgid "ModemManager is unavailable"
1393msgstr ""
1394
1395#: ../plugins/wifi//Common.qml:92
1396msgid "The Wi-Fi network could not be found"
1397msgstr ""
1398
1399#: ../plugins/wifi//Common.qml:94
1400msgid "A secondary connection of the base connection failed"
1401msgstr ""
1402
1403#: ../plugins/wifi//PreviousNetworks.qml:27
1404#: ../plugins/wifi//PageComponent.qml:132
1405msgid "Previous networks"
1406msgstr ""
1407
1408#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
1409#: ../plugins/wifi//PageComponent.qml:28
1410#: ../plugins/battery//PageComponent.qml:333
1411#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:232
1412msgid "Wi-Fi"
1413msgstr ""
1414
1415#: ../plugins/wifi//PageComponent.qml:139
1416msgid "Connect to hidden network…"
1417msgstr ""
1418
1419#: ../plugins/wifi//OtherNetwork.qml:96
1420msgid "Connect to Hidden Network"
1421msgstr ""
1422
1423#: ../plugins/wifi//OtherNetwork.qml:187
1424msgid "Network name"
1425msgstr ""
1426
1427#: ../plugins/wifi//OtherNetwork.qml:215
1428msgid "WPA & WPA2 Personal"
1429msgstr ""
1430
1431#: ../plugins/wifi//OtherNetwork.qml:216
1432msgid "WEP"
1433msgstr ""
1434
1435#: ../plugins/wifi//NetworkDetailsBrief.qml:58
1436msgid "IP address"
1437msgstr ""
1438
1439#: ../plugins/about//Version.qml:36
1440msgid "OS Build Details"
1441msgstr ""
1442
1443#: ../plugins/about//Version.qml:61
1444msgid "OS build number"
1445msgstr ""
1446
1447#: ../plugins/about//Version.qml:67
1448msgid "Ubuntu Image part"
1449msgstr ""
1450
1451#: ../plugins/about//Version.qml:75
1452msgid "Ubuntu build description"
1453msgstr ""
1454
1455#: ../plugins/about//Version.qml:81
1456msgid "Device Image part"
1457msgstr ""
1458
1459#: ../plugins/about//Version.qml:88
1460msgid "Device build description"
1461msgstr ""
1462
1463#: ../plugins/about//Version.qml:95
1464msgid "Customization Image part"
1465msgstr ""
1466
1467#: ../plugins/about//PhoneNumber.qml:36
1468msgid "Phone number"
1469msgstr ""
1470
1471#: ../plugins/about//Storage.qml:33 ../plugins/about//PageComponent.qml:143
1472msgid "Storage"
1473msgstr ""
1474
1475#: ../plugins/about//Storage.qml:85
1476msgid "Used by Ubuntu"
1477msgstr ""
1478
1479#: ../plugins/about//Storage.qml:86
1480msgid "Videos"
1481msgstr ""
1482
1483#: ../plugins/about//Storage.qml:87
1484msgid "Audio"
1485msgstr ""
1486
1487#: ../plugins/about//Storage.qml:88
1488msgid "Pictures"
1489msgstr ""
1490
1491#: ../plugins/about//Storage.qml:89
1492msgid "Other files"
1493msgstr ""
1494
1495#: ../plugins/about//Storage.qml:90
1496msgid "Used by apps"
1497msgstr ""
1498
1499#: ../plugins/about//Storage.qml:140
1500msgid "Total storage"
1501msgstr ""
1502
1503#: ../plugins/about//Storage.qml:152
1504msgid "Free space"
1505msgstr ""
1506
1507#: ../plugins/about//Storage.qml:172
1508msgid "By name"
1509msgstr ""
1510
1511#: ../plugins/about//Storage.qml:172
1512msgid "By size"
1513msgstr ""
1514
1515#: ../plugins/about//Storage.qml:203
1516#: ../plugins/cellular//PageChooseCarriers.qml:49
1517#: ../plugins/cellular//PageChooseCarriers.qml:65
1518#: ../plugins/battery//PageComponent.qml:131
1519#: ../plugins/battery//PageComponent.qml:287
1520#: ../plugins/cellular//Components//SingleSim.qml:62
1521#: ../plugins/cellular//Components//NoSim.qml:48
1522msgid "N/A"
1523msgstr ""
1524
1525#: ../plugins/about//License.qml:30
1526msgid "Sorry, this license could not be displayed."
1527msgstr ""
1528
1529#: ../plugins/about//PhoneNumbers.qml:31
1530msgid "Phone number:"
1531msgstr ""
1532
1533#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
1534#: ../plugins/about//PageComponent.qml:34
1535#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:252
1536msgid "About this phone"
1537msgstr ""
1538
1539#: ../plugins/about//PageComponent.qml:109
1540msgid "Serial"
1541msgstr ""
1542
1543#: ../plugins/about//PageComponent.qml:124
1544msgid "Wi-Fi address"
1545msgstr ""
1546
1547#: ../plugins/about//PageComponent.qml:132
1548msgid "Bluetooth address"
1549msgstr ""
1550
1551#: ../plugins/about//PageComponent.qml:144
1552#, qt-format
1553msgid "%1 free"
1554msgstr ""
1555
1556#: ../plugins/about//PageComponent.qml:151
1557msgid "Software:"
1558msgstr ""
1559
1560#: ../plugins/about//PageComponent.qml:156
1561msgid "OS"
1562msgstr ""
1563
1564#: ../plugins/about//PageComponent.qml:165
1565msgid "Last updated"
1566msgstr ""
1567
1568#: ../plugins/about//PageComponent.qml:173
1569msgid "Check for updates"
1570msgstr ""
1571
1572#: ../plugins/about//PageComponent.qml:182
1573msgid "Legal:"
1574msgstr ""
1575
1576#: ../plugins/about//PageComponent.qml:187 ../plugins/about//Software.qml:11
1577msgid "Software licenses"
1578msgstr ""
1579
1580#: ../plugins/about//PageComponent.qml:195
1581msgid "Regulatory info"
1582msgstr ""
1583
1584#: ../plugins/about//PageComponent.qml:203
1585msgid "Developer mode"
1586msgstr ""
1587
1588#: ../plugins/about//DevMode.qml:35 ../plugins/about//DevMode.qml:90
1589msgid "Developer Mode"
1590msgstr ""
1591
1592#: ../plugins/about//DevMode.qml:84
1593msgid ""
1594"In Developer Mode, anyone can access, change or delete anything on this "
1595"phone by connecting it to another device."
1596msgstr ""
1597
1598#: ../plugins/about//DevMode.qml:110
1599msgid "You need a passcode or passphrase set to use Developer Mode."
1561msgstr ""1600msgstr ""
15621601
1563#: ../plugins/cellular//HotspotSetup.qml:291602#: ../plugins/cellular//HotspotSetup.qml:29
@@ -1576,27 +1615,20 @@
1576msgid "Show key"1615msgid "Show key"
1577msgstr ""1616msgstr ""
15781617
1618#: ../plugins/cellular//PageChooseCarriers.qml:28
1619#: ../plugins/cellular//Components//MultiSim.qml:68
1620msgid "Carriers"
1621msgstr ""
1622
1579#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching1623#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
1580#: ../plugins/cellular//PageComponent.qml:321624#: ../plugins/cellular//PageComponent.qml:32
1581#: ../po/settings.js:2881625#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:288
1582msgid "Cellular"1626msgid "Cellular"
1583msgstr ""1627msgstr ""
15841628
1585#: ../plugins/cellular//PageChooseCarrier.qml:102
1586msgid "Choose carrier:"
1587msgstr ""
1588
1589#: ../plugins/cellular//PageChooseCarrier.qml:130
1590msgid "Refresh"
1591msgstr ""
1592
1593#: ../plugins/cellular//PageChooseCarrier.qml:151
1594msgid "Searching"
1595msgstr ""
1596
1597#: ../plugins/cellular//Hotspot.qml:291629#: ../plugins/cellular//Hotspot.qml:29
1630#: ../plugins/cellular//Components//MultiSim.qml:48
1598#: ../plugins/cellular//Components//SingleSim.qml:431631#: ../plugins/cellular//Components//SingleSim.qml:43
1599#: ../plugins/cellular//Components//MultiSim.qml:48
1600msgid "Wi-Fi hotspot"1632msgid "Wi-Fi hotspot"
1601msgstr ""1633msgstr ""
16021634
@@ -1620,14 +1652,39 @@
1620msgid "Set up hotspot"1652msgid "Set up hotspot"
1621msgstr ""1653msgstr ""
16221654
1623#: ../plugins/cellular//PageChooseCarriers.qml:281655#: ../plugins/cellular//PageChooseCarrier.qml:102
1624#: ../plugins/cellular//Components//MultiSim.qml:681656msgid "Choose carrier:"
1625msgid "Carriers"1657msgstr ""
1658
1659#: ../plugins/cellular//PageChooseCarrier.qml:130
1660msgid "Refresh"
1661msgstr ""
1662
1663#: ../plugins/cellular//PageChooseCarrier.qml:151
1664msgid "Searching"
1665msgstr ""
1666
1667#: ../plugins/battery//SleepValues.qml:77
1668msgid "Lock the phone when it's not in use:"
1669msgstr ""
1670
1671#: ../plugins/battery//SleepValues.qml:77
1672msgid "Put the phone to sleep when it is not in use:"
1673msgstr ""
1674
1675#: ../plugins/battery//SleepValues.qml:117
1676msgid ""
1677"Shorter times are more secure. Phone won't lock during calls or video "
1678"playback."
1679msgstr ""
1680
1681#: ../plugins/battery//SleepValues.qml:117
1682msgid "Phone won’t sleep during calls or video playback."
1626msgstr ""1683msgstr ""
16271684
1628#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching1685#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
1629#: ../plugins/battery//PageComponent.qml:341686#: ../plugins/battery//PageComponent.qml:34
1630#: ../po/settings.js:3161687#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:316
1631msgid "Battery"1688msgid "Battery"
1632msgstr ""1689msgstr ""
16331690
@@ -1699,11 +1756,6 @@
1699msgid "Ways to reduce battery use:"1756msgid "Ways to reduce battery use:"
1700msgstr ""1757msgstr ""
17011758
1702#: ../plugins/battery//PageComponent.qml:296
1703#: ../plugins/brightness//BrightnessSlider.qml:51
1704msgid "Display brightness"
1705msgstr ""
1706
1707#: ../plugins/battery//PageComponent.qml:3941759#: ../plugins/battery//PageComponent.qml:394
1708msgid "GPS"1760msgid "GPS"
1709msgstr ""1761msgstr ""
@@ -1712,57 +1764,6 @@
1712msgid "Accurate location detection requires GPS and/or Wi-Fi."1764msgid "Accurate location detection requires GPS and/or Wi-Fi."
1713msgstr ""1765msgstr ""
17141766
1715#: ../plugins/battery//SleepValues.qml:77
1716msgid "Lock the phone when it's not in use:"
1717msgstr ""
1718
1719#: ../plugins/battery//SleepValues.qml:77
1720msgid "Put the phone to sleep when it is not in use:"
1721msgstr ""
1722
1723#: ../plugins/battery//SleepValues.qml:117
1724msgid ""
1725"Shorter times are more secure. Phone won't lock during calls or video "
1726"playback."
1727msgstr ""
1728
1729#: ../plugins/battery//SleepValues.qml:117
1730msgid "Phone won’t sleep during calls or video playback."
1731msgstr ""
1732
1733#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
1734#: ../plugins/brightness//PageComponent.qml:32
1735#: ../po/settings.js:332
1736msgid "Brightness"
1737msgstr ""
1738
1739#: ../plugins/brightness//PageComponent.qml:52
1740msgid "Adjust automatically"
1741msgstr ""
1742
1743#: ../plugins/brightness//PageComponent.qml:65
1744msgid "Brightens and dims the display to suit the surroundings."
1745msgstr ""
1746
1747#: ../plugins/background//Components//AddRemove.qml:52
1748msgid "No images selected"
1749msgstr ""
1750
1751#: ../plugins/background//Components//AddRemove.qml:65
1752#, qt-format
1753msgid "Remove %1 image"
1754msgid_plural "Remove %1 images"
1755msgstr[0] ""
1756msgstr[1] ""
1757
1758#: ../plugins/background//Components//AddRemove.qml:80
1759msgid "Add an image…"
1760msgstr ""
1761
1762#: ../plugins/background//Components//AddRemove.qml:91
1763msgid "Remove images…"
1764msgstr ""
1765
1766#: ../plugins/security-privacy//diagnostics//PageComponent.qml:511767#: ../plugins/security-privacy//diagnostics//PageComponent.qml:51
1767msgid "Privacy policy"1768msgid "Privacy policy"
1768msgstr ""1769msgstr ""
@@ -1783,81 +1784,100 @@
1783msgid "Includes info about what an app was doing when it failed."1784msgid "Includes info about what an app was doing when it failed."
1784msgstr ""1785msgstr ""
17851786
1787#: ../plugins/background//Components//AddRemove.qml:52
1788msgid "No images selected"
1789msgstr ""
1790
1791#: ../plugins/background//Components//AddRemove.qml:65
1792#, qt-format
1793msgid "Remove %1 image"
1794msgid_plural "Remove %1 images"
1795msgstr[0] ""
1796msgstr[1] ""
1797
1798#: ../plugins/background//Components//AddRemove.qml:80
1799msgid "Add an image…"
1800msgstr ""
1801
1802#: ../plugins/background//Components//AddRemove.qml:91
1803msgid "Remove images…"
1804msgstr ""
1805
1806#: ../plugins/cellular//Components//SimEditor.qml:77
1807msgid "Edit SIM Name"
1808msgstr ""
1809
1810#: ../plugins/cellular//Components//SimEditor.qml:200
1811msgid "OK"
1812msgstr ""
1813
1814#: ../plugins/cellular//Components//CellularSingleSim.qml:32
1786#: ../plugins/cellular//Components//CellularMultiSim.qml:821815#: ../plugins/cellular//Components//CellularMultiSim.qml:82
1787#: ../plugins/cellular//Components//NoSim.qml:291816#: ../plugins/cellular//Components//NoSim.qml:29
1788#: ../plugins/cellular//Components//CellularSingleSim.qml:32
1789msgid "Cellular data:"1817msgid "Cellular data:"
1790msgstr ""1818msgstr ""
17911819
1820#: ../plugins/cellular//Components//CellularSingleSim.qml:51
1792#: ../plugins/cellular//Components//CellularMultiSim.qml:1381821#: ../plugins/cellular//Components//CellularMultiSim.qml:138
1793#: ../plugins/cellular//Components//NoSim.qml:321822#: ../plugins/cellular//Components//NoSim.qml:32
1794#: ../plugins/cellular//Components//CellularSingleSim.qml:51
1795msgid "2G only (saves battery)"1823msgid "2G only (saves battery)"
1796msgstr ""1824msgstr ""
17971825
1826#: ../plugins/cellular//Components//CellularSingleSim.qml:52
1798#: ../plugins/cellular//Components//CellularMultiSim.qml:1391827#: ../plugins/cellular//Components//CellularMultiSim.qml:139
1799#: ../plugins/cellular//Components//CellularSingleSim.qml:52
1800msgid "2G/3G (faster)"1828msgid "2G/3G (faster)"
1801msgstr ""1829msgstr ""
18021830
1831#: ../plugins/cellular//Components//CellularSingleSim.qml:53
1803#: ../plugins/cellular//Components//CellularMultiSim.qml:1401832#: ../plugins/cellular//Components//CellularMultiSim.qml:140
1804#: ../plugins/cellular//Components//NoSim.qml:321833#: ../plugins/cellular//Components//NoSim.qml:32
1805#: ../plugins/cellular//Components//CellularSingleSim.qml:53
1806msgid "2G/3G/4G (faster)"1834msgid "2G/3G/4G (faster)"
1807msgstr ""1835msgstr ""
18081836
1837#: ../plugins/cellular//Components//CellularSingleSim.qml:72
1809#: ../plugins/cellular//Components//CellularMultiSim.qml:1821838#: ../plugins/cellular//Components//CellularMultiSim.qml:182
1810#: ../plugins/cellular//Components//NoSim.qml:371839#: ../plugins/cellular//Components//NoSim.qml:37
1811#: ../plugins/cellular//Components//CellularSingleSim.qml:72
1812msgid "Data roaming"1840msgid "Data roaming"
1813msgstr ""1841msgstr ""
18141842
1815#: ../plugins/cellular//Components//SimEditor.qml:771843#: ../plugins/cellular//Components//DefaultSim.qml:31
1816msgid "Edit SIM Name"1844msgid "Ask me each time"
1817msgstr ""1845msgstr ""
18181846
1819#: ../plugins/cellular//Components//SimEditor.qml:2001847#: ../plugins/cellular//Components//DefaultSim.qml:36
1820msgid "OK"1848msgid "For outgoing calls, use:"
1821msgstr ""1849msgstr ""
18221850
1823#: ../plugins/cellular//Components//NoSim.qml:471851#: ../plugins/cellular//Components//DefaultSim.qml:50
1824#: ../plugins/cellular//Components//SingleSim.qml:581852msgid ""
1825#: ../plugins/cellular//Components//SingleSim.qml:661853"You can change the SIM for individual calls, or for contacts in the address "
1826msgid "Carrier"1854"book."
1827msgstr ""1855msgstr ""
18281856
1857#: ../plugins/cellular//Components//DefaultSim.qml:57
1858msgid "For messages, use:"
1859msgstr ""
1860
1861#: ../plugins/cellular//Components//MultiSim.qml:42
1829#: ../plugins/cellular//Components//SingleSim.qml:371862#: ../plugins/cellular//Components//SingleSim.qml:37
1830#: ../plugins/cellular//Components//MultiSim.qml:42
1831msgid "Hotspot disabled because Wi-Fi is off."1863msgid "Hotspot disabled because Wi-Fi is off."
1832msgstr ""1864msgstr ""
18331865
1866#: ../plugins/cellular//Components//MultiSim.qml:58
1834#: ../plugins/cellular//Components//SingleSim.qml:521867#: ../plugins/cellular//Components//SingleSim.qml:52
1835#: ../plugins/cellular//Components//MultiSim.qml:58
1836msgid "Data usage statistics"1868msgid "Data usage statistics"
1837msgstr ""1869msgstr ""
18381870
1871#: ../plugins/cellular//Components//SingleSim.qml:58
1872#: ../plugins/cellular//Components//SingleSim.qml:66
1873#: ../plugins/cellular//Components//NoSim.qml:47
1874msgid "Carrier"
1875msgstr ""
1876
1839#: ../plugins/cellular//Components//SingleSim.qml:721877#: ../plugins/cellular//Components//SingleSim.qml:72
1840msgid "APN"1878msgid "APN"
1841msgstr ""1879msgstr ""
18421880
1843#: ../plugins/cellular//Components//DefaultSim.qml:29
1844msgid "Ask me each time"
1845msgstr ""
1846
1847#: ../plugins/cellular//Components//DefaultSim.qml:34
1848msgid "For outgoing calls, use:"
1849msgstr ""
1850
1851#: ../plugins/cellular//Components//DefaultSim.qml:48
1852msgid ""
1853"You can change the SIM for individual calls, or for contacts in the address "
1854"book."
1855msgstr ""
1856
1857#: ../plugins/cellular//Components//DefaultSim.qml:55
1858msgid "For messages, use:"
1859msgstr ""
1860
1861#: ../src/qml/MainWindow.qml:1331881#: ../src/qml/MainWindow.qml:133
1862msgid "Search"1882msgid "Search"
1863msgstr ""1883msgstr ""
@@ -1870,6 +1890,45 @@
1870msgid "System"1890msgid "System"
1871msgstr ""1891msgstr ""
18721892
1893#: ../wizard/qml/Components//StackButton.qml:40
1894#, qt-format
1895msgid "〈 %1"
1896msgstr ""
1897
1898#: ../wizard/qml/Components//StackButton.qml:43
1899#, qt-format
1900msgid "%1 〉"
1901msgstr ""
1902
1903#: ../wizard/qml/Components//Page.qml:89
1904msgid "Back"
1905msgstr ""
1906
1907#: ../wizard/qml/Pages//40-wifi.qml:27
1908msgid "Connect to Wi‑Fi"
1909msgstr ""
1910
1911#: ../wizard/qml/Pages//40-wifi.qml:146
1912msgid "Available networks…"
1913msgstr ""
1914
1915#: ../wizard/qml/Pages//40-wifi.qml:147
1916msgid "No available networks."
1917msgstr ""
1918
1919#: ../wizard/qml/Pages//40-wifi.qml:196
1920#: ../wizard/qml/Pages//60-reporting.qml:50
1921#: ../wizard/qml/Pages//50-location.qml:73
1922#: ../wizard/qml/Pages//10-welcome.qml:85
1923#: ../wizard/qml/Pages//30-passwd-type.qml:112
1924msgid "Continue"
1925msgstr ""
1926
1927#: ../wizard/qml/Pages//40-wifi.qml:196 ../wizard/qml/Pages//20-sim.qml:67
1928#: ../wizard/qml/Pages//31-passwd-set.qml:77
1929msgid "Skip"
1930msgstr ""
1931
1873#: ../wizard/qml/Pages//80-finished.qml:221932#: ../wizard/qml/Pages//80-finished.qml:22
1874msgid "All done"1933msgid "All done"
1875msgstr ""1934msgstr ""
@@ -1878,88 +1937,64 @@
1878msgid "Nice work!"1937msgid "Nice work!"
1879msgstr ""1938msgstr ""
18801939
1881#: ../wizard/qml/Pages//80-finished.qml:451940#: ../wizard/qml/Pages//80-finished.qml:44
1882msgid "Your phone is now ready to use."1941msgid "Your phone is now ready to use."
1883msgstr ""1942msgstr ""
18841943
1885#: ../wizard/qml/Pages//80-finished.qml:521944#: ../wizard/qml/Pages//80-finished.qml:51
1886msgid "Finish"1945msgid "Finish"
1887msgstr ""1946msgstr ""
18881947
1889#: ../wizard/qml/Pages//terms.qml:251948#: ../wizard/qml/Pages//passwd-confirm.qml:51
1890msgid "Terms & Conditions"1949msgid "Sorry, incorrect passphrase."
1891msgstr ""1950msgstr ""
18921951
1893#: ../wizard/qml/Pages//15-passwd.qml:381952#: ../wizard/qml/Pages//passwd-confirm.qml:51
1894msgid "Set lock security"1953#: ../wizard/qml/Pages//passwd-confirm.qml:52
1895msgstr ""1954msgid "Please try again."
18961955msgstr ""
1897#: ../wizard/qml/Pages//15-passwd.qml:1041956
1898msgid "Swipe"1957#: ../wizard/qml/Pages//passwd-confirm.qml:52
1899msgstr ""1958msgid "Sorry, incorrect passcode."
19001959msgstr ""
1901#: ../wizard/qml/Pages//15-passwd.qml:1541960
1902msgid "Those PIN codes don't match."1961#: ../wizard/qml/Pages//60-reporting.qml:22
1903msgstr ""1962msgid "Bug reporting"
19041963msgstr ""
1905#: ../wizard/qml/Pages//15-passwd.qml:1561964
1906msgid "Those passphrases don't match."1965#: ../wizard/qml/Pages//60-reporting.qml:34
1907msgstr ""1966msgid ""
19081967"Your phone is set up to automatically report errors to Canonical and its "
1909#: ../wizard/qml/Pages//15-passwd.qml:1641968"partners, the makers of the operating system."
1910msgid "PIN code must be at least four digits long."1969msgstr ""
1911msgstr ""1970
19121971#: ../wizard/qml/Pages//60-reporting.qml:42
1913#: ../wizard/qml/Pages//15-passwd.qml:1661972msgid "This can be disabled here:"
1914msgid "Passphrase must be at least four characters long."1973msgstr ""
1915msgstr ""1974
19161975#: ../wizard/qml/Pages//60-reporting.qml:43
1917#: ../wizard/qml/Pages//15-passwd.qml:1781976msgid "System Settings &gt; Security &amp; Privacy"
1918#: ../wizard/qml/Pages//30-location.qml:801977msgstr ""
1919#: ../wizard/qml/Pages//40-reporting.qml:501978
1920#: ../wizard/qml/Pages//10-welcome.qml:85 ../wizard/qml/Pages//20-wifi.qml:1951979#: ../wizard/qml/Pages//50-location.qml:53
1921msgid "Continue"1980msgid "Use your mobile network and Wi-Fi to determine where you are"
1922msgstr ""
1923
1924#: ../wizard/qml/Pages//30-location.qml:60
1925msgid "Use your mobile network and Wi-Fi to work out where you are"
1926msgstr ""1981msgstr ""
19271982
1928#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it1983#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
1929#: ../wizard/qml/Pages//30-location.qml:701984#: ../wizard/qml/Pages//50-location.qml:63
1930msgid ""1985msgid ""
1931"I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</"1986"I have read and agreed to the HERE <a href='terms.qml'>Terms and Conditions</"
1932"a>"1987"a>"
1933msgstr ""1988msgstr ""
19341989
1935#: ../wizard/qml/Pages//40-reporting.qml:221990#: ../wizard/qml/Pages//20-sim.qml:23
1936msgid "Bug reporting"1991msgid "Add a SIM card and restart your device"
1937msgstr ""1992msgstr ""
19381993
1939#: ../wizard/qml/Pages//40-reporting.qml:351994#: ../wizard/qml/Pages//20-sim.qml:53
1940msgid "Your phone is set up to automatically report errors to Canonical."
1941msgstr ""
1942
1943#: ../wizard/qml/Pages//40-reporting.qml:43
1944msgid "This can be disabled in System Settings."
1945msgstr ""
1946
1947#: ../wizard/qml/Pages//no-sim.qml:22
1948msgid "Add a SIM card"
1949msgstr ""
1950
1951#: ../wizard/qml/Pages//no-sim.qml:33
1952msgid "Please insert a SIM card before you continue."
1953msgstr ""
1954
1955#: ../wizard/qml/Pages//no-sim.qml:35
1956msgid "Without it, you won’t be able to make calls or use text messaging."1995msgid "Without it, you won’t be able to make calls or use text messaging."
1957msgstr ""1996msgstr ""
19581997
1959#: ../wizard/qml/Pages//no-sim.qml:50 ../wizard/qml/Pages//20-wifi.qml:195
1960msgid "Skip"
1961msgstr ""
1962
1963#: ../wizard/qml/Pages//10-welcome.qml:251998#: ../wizard/qml/Pages//10-welcome.qml:25
1964msgid "Hi!"1999msgid "Hi!"
1965msgstr ""2000msgstr ""
@@ -1972,756 +2007,758 @@
1972msgid "Let’s get started."2007msgid "Let’s get started."
1973msgstr ""2008msgstr ""
19742009
1975#: ../wizard/qml/Pages//20-wifi.qml:272010#: ../wizard/qml/Pages//here-terms.qml:25
1976msgid "Connect to Wi‑Fi"2011msgid "Terms & Conditions"
1977msgstr ""2012msgstr ""
19782013
1979#: ../wizard/qml/Pages//20-wifi.qml:1462014#: ../wizard/qml/Pages//31-passwd-set.qml:48
1980msgid "Available networks"2015msgid "Enter passphrase"
1981msgstr ""2016msgstr ""
19822017
1983#: ../wizard/qml/Components//Page.qml:832018#: ../wizard/qml/Pages//31-passwd-set.qml:49
1984msgid "Back"2019msgid "Choose your passcode"
1985msgstr ""2020msgstr ""
19862021
1987#: ../wizard/qml/Components//StackButton.qml:512022#: ../wizard/qml/Pages//31-passwd-set.qml:56
1988#, qt-format2023msgid "Passphrase must be 4 characters long"
1989msgid "〈 %1"2024msgstr ""
1990msgstr ""2025
19912026#: ../wizard/qml/Pages//30-passwd-type.qml:72
1992#: ../wizard/qml/Components//StackButton.qml:542027msgid "Please select how you’d like to unlock your phone."
1993#, qt-format2028msgstr ""
1994msgid "%1 〉"2029
1995msgstr ""2030#: ../wizard/qml/Pages//30-passwd-type.qml:92
19962031msgid "Swipe"
1997#. TRANSLATORS: This is a keyword or name for the update-notification plugin which is used while searching2032msgstr ""
1998#: ../po/settings.js:22033
1999msgid "Updates available"2034#: ../wizard/qml/Pages//30-passwd-type.qml:93
2000msgstr ""2035msgid "No security"
20012036msgstr ""
2002#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2037
2003#: ../po/settings.js:62038#: ../wizard/qml/Pages//30-passwd-type.qml:96
2039msgid "4 numbers"
2040msgstr ""
2041
2042#: ../wizard/qml/Pages//30-passwd-type.qml:99
2043msgid "Numbers and letters"
2044msgstr ""
2045
2046#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2047#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:2
2048msgid "Accessibility"
2049msgstr ""
2050
2051#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2052#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:4
2053msgid "accessibility"
2054msgstr ""
2055
2056#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2057#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:6
2058msgid "a11y"
2059msgstr ""
2060
2061#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2062#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:10
2063msgid "reset"
2064msgstr ""
2065
2066#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2067#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:12
2068msgid "erase"
2069msgstr ""
2070
2071#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2072#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:14
2073msgid "factory"
2074msgstr ""
2075
2076#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2077#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:16
2078msgid "clear"
2079msgstr ""
2080
2081#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2082#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:18
2083msgid "restore"
2084msgstr ""
2085
2086#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2087#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:22
2088msgid "time"
2089msgstr ""
2090
2091#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2092#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:24
2093msgid "date"
2094msgstr ""
2095
2096#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2097#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:26
2098msgid "timezone"
2099msgstr ""
2100
2101#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2102#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2103#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2104#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2105#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:28
2106#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:124
2107#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:178
2108#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:228
2109msgid "automatic"
2110msgstr ""
2111
2112#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2113#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:32
2114msgid "bluetooth"
2115msgstr ""
2116
2117#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2118#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:34
2119msgid "headset"
2120msgstr ""
2121
2122#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2123#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:36
2124msgid "pair"
2125msgstr ""
2126
2127#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2128#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2129#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:38
2130#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:256
2131msgid "device"
2132msgstr ""
2133
2134#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2135#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:40
2136msgid "discover"
2137msgstr ""
2138
2139#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2140#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:42
2141msgid "car"
2142msgstr ""
2143
2144#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2145#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:44
2146msgid "handsfree"
2147msgstr ""
2148
2149#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2150#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2151#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:46
2152#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:236
2153msgid "wireless"
2154msgstr ""
2155
2156#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2157#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2158#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:48
2159#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:242
2160msgid "connect"
2161msgstr ""
2162
2163#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2164#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2165#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:50
2166#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:244
2167msgid "disconnect"
2168msgstr ""
2169
2170#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2171#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:52
2172msgid "stereo"
2173msgstr ""
2174
2175#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2176#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2177#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:56
2178#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:260
2179msgid "phone"
2180msgstr ""
2181
2182#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2183#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:58
2184msgid "services"
2185msgstr ""
2186
2187#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2188#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:60
2189msgid "forwarding"
2190msgstr ""
2191
2192#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2193#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:62
2194msgid "waiting"
2195msgstr ""
2196
2197#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2198#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:64
2199msgid "call"
2200msgstr ""
2201
2202#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2203#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2204#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:66
2205#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:82
2206msgid "dialpad"
2207msgstr ""
2208
2209#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2210#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:68
2211msgid "shortcuts"
2212msgstr ""
2213
2214#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2215#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:70
2216msgid "numbers"
2217msgstr ""
2218
2219#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2220#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:74
2221msgid "sound"
2222msgstr ""
2223
2224#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2225#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:76
2226msgid "silent"
2227msgstr ""
2228
2229#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2230#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:78
2231msgid "ringtone"
2232msgstr ""
2233
2234#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2235#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:80
2236msgid "vibrate"
2237msgstr ""
2238
2239#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2240#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:84
2241msgid "message"
2242msgstr ""
2243
2244#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2245#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2246#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:86
2247#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:174
2248msgid "keyboard"
2249msgstr ""
2250
2251#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2252#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:88
2253msgid "volume"
2254msgstr ""
2255
2256#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2257#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:92
2258msgid "security"
2259msgstr ""
2260
2261#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2262#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:94
2263msgid "privacy"
2264msgstr ""
2265
2266#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2267#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2268#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2269#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:96
2270#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:140
2271#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:326
2272msgid "lock"
2273msgstr ""
2274
2275#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2276#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2277#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:98
2278#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:314
2279msgid "sim"
2280msgstr ""
2281
2282#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2283#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:100
2284msgid "pin"
2285msgstr ""
2286
2287#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2288#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:102
2289msgid "code"
2290msgstr ""
2291
2292#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2293#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:104
2294msgid "password"
2295msgstr ""
2296
2297#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2298#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:106
2299msgid "passphrase"
2300msgstr ""
2301
2302#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2303#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:108
2304msgid "swipe"
2305msgstr ""
2306
2307#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2308#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:110
2309msgid "allow"
2310msgstr ""
2311
2312#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2313#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:112
2314msgid "access"
2315msgstr ""
2316
2317#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2318#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:116
2004msgid "system"2319msgid "system"
2005msgstr ""2320msgstr ""
20062321
2007#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2322#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2008#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2323#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2009#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2324#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2010#: ../po/settings.js:82325#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:118
2011#: ../po/settings.js:1842326#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:198
2012#: ../po/settings.js:2302327#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:276
2013msgid "software"2328msgid "software"
2014msgstr ""2329msgstr ""
20152330
2016#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2331#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2017#: ../po/settings.js:102332#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:120
2018msgid "update"2333msgid "update"
2019msgstr ""2334msgstr ""
20202335
2021#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2336#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2022#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching2337#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2023#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2338#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2024#: ../po/settings.js:122339#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:122
2025#: ../po/settings.js:442340#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:144
2026#: ../po/settings.js:1882341#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:202
2027msgid "apps"2342msgid "apps"
2028msgstr ""2343msgstr ""
20292344
2030#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2345#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2031#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2346#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:126
2032#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2033#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2034#: ../po/settings.js:14
2035#: ../po/settings.js:88
2036#: ../po/settings.js:274
2037#: ../po/settings.js:340
2038msgid "automatic"
2039msgstr ""
2040
2041#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2042#: ../po/settings.js:16
2043msgid "download"2347msgid "download"
2044msgstr ""2348msgstr ""
20452349
2046#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2350#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2047#: ../po/settings.js:182351#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:128
2048msgid "upgrade"2352msgid "upgrade"
2049msgstr ""2353msgstr ""
20502354
2051#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching2355#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
2052#: ../po/settings.js:202356#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:130
2053msgid "click"2357msgid "click"
2054msgstr ""2358msgstr ""
20552359
2056#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching2360#. TRANSLATORS: This is a keyword or name for the update-notification plugin which is used while searching
2057#: ../po/settings.js:222361#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:132
2058msgid "Flight Mode"2362msgid "Updates available"
2059msgstr ""
2060
2061#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2062#: ../po/settings.js:24
2063msgid "flight"
2064msgstr ""
2065
2066#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2067#: ../po/settings.js:26
2068msgid "plane"
2069msgstr ""
2070
2071#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2072#: ../po/settings.js:28
2073msgid "offline"
2074msgstr ""
2075
2076#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2077#: ../po/settings.js:30
2078msgid "airplane"
2079msgstr ""
2080
2081#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2082#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2083#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2084#: ../po/settings.js:32
2085#: ../po/settings.js:164
2086#: ../po/settings.js:292
2087msgid "network"
2088msgstr ""2363msgstr ""
20892364
2090#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching2365#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2091#: ../po/settings.js:342366#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:134
2092msgid "Orientation Lock"2367msgid "Orientation Lock"
2093msgstr ""2368msgstr ""
20942369
2095#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching2370#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2096#: ../po/settings.js:362371#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:136
2097msgid "rotation"2372msgid "rotation"
2098msgstr ""2373msgstr ""
20992374
2100#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching2375#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2101#: ../po/settings.js:382376#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:138
2102msgid "orientation"2377msgid "orientation"
2103msgstr ""2378msgstr ""
21042379
2105#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching2380#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2106#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2107#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2108#: ../po/settings.js:40
2109#: ../po/settings.js:248
2110#: ../po/settings.js:326
2111msgid "lock"
2112msgstr ""
2113
2114#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
2115#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching2381#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2116#: ../po/settings.js:422382#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:142
2117#: ../po/settings.js:3382383#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:226
2118msgid "screen"2384msgid "screen"
2119msgstr ""2385msgstr ""
21202386
2121#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2122#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2123#: ../po/settings.js:48
2124#: ../po/settings.js:214
2125msgid "phone"
2126msgstr ""
2127
2128#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2129#: ../po/settings.js:50
2130msgid "services"
2131msgstr ""
2132
2133#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2134#: ../po/settings.js:52
2135msgid "forwarding"
2136msgstr ""
2137
2138#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2139#: ../po/settings.js:54
2140msgid "waiting"
2141msgstr ""
2142
2143#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2144#: ../po/settings.js:56
2145msgid "call"
2146msgstr ""
2147
2148#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2149#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2150#: ../po/settings.js:58
2151#: ../po/settings.js:154
2152msgid "dialpad"
2153msgstr ""
2154
2155#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2156#: ../po/settings.js:60
2157msgid "shortcuts"
2158msgstr ""
2159
2160#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
2161#: ../po/settings.js:62
2162msgid "numbers"
2163msgstr ""
2164
2165#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2387#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2166#: ../po/settings.js:662388#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:148
2167msgid "appearance"2389msgid "appearance"
2168msgstr ""2390msgstr ""
21692391
2170#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2392#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2171#: ../po/settings.js:682393#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:150
2172msgid "background"2394msgid "background"
2173msgstr ""2395msgstr ""
21742396
2175#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2397#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2176#: ../po/settings.js:702398#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:152
2177msgid "wallpaper"2399msgid "wallpaper"
2178msgstr ""2400msgstr ""
21792401
2180#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2402#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2181#: ../po/settings.js:722403#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:154
2182msgid "art"2404msgid "art"
2183msgstr ""2405msgstr ""
21842406
2185#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2407#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2186#: ../po/settings.js:742408#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:156
2187msgid "photo"2409msgid "photo"
2188msgstr ""2410msgstr ""
21892411
2190#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2412#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2191#: ../po/settings.js:762413#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:158
2192msgid "picture"2414msgid "picture"
2193msgstr ""2415msgstr ""
21942416
2195#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching2417#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
2196#: ../po/settings.js:782418#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:160
2197msgid "image"2419msgid "image"
2198msgstr ""2420msgstr ""
21992421
2422#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2423#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:162
2424msgid "Example"
2425msgstr ""
2426
2427#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2428#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:164
2429msgid "example"
2430msgstr ""
2431
2432#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2433#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:166
2434msgid "test"
2435msgstr ""
2436
2437#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2438#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:168
2439msgid "sample"
2440msgstr ""
2441
2200#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2442#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2201#: ../po/settings.js:822443#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:172
2202msgid "language"2444msgid "language"
2203msgstr ""2445msgstr ""
22042446
2205#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2447#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2206#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching2448#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:176
2207#: ../po/settings.js:84
2208#: ../po/settings.js:158
2209msgid "keyboard"
2210msgstr ""
2211
2212#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2213#: ../po/settings.js:86
2214msgid "spellcheck"2449msgid "spellcheck"
2215msgstr ""2450msgstr ""
22162451
2217#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2452#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2218#: ../po/settings.js:902453#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:180
2219msgid "correct"2454msgid "correct"
2220msgstr ""2455msgstr ""
22212456
2222#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2457#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2223#: ../po/settings.js:922458#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:182
2224msgid "suggestions"2459msgid "suggestions"
2225msgstr ""2460msgstr ""
22262461
2227#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2462#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2228#: ../po/settings.js:942463#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:184
2229msgid "capitalization"2464msgid "capitalization"
2230msgstr ""2465msgstr ""
22312466
2232#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2467#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2233#: ../po/settings.js:962468#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:186
2234msgid "punctuation"2469msgid "punctuation"
2235msgstr ""2470msgstr ""
22362471
2237#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2472#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2238#: ../po/settings.js:982473#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:188
2239msgid "layout"2474msgid "layout"
2240msgstr ""2475msgstr ""
22412476
2242#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2477#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2243#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching2478#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2244#: ../po/settings.js:1002479#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:190
2245#: ../po/settings.js:3362480#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:224
2246msgid "display"2481msgid "display"
2247msgstr ""2482msgstr ""
22482483
2249#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2484#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2250#: ../po/settings.js:1022485#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:192
2251msgid "words"2486msgid "words"
2252msgstr ""2487msgstr ""
22532488
2254#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching2489#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
2255#: ../po/settings.js:1042490#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:194
2256msgid "vibration"2491msgid "vibration"
2257msgstr ""2492msgstr ""
22582493
2259#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2260#: ../po/settings.js:106
2261msgid "Example"
2262msgstr ""
2263
2264#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2265#: ../po/settings.js:108
2266msgid "example"
2267msgstr ""
2268
2269#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2270#: ../po/settings.js:110
2271msgid "test"
2272msgstr ""
2273
2274#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
2275#: ../po/settings.js:112
2276msgid "sample"
2277msgstr ""
2278
2279#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2280#: ../po/settings.js:116
2281msgid "bluetooth"
2282msgstr ""
2283
2284#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2285#: ../po/settings.js:118
2286msgid "headset"
2287msgstr ""
2288
2289#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2290#: ../po/settings.js:120
2291msgid "pair"
2292msgstr ""
2293
2294#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2295#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2296#: ../po/settings.js:122
2297#: ../po/settings.js:210
2298msgid "device"
2299msgstr ""
2300
2301#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2302#: ../po/settings.js:124
2303msgid "discover"
2304msgstr ""
2305
2306#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2307#: ../po/settings.js:126
2308msgid "car"
2309msgstr ""
2310
2311#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2312#: ../po/settings.js:128
2313msgid "handsfree"
2314msgstr ""
2315
2316#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2317#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2318#: ../po/settings.js:130
2319#: ../po/settings.js:166
2320msgid "wireless"
2321msgstr ""
2322
2323#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2324#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2325#: ../po/settings.js:132
2326#: ../po/settings.js:172
2327msgid "connect"
2328msgstr ""
2329
2330#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2331#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2332#: ../po/settings.js:134
2333#: ../po/settings.js:174
2334msgid "disconnect"
2335msgstr ""
2336
2337#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
2338#: ../po/settings.js:136
2339msgid "stereo"
2340msgstr ""
2341
2342#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2343#: ../po/settings.js:138
2344msgid "Accessibility"
2345msgstr ""
2346
2347#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2348#: ../po/settings.js:140
2349msgid "accessibility"
2350msgstr ""
2351
2352#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
2353#: ../po/settings.js:142
2354msgid "a11y"
2355msgstr ""
2356
2357#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2358#: ../po/settings.js:146
2359msgid "sound"
2360msgstr ""
2361
2362#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2363#: ../po/settings.js:148
2364msgid "silent"
2365msgstr ""
2366
2367#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2368#: ../po/settings.js:150
2369msgid "ringtone"
2370msgstr ""
2371
2372#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2373#: ../po/settings.js:152
2374msgid "vibrate"
2375msgstr ""
2376
2377#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2378#: ../po/settings.js:156
2379msgid "message"
2380msgstr ""
2381
2382#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
2383#: ../po/settings.js:160
2384msgid "volume"
2385msgstr ""
2386
2387#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2388#: ../po/settings.js:168
2389msgid "wifi"
2390msgstr ""
2391
2392#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2393#: ../po/settings.js:170
2394msgid "wi-fi"
2395msgstr ""
2396
2397#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2398#: ../po/settings.js:176
2399msgid "hidden"
2400msgstr ""
2401
2402#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2403#: ../po/settings.js:178
2404msgid "ip"
2405msgstr ""
2406
2407#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2408#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2409#: ../po/settings.js:180
2410#: ../po/settings.js:222
2411msgid "address"
2412msgstr ""
2413
2414#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2494#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2415#: ../po/settings.js:1862495#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:200
2416msgid "notifications"2496msgid "notifications"
2417msgstr ""2497msgstr ""
24182498
2419#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2499#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2420#: ../po/settings.js:1902500#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:204
2421msgid "authorize"2501msgid "authorize"
2422msgstr ""2502msgstr ""
24232503
2424#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2504#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2425#: ../po/settings.js:1922505#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:206
2426msgid "alerts"2506msgid "alerts"
2427msgstr ""2507msgstr ""
24282508
2429#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2509#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2430#: ../po/settings.js:1942510#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:208
2431msgid "permissions"2511msgid "permissions"
2432msgstr ""2512msgstr ""
24332513
2434#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2514#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2435#: ../po/settings.js:1962515#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:210
2436msgid "badges"2516msgid "badges"
2437msgstr ""2517msgstr ""
24382518
2439#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2519#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2440#: ../po/settings.js:1982520#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:212
2441msgid "facebook"2521msgid "facebook"
2442msgstr ""2522msgstr ""
24432523
2444#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2524#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2445#: ../po/settings.js:2002525#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:214
2446msgid "twitter"2526msgid "twitter"
2447msgstr ""2527msgstr ""
24482528
2449#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2529#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2450#: ../po/settings.js:2022530#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:216
2451msgid "flickr"2531msgid "flickr"
2452msgstr ""2532msgstr ""
24532533
2454#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching2534#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
2455#: ../po/settings.js:2042535#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:218
2456msgid "gmail"2536msgid "gmail"
2457msgstr ""2537msgstr ""
24582538
2459#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2539#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2460#: ../po/settings.js:2082540#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:222
2541msgid "brightness"
2542msgstr ""
2543
2544#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
2545#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:230
2546msgid "adjust"
2547msgstr ""
2548
2549#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2550#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2551#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2552#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:234
2553#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:292
2554#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:342
2555msgid "network"
2556msgstr ""
2557
2558#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2559#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:238
2560msgid "wifi"
2561msgstr ""
2562
2563#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2564#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:240
2565msgid "wi-fi"
2566msgstr ""
2567
2568#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2569#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:246
2570msgid "hidden"
2571msgstr ""
2572
2573#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2574#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:248
2575msgid "ip"
2576msgstr ""
2577
2578#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
2579#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2580#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:250
2581#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:268
2582msgid "address"
2583msgstr ""
2584
2585#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2586#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:254
2461msgid "about"2587msgid "about"
2462msgstr ""2588msgstr ""
24632589
2464#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2590#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2465#: ../po/settings.js:2122591#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:258
2466msgid "info"2592msgid "info"
2467msgstr ""2593msgstr ""
24682594
2469#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2595#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2470#: ../po/settings.js:2162596#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:262
2471msgid "number"2597msgid "number"
2472msgstr ""2598msgstr ""
24732599
2474#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2600#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2475#: ../po/settings.js:2182601#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:264
2476msgid "imei"2602msgid "imei"
2477msgstr ""2603msgstr ""
24782604
2479#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2605#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2480#: ../po/settings.js:2202606#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:266
2481msgid "serial"2607msgid "serial"
2482msgstr ""2608msgstr ""
24832609
2484#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2610#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2485#: ../po/settings.js:2242611#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:270
2486msgid "mac"2612msgid "mac"
2487msgstr ""2613msgstr ""
24882614
2489#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2615#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2490#: ../po/settings.js:2262616#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:272
2491msgid "licenses"2617msgid "licenses"
2492msgstr ""2618msgstr ""
24932619
2494#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2620#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2495#: ../po/settings.js:2282621#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:274
2496msgid "developer"2622msgid "developer"
2497msgstr ""2623msgstr ""
24982624
2499#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2625#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2500#: ../po/settings.js:2322626#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:278
2501msgid "storage"2627msgid "storage"
2502msgstr ""2628msgstr ""
25032629
2504#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2630#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2505#: ../po/settings.js:2342631#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:280
2506msgid "disk"2632msgid "disk"
2507msgstr ""2633msgstr ""
25082634
2509#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2635#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2510#: ../po/settings.js:2362636#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:282
2511msgid "space"2637msgid "space"
2512msgstr ""2638msgstr ""
25132639
2514#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2640#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2515#: ../po/settings.js:2382641#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:284
2516msgid "version"2642msgid "version"
2517msgstr ""2643msgstr ""
25182644
2519#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching2645#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
2520#: ../po/settings.js:2402646#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:286
2521msgid "revision"2647msgid "revision"
2522msgstr ""2648msgstr ""
25232649
2524#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching2650#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2525#: ../po/settings.js:2442651#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:290
2526msgid "security"
2527msgstr ""
2528
2529#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2530#: ../po/settings.js:246
2531msgid "privacy"
2532msgstr ""
2533
2534#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2535#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2536#: ../po/settings.js:250
2537#: ../po/settings.js:314
2538msgid "sim"
2539msgstr ""
2540
2541#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2542#: ../po/settings.js:252
2543msgid "pin"
2544msgstr ""
2545
2546#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2547#: ../po/settings.js:254
2548msgid "code"
2549msgstr ""
2550
2551#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2552#: ../po/settings.js:256
2553msgid "password"
2554msgstr ""
2555
2556#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2557#: ../po/settings.js:258
2558msgid "passphrase"
2559msgstr ""
2560
2561#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2562#: ../po/settings.js:260
2563msgid "swipe"
2564msgstr ""
2565
2566#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2567#: ../po/settings.js:262
2568msgid "allow"
2569msgstr ""
2570
2571#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
2572#: ../po/settings.js:264
2573msgid "access"
2574msgstr ""
2575
2576#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2577#: ../po/settings.js:268
2578msgid "time"
2579msgstr ""
2580
2581#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2582#: ../po/settings.js:270
2583msgid "date"
2584msgstr ""
2585
2586#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
2587#: ../po/settings.js:272
2588msgid "timezone"
2589msgstr ""
2590
2591#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2592#: ../po/settings.js:278
2593msgid "reset"
2594msgstr ""
2595
2596#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2597#: ../po/settings.js:280
2598msgid "erase"
2599msgstr ""
2600
2601#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2602#: ../po/settings.js:282
2603msgid "factory"
2604msgstr ""
2605
2606#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2607#: ../po/settings.js:284
2608msgid "clear"
2609msgstr ""
2610
2611#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
2612#: ../po/settings.js:286
2613msgid "restore"
2614msgstr ""
2615
2616#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2617#: ../po/settings.js:290
2618msgid "cellular"2652msgid "cellular"
2619msgstr ""2653msgstr ""
26202654
2621#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2655#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2622#: ../po/settings.js:2942656#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:294
2623msgid "mobile"2657msgid "mobile"
2624msgstr ""2658msgstr ""
26252659
2626#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2660#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2627#: ../po/settings.js:2962661#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:296
2628msgid "gsm"2662msgid "gsm"
2629msgstr ""2663msgstr ""
26302664
2631#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2665#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2632#: ../po/settings.js:2982666#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:298
2633msgid "data"2667msgid "data"
2634msgstr ""2668msgstr ""
26352669
2636#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2670#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2637#: ../po/settings.js:3002671#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:300
2638msgid "carrier"2672msgid "carrier"
2639msgstr ""2673msgstr ""
26402674
2641#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2675#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2642#: ../po/settings.js:3022676#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:302
2643msgid "4g"2677msgid "4g"
2644msgstr ""2678msgstr ""
26452679
2646#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2680#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2647#: ../po/settings.js:3042681#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:304
2648msgid "3g"2682msgid "3g"
2649msgstr ""2683msgstr ""
26502684
2651#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2685#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2652#: ../po/settings.js:3062686#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:306
2653msgid "2g"2687msgid "2g"
2654msgstr ""2688msgstr ""
26552689
2656#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2690#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2657#: ../po/settings.js:3082691#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:308
2658msgid "lte"2692msgid "lte"
2659msgstr ""2693msgstr ""
26602694
2661#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2695#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2662#: ../po/settings.js:3102696#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:310
2663msgid "apn"2697msgid "apn"
2664msgstr ""2698msgstr ""
26652699
2666#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching2700#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
2667#: ../po/settings.js:3122701#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:312
2668msgid "roam"2702msgid "roam"
2669msgstr ""2703msgstr ""
26702704
2671#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2705#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2672#: ../po/settings.js:3182706#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:318
2673msgid "battery"2707msgid "battery"
2674msgstr ""2708msgstr ""
26752709
2676#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2710#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2677#: ../po/settings.js:3202711#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:320
2678msgid "power"2712msgid "power"
2679msgstr ""2713msgstr ""
26802714
2681#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2715#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2682#: ../po/settings.js:3222716#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:322
2683msgid "charge"2717msgid "charge"
2684msgstr ""2718msgstr ""
26852719
2686#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2720#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2687#: ../po/settings.js:3242721#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:324
2688msgid "idle"2722msgid "idle"
2689msgstr ""2723msgstr ""
26902724
2691#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2725#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2692#: ../po/settings.js:3282726#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:328
2693msgid "disable"2727msgid "disable"
2694msgstr ""2728msgstr ""
26952729
2696#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching2730#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
2697#: ../po/settings.js:3302731#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:330
2698msgid "enable"2732msgid "enable"
2699msgstr ""2733msgstr ""
27002734
2701#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching2735#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2702#: ../po/settings.js:3342736#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:332
2703msgid "brightness"2737msgid "Flight Mode"
2704msgstr ""2738msgstr ""
27052739
2706#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching2740#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2707#: ../po/settings.js:3422741#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:334
2708msgid "adjust"2742msgid "flight"
2709msgstr ""2743msgstr ""
27102744
2711#: ../plugins/system-update//system_update.cpp:942745#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2712msgid "Can't cancel current request (can't contact service)"2746#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:336
2713msgstr ""2747msgid "plane"
27142748msgstr ""
2715#: ../plugins/system-update//system_update.cpp:1002749
2716msgid "Can't pause current request (can't contact service)"2750#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2717msgstr ""2751#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:338
27182752msgid "offline"
2719#: ../plugins/about//click.cpp:1712753msgstr ""
2720msgid "Unknown title"2754
2755#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
2756#: /home/mike/Work/code/ubuntu-system-settings/ui-refresh-take-6/obj-x86_64-linux-gnu/po/settings.js:340
2757msgid "airplane"
2721msgstr ""2758msgstr ""
27222759
2723#: ../plugins/security-privacy//securityprivacy.cpp:3182760#: ../plugins/security-privacy//securityprivacy.cpp:318
2724msgid "Incorrect PIN code. Try again."2761msgid "Incorrect passcode. Try again."
2725msgstr ""2762msgstr ""
27262763
2727#: ../plugins/security-privacy//securityprivacy.cpp:3202764#: ../plugins/security-privacy//securityprivacy.cpp:320
@@ -2740,6 +2777,18 @@
2740msgid "Authentication token manipulation error"2777msgid "Authentication token manipulation error"
2741msgstr ""2778msgstr ""
27422779
2780#: ../plugins/system-update//system_update.cpp:96
2781msgid "Can't cancel current request (can't contact service)"
2782msgstr ""
2783
2784#: ../plugins/system-update//system_update.cpp:102
2785msgid "Can't pause current request (can't contact service)"
2786msgstr ""
2787
2788#: ../plugins/about//click.cpp:171
2789msgid "Unknown title"
2790msgstr ""
2791
2743#: ../push-helper/software_updates_helper.py:1502792#: ../push-helper/software_updates_helper.py:150
2744msgid "There's an updated system image."2793msgid "There's an updated system image."
2745msgstr ""2794msgstr ""
27462795
=== modified file 'wizard/CMakeLists.txt'
--- wizard/CMakeLists.txt 2014-08-18 13:09:48 +0000
+++ wizard/CMakeLists.txt 2014-10-10 17:52:06 +0000
@@ -16,7 +16,7 @@
1616
17add_definitions(-DSHELL_PLUGINDIR="${SHELL_PLUGINDIR}")17add_definitions(-DSHELL_PLUGINDIR="${SHELL_PLUGINDIR}")
1818
19set(WIZARD_ROOT "${CMAKE_INSTALL_PREFIX}/share/ubuntu/settings/wizard")19set(WIZARD_ROOT "${CMAKE_INSTALL_PREFIX}/share")
20add_definitions(-DWIZARD_ROOT="${WIZARD_ROOT}")20add_definitions(-DWIZARD_ROOT="${WIZARD_ROOT}")
2121
22file(GLOB_RECURSE QML_FILES22file(GLOB_RECURSE QML_FILES
@@ -48,4 +48,4 @@
48set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")48set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
49install(FILES 50-com.ubuntu.system-settings.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)49install(FILES 50-com.ubuntu.system-settings.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
5050
51install(DIRECTORY qml DESTINATION ${WIZARD_ROOT})51install(DIRECTORY qml DESTINATION ${WIZARD_ROOT}/ubuntu/settings/wizard)
5252
=== modified file 'wizard/PageList.cpp'
--- wizard/PageList.cpp 2014-04-10 18:20:44 +0000
+++ wizard/PageList.cpp 2014-10-10 17:52:06 +0000
@@ -45,6 +45,11 @@
45 QString disabledSuffix = ".disabled";45 QString disabledSuffix = ".disabled";
46 QSet<QString> disabledPages;46 QSet<QString> disabledPages;
47 QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);47 QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
48
49 QString rootDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT"); // for testing
50 if (!rootDir.isEmpty())
51 dataDirs = QStringList() << rootDir;
52
48 Q_FOREACH(const QString &dataDir, dataDirs) {53 Q_FOREACH(const QString &dataDir, dataDirs) {
49 QDir dir(dataDir + "/ubuntu/settings/wizard/qml/Pages");54 QDir dir(dataDir + "/ubuntu/settings/wizard/qml/Pages");
50 QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);55 QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
5156
=== modified file 'wizard/Utils/system.cpp'
--- wizard/Utils/system.cpp 2014-09-05 20:27:21 +0000
+++ wizard/Utils/system.cpp 2014-10-10 17:52:06 +0000
@@ -31,7 +31,7 @@
31 : QObject(),31 : QObject(),
32 m_accounts(nullptr),32 m_accounts(nullptr),
33 m_hereEnabled(false),33 m_hereEnabled(false),
34 m_hereLicensePath()34 m_hereLicensePath(" ") // use a single space to indicate it is unasssigned
35{35{
36 m_accounts = new QDBusInterface("org.freedesktop.Accounts",36 m_accounts = new QDBusInterface("org.freedesktop.Accounts",
37 "/org/freedesktop/Accounts/User" + QString::number(geteuid()),37 "/org/freedesktop/Accounts/User" + QString::number(geteuid()),
@@ -84,8 +84,12 @@
84 if (!reply.isError()) {84 if (!reply.isError()) {
85 QVariant value = reply.argumentAt<0>();85 QVariant value = reply.argumentAt<0>();
86 m_hereLicensePath = value.toString();86 m_hereLicensePath = value.toString();
87 Q_EMIT hereLicensePathChanged();87 } else {
88 m_hereLicensePath = "";
88 }89 }
90
91 Q_EMIT hereLicensePathChanged();
92
89 watcher->deleteLater();93 watcher->deleteLater();
90}94}
9195
9296
=== modified file 'wizard/main.cpp'
--- wizard/main.cpp 2014-08-29 19:46:45 +0000
+++ wizard/main.cpp 2014-10-10 17:52:06 +0000
@@ -59,16 +59,20 @@
59 if (rootDir.isEmpty())59 if (rootDir.isEmpty())
60 rootDir = WIZARD_ROOT;60 rootDir = WIZARD_ROOT;
6161
62 QString modulesDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES"); // for testing
63 if (modulesDir.isEmpty())
64 modulesDir = PLUGIN_PRIVATE_MODULE_DIR;
65
62 if (!isMirServer) {66 if (!isMirServer) {
63 view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR "/Ubuntu/SystemSettings/Wizard/NonMir");67 view->engine()->addImportPath(modulesDir + "/Ubuntu/SystemSettings/Wizard/NonMir");
64 }68 }
65 view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);69 view->engine()->addImportPath(modulesDir);
66 view->engine()->addImportPath(PLUGIN_QML_DIR);70 view->engine()->addImportPath(PLUGIN_QML_DIR);
67 view->engine()->addImportPath(SHELL_PLUGINDIR);71 view->engine()->addImportPath(SHELL_PLUGINDIR);
6872
69 PageList pageList;73 PageList pageList;
70 view->rootContext()->setContextProperty("pageList", &pageList);74 view->rootContext()->setContextProperty("pageList", &pageList);
71 view->setSource(QUrl(rootDir + "/qml/main.qml"));75 view->setSource(QUrl(rootDir + "/ubuntu/settings/wizard/qml/main.qml"));
72 view->setColor("transparent");76 view->setColor("transparent");
7377
74 QObject::connect(view->engine(), &QQmlEngine::quit, handleQuit);78 QObject::connect(view->engine(), &QQmlEngine::quit, handleQuit);
7579
=== modified file 'wizard/qml/Components/Page.qml'
--- wizard/qml/Components/Page.qml 2014-09-18 12:59:25 +0000
+++ wizard/qml/Components/Page.qml 2014-10-10 17:52:06 +0000
@@ -26,6 +26,12 @@
26 readonly property real leftMargin: units.gu(2)26 readonly property real leftMargin: units.gu(2)
27 readonly property real rightMargin: units.gu(2)27 readonly property real rightMargin: units.gu(2)
2828
29 // If you want to skip a page, mark skipValid false while you figure out
30 // whether to skip, then set it to true once you've determined the value
31 // of the skip property.
32 property bool skipValid: true
33 property bool skip: false
34
29 property bool hasBackButton: true35 property bool hasBackButton: true
30 property bool customBack: false36 property bool customBack: false
31 property alias forwardButtonSourceComponent: forwardButton.sourceComponent37 property alias forwardButtonSourceComponent: forwardButton.sourceComponent
@@ -82,7 +88,7 @@
82 z: 188 z: 1
83 text: i18n.tr("Back")89 text: i18n.tr("Back")
84 visible: pageStack.depth > 1 && hasBackButton90 visible: pageStack.depth > 1 && hasBackButton
85 leftArrow: true91 backArrow: true
8692
87 onClicked: customBack ? backClicked() : pageStack.prev()93 onClicked: customBack ? backClicked() : pageStack.prev()
88 }94 }
8995
=== modified file 'wizard/qml/Components/StackButton.qml'
--- wizard/qml/Components/StackButton.qml 2014-08-27 20:24:23 +0000
+++ wizard/qml/Components/StackButton.qml 2014-10-10 17:52:06 +0000
@@ -21,46 +21,33 @@
21 id: stackButton21 id: stackButton
2222
23 property string text23 property string text
24 property bool leftArrow: false24
25 property bool rightArrow: false25 property bool backArrow: false
2626
27 signal clicked()27 signal clicked()
2828
29 readonly property bool hasArrow: leftArrow || rightArrow29 width: label.width
3030 height: label.height + units.gu(4)
31 width: button.width
32 height: button.height
33
34 Button {
35 id: button
36 anchors.fill: parent
37 visible: !hasArrow
38 text: stackButton.text
39 onClicked: stackButton.clicked()
40 }
4131
42 Label {32 Label {
43 id: label33 id: label
44 anchors.verticalCenter: parent.verticalCenter34 anchors.verticalCenter: parent.verticalCenter
45 anchors.left: parent.left35 anchors.left: parent.left
46 anchors.right: parent.right36 anchors.right: parent.right
47 visible: hasArrow
48 text: {37 text: {
49 if (leftArrow) {38 if (backArrow) {
50 // Translators: This is the arrow for "Back" buttons39 // Translators: This is the arrow for "Back" buttons
51 return i18n.tr("〈 %1".arg(stackButton.text))40 return i18n.tr("〈 %1".arg(stackButton.text))
52 } else if (rightArrow) {41 } else {
53 // Translators: This is the arrow for "Forward" buttons42 // Translators: This is the arrow for "Forward" buttons
54 return i18n.tr("%1 〉".arg(stackButton.text))43 return i18n.tr("%1 〉".arg(stackButton.text))
55 } else {
56 return stackButton.text
57 }44 }
58 }45 }
59 horizontalAlignment: leftArrow ? Text.AlignLeft : Text.AlignRight46 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
47 }
6048
61 MouseArea {49 MouseArea {
62 anchors.fill: parent50 anchors.fill: parent
63 onClicked: stackButton.clicked()51 onClicked: stackButton.clicked()
64 }
65 }52 }
66}53}
6754
=== renamed file 'wizard/qml/Pages/no-sim.qml' => 'wizard/qml/Pages/20-sim.qml'
--- wizard/qml/Pages/no-sim.qml 2014-08-26 21:19:55 +0000
+++ wizard/qml/Pages/20-sim.qml 2014-10-10 17:52:06 +0000
@@ -15,25 +15,42 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import MeeGo.QOfono 0.2
18import Ubuntu.Components 0.119import Ubuntu.Components 0.1
19import "../Components" as LocalComponents20import "../Components" as LocalComponents
2021
21LocalComponents.Page {22LocalComponents.Page {
22 title: i18n.tr("Add a SIM card")23 title: i18n.tr("Add a SIM card and restart your device")
23 forwardButtonSourceComponent: forwardButton24 forwardButtonSourceComponent: forwardButton
24 hasBackButton: false25
26 // No need for skipValid, since OfonoManager does everything synchronously
27 skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
28
29 OfonoManager {
30 id: manager
31 }
32
33 // Ideally we would query the system more cleverly than hardcoding two
34 // modems. But we don't yet have a more clever way. :(
35 OfonoSimManager {
36 id: simManager0
37 modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
38 }
39
40 OfonoSimManager {
41 id: simManager1
42 modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
43 }
2544
26 Column {45 Column {
27 anchors.fill: content46 anchors.fill: content
47 spacing: units.gu(4)
2848
29 Label {49 Label {
30 anchors.left: parent.left50 anchors.left: parent.left
31 anchors.right: parent.right51 anchors.right: parent.right
32 wrapMode: Text.Wrap52 wrapMode: Text.Wrap
33 text: i18n.tr("Please insert a SIM card before you continue.") +53 text: i18n.tr("Without it, you won’t be able to make calls or use text messaging.")
34 "\n\n" +
35 i18n.tr("Without it, you won’t be able to make calls or use text messaging.") +
36 "\n"
37 }54 }
3855
39 Image {56 Image {
@@ -48,7 +65,6 @@
48 id: forwardButton65 id: forwardButton
49 LocalComponents.StackButton {66 LocalComponents.StackButton {
50 text: i18n.tr("Skip")67 text: i18n.tr("Skip")
51 rightArrow: true
52 onClicked: pageStack.next()68 onClicked: pageStack.next()
53 }69 }
54 }70 }
5571
=== renamed file 'wizard/qml/Pages/15-passwd.qml' => 'wizard/qml/Pages/30-passwd-type.qml'
--- wizard/qml/Pages/15-passwd.qml 2014-09-18 12:59:25 +0000
+++ wizard/qml/Pages/30-passwd-type.qml 2014-10-10 17:52:06 +0000
@@ -15,9 +15,8 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import MeeGo.QOfono 0.2
19import Ubuntu.Components 1.118import Ubuntu.Components 1.1
20import Ubuntu.Components.ListItems 0.119import Ubuntu.Components.ListItems 1.0
21import Ubuntu.SystemSettings.SecurityPrivacy 1.020import Ubuntu.SystemSettings.SecurityPrivacy 1.0
22import "../Components" as LocalComponents21import "../Components" as LocalComponents
2322
@@ -35,17 +34,9 @@
3534
36LocalComponents.Page {35LocalComponents.Page {
37 id: passwdPage36 id: passwdPage
38 title: i18n.tr("Set lock security")37 title: i18n.tr("Lock security")
39 forwardButtonSourceComponent: forwardButton38 forwardButtonSourceComponent: forwardButton
4039
41 readonly property int method: indexToMethod(listview.currentIndex)
42 readonly property string password: {
43 if (method !== UbuntuSecurityPrivacyPanel.Swipe)
44 return passwordInput.text
45 else
46 return ""
47 }
48
49 function indexToMethod(index) {40 function indexToMethod(index) {
50 if (index === 0)41 if (index === 0)
51 return UbuntuSecurityPrivacyPanel.Swipe42 return UbuntuSecurityPrivacyPanel.Swipe
@@ -55,120 +46,63 @@
55 return UbuntuSecurityPrivacyPanel.Passphrase46 return UbuntuSecurityPrivacyPanel.Passphrase
56 }47 }
5748
58 OfonoManager {49 function methodToIndex(method) {
59 id: manager50 if (method === UbuntuSecurityPrivacyPanel.Swipe)
60 }51 return 0
6152 else if (method === UbuntuSecurityPrivacyPanel.Passcode)
62 // Ideally we would query the system more cleverly than hardcoding two53 return 1
63 // modems. But we don't yet have a more clever way. :(54 else
64 OfonoSimManager {55 return 2
65 id: simManager056 }
66 modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""57
67 }58 Connections {
6859 target: root
69 OfonoSimManager {60 onPasswordMethodChanged: selector.selectedIndex = methodToIndex(root.passwordMethod)
70 id: simManager161 }
71 modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""62
72 }63 Column {
7364 id: column
74 // Use a flickable for this so that we can properly clip the contents when
75 // the OSK appears.
76 Flickable {
77 anchors.fill: content65 anchors.fill: content
78 clip: true66 spacing: units.gu(4)
79 contentHeight: column.height67
80 boundsBehavior: (contentHeight > height) ? Flickable.DragOverBounds : Flickable.StopAtBounds68 Label {
8169 anchors.left: parent.left
82 Column {70 anchors.right: parent.right
83 id: column71 wrapMode: Text.Wrap
84 spacing: units.gu(2)72 text: i18n.tr("Please select how you’d like to unlock your phone.")
8573 }
86 ComboButton {74
87 id: combo75 ItemSelector {
8876 id: selector
89 text: listview.currentItem.text77 expanded: true
90 onClicked: {78 anchors.left: parent.left
91 expanded = !expanded79 anchors.right: parent.right
92 forceActiveFocus() // hides OSK if up80
93 }81 model: ["", "", ""] // otherwise the delegate will show the text itself and we only want subText
94 UbuntuListView {82
95 id: listview83 selectedIndex: methodToIndex(root.passwordMethod)
96 width: parent.width84
97 height: combo.comboListHeight85 delegate: OptionSelectorDelegate {
98 model: 386 // use subText because we want the text to be small, and we have no other way to control it
99 currentIndex: 187 subText: {
100 delegate: Standard {88 var method = indexToMethod(index)
101 text: {89 var name = ""
102 var method = indexToMethod(modelData)90 var desc = ""
103 if (method === UbuntuSecurityPrivacyPanel.Swipe)91 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
104 return i18n.tr("Swipe")92 name = i18n.tr("Swipe")
105 else if (method === UbuntuSecurityPrivacyPanel.Passcode)93 desc = i18n.tr("No security")
106 return i18n.tr("PIN code")94 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
107 else95 name = i18n.tr("Passcode")
108 return i18n.tr("Passphrase")96 desc = i18n.tr("4 numbers")
109 }97 } else {
110 onClicked: {98 name = i18n.tr("Passphrase")
111 listview.currentIndex = index99 desc = i18n.tr("Numbers and letters")
112 combo.expanded = false100 }
113 }101 return "<b>%1</b> (%2)".arg(name).arg(desc)
114 }102 }
115 }103 }
116 }104
117105 style: Item {}
118 TextField {
119 id: passwordInput
120 echoMode: TextInput.Password
121 inputMethodHints: {
122 var hints = Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData
123 if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
124 hints |= Qt.ImhDigitsOnly
125 return hints
126 }
127 inputMask: {
128 if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
129 return "9999"
130 else
131 return ""
132 }
133 visible: passwdPage.method !== UbuntuSecurityPrivacyPanel.Swipe
134 }
135
136 TextField {
137 id: confirmInput
138 echoMode: passwordInput.echoMode
139 inputMethodHints: passwordInput.inputMethodHints
140 inputMask: passwordInput.inputMask
141 visible: passwordInput.visible
142 }
143
144 Label {
145 id: problem
146 width: parent.width
147 wrapMode: Text.Wrap
148 visible: text !== ""
149 color: UbuntuColors.red
150 text: {
151 if (passwordInput.visible) {
152 if (passwordInput.text !== confirmInput.text) {
153 if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
154 return i18n.tr("Those PIN codes don't match.")
155 else
156 return i18n.tr("Those passphrases don't match.")
157 } else if (passwordInput.text.length < 4) {
158 // Note that the number four comes from PAM settings,
159 // which we don't have a good way to interrogate. We
160 // only do this matching instead of PAM because we want
161 // to set the password via PAM in a different place
162 // than this page. See comments at top of file.
163 if (passwdPage.method === UbuntuSecurityPrivacyPanel.Passcode)
164 return i18n.tr("PIN code must be at least four digits long.")
165 else
166 return i18n.tr("Passphrase must be at least four characters long.")
167 }
168 }
169 return ""
170 }
171 }
172 }106 }
173 }107 }
174108
@@ -176,14 +110,9 @@
176 id: forwardButton110 id: forwardButton
177 LocalComponents.StackButton {111 LocalComponents.StackButton {
178 text: i18n.tr("Continue")112 text: i18n.tr("Continue")
179 enabled: !problem.visible
180 onClicked: {113 onClicked: {
181 root.passwordMethod = passwdPage.method114 root.passwordMethod = indexToMethod(selector.selectedIndex)
182 root.password = passwdPage.password115 pageStack.next()
183 if (manager.modems.length == 0 || simManager0.present || simManager1.present)
184 pageStack.next()
185 else
186 pageStack.push(Qt.resolvedUrl("no-sim.qml"))
187 }116 }
188 }117 }
189 }118 }
190119
=== added file 'wizard/qml/Pages/31-passwd-set.qml'
--- wizard/qml/Pages/31-passwd-set.qml 1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/31-passwd-set.qml 2014-10-10 17:52:06 +0000
@@ -0,0 +1,86 @@
1/*
2 * Copyright (C) 2014 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.3
18import Ubuntu.Components 1.1
19import Ubuntu.SystemSettings.SecurityPrivacy 1.0
20import "../Components" as LocalComponents
21import "file:///usr/share/unity8/Components" as UnityComponents
22
23/**
24 * See the main passwd-type page for an explanation of why we don't actually
25 * directly set the password here.
26 */
27
28LocalComponents.Page {
29 id: passwdSetPage
30 forwardButtonSourceComponent: forwardButton
31
32 skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
33
34 // If we are entering this page, clear any saved password and get focus
35 onEnabledChanged: if (enabled) lockscreen.clear(false)
36
37 UnityComponents.Lockscreen {
38 id: lockscreen
39 anchors {
40 fill: parent
41 topMargin: topMargin
42 leftMargin: leftMargin
43 rightMargin: rightMargin
44 bottomMargin: buttonMargin
45 }
46
47 infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
48 i18n.tr("Enter passphrase") :
49 i18n.tr("Choose your passcode")
50
51 // Note that the number four comes from PAM settings,
52 // which we don't have a good way to interrogate. We
53 // only do this matching instead of PAM because we want
54 // to set the password via PAM in a different place
55 // than this page. See comments at top of passwd-type file.
56 errorText: i18n.tr("Passphrase must be 4 characters long")
57
58 showEmergencyCallButton: false
59 showCancelButton: false
60 alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
61 minPinLength: 4
62 maxPinLength: 4
63
64 onEntered: {
65 if (passphrase.length >= 4) {
66 root.password = passphrase
67 pageStack.load(Qt.resolvedUrl("passwd-confirm.qml"))
68 } else {
69 lockscreen.clear(true)
70 }
71 }
72 }
73
74 Component {
75 id: forwardButton
76 LocalComponents.StackButton {
77 text: i18n.tr("Skip")
78 onClicked: {
79 root.passwordMethod = UbuntuSecurityPrivacyPanel.Swipe
80 pageStack.prev()
81 pageStack.next()
82 }
83 visible: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passcode
84 }
85 }
86}
087
=== renamed file 'wizard/qml/Pages/20-wifi.qml' => 'wizard/qml/Pages/40-wifi.qml'
--- wizard/qml/Pages/20-wifi.qml 2014-09-03 09:51:27 +0000
+++ wizard/qml/Pages/40-wifi.qml 2014-10-10 17:52:06 +0000
@@ -143,7 +143,8 @@
143 anchors.right: parent.right143 anchors.right: parent.right
144 anchors.rightMargin: rightMargin144 anchors.rightMargin: rightMargin
145 fontSize: "small"145 fontSize: "small"
146 text: i18n.tr("Available networks")146 text: mainMenu.count > 0 ? i18n.tr("Available networks…")
147 : i18n.tr("No available networks.")
147 }148 }
148149
149 Flickable {150 Flickable {
@@ -192,8 +193,7 @@
192 Component {193 Component {
193 id: forwardButton194 id: forwardButton
194 LocalComponents.StackButton {195 LocalComponents.StackButton {
195 text: connected ? i18n.tr("Continue") : i18n.tr("Skip")196 text: (connected || mainMenu.count === 0) ? i18n.tr("Continue") : i18n.tr("Skip")
196 rightArrow: !connected
197 onClicked: pageStack.next()197 onClicked: pageStack.next()
198 }198 }
199 }199 }
200200
=== renamed file 'wizard/qml/Pages/30-location.qml' => 'wizard/qml/Pages/50-location.qml'
--- wizard/qml/Pages/30-location.qml 2014-09-18 13:30:14 +0000
+++ wizard/qml/Pages/50-location.qml 2014-10-10 17:52:06 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical, Ltd.2 * Copyright (C) 2013,2014 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import QMenuModel 0.118import QMenuModel 0.1 as QMenuModel
19import Qt.labs.folderlistmodel 2.119import Qt.labs.folderlistmodel 2.1
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.SystemSettings.Wizard.Utils 0.121import Ubuntu.SystemSettings.Wizard.Utils 0.1
@@ -25,16 +25,7 @@
25 title: i18n.tr("Location")25 title: i18n.tr("Location")
26 forwardButtonSourceComponent: forwardButton26 forwardButtonSourceComponent: forwardButton
2727
28 QDBusActionGroup {28 property bool hereInstalled: System.hereLicensePath !== "" && termsModel.count > 0
29 id: locationActionGroup
30 busType: DBus.SessionBus
31 busName: "com.canonical.indicator.location"
32 objectPath: "/com/canonical/indicator/location"
33
34 property variant enabled: action("location-detection-enabled")
35
36 Component.onCompleted: start()
37 }
3829
39 FolderListModel {30 FolderListModel {
40 id: termsModel31 id: termsModel
@@ -44,20 +35,33 @@
44 showOnlyReadable: true35 showOnlyReadable: true
45 }36 }
4637
38 QMenuModel.QDBusActionGroup {
39 id: locationActionGroup
40 busType: QMenuModel.DBus.SessionBus
41 busName: "com.canonical.indicator.location"
42 objectPath: "/com/canonical/indicator/location"
43 property variant enabled: action("location-detection-enabled")
44 Component.onCompleted: start()
45 }
46
47 Column {47 Column {
48 id: column48 id: column
49 anchors.fill: content49 anchors.fill: content
50 spacing: units.gu(4)50 spacing: units.gu(2)
5151
52 Item { // spacer52 Label {
53 height: units.gu(1)53 anchors.left: parent.left
54 width: units.gu(1) // needed else it will be ignored54 anchors.right: parent.right
55 visible: hereInstalled
56 wrapMode: Text.Wrap
57 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
58 text: i18n.tr("Ubuntu includes location services provided by HERE, enabling apps to pinpoint your location.")
55 }59 }
5660
57 LocalComponents.CheckableSetting {61 LocalComponents.CheckableSetting {
58 id: locationCheck62 id: locationCheck
59 showDivider: false63 showDivider: false
60 text: i18n.tr("Use your mobile network and Wi-Fi to work out where you are")64 text: i18n.tr("Allow apps to use your mobile and Wi-Fi networks to determine your location.")
61 checked: locationActionGroup.enabled.state65 checked: locationActionGroup.enabled.state
62 onTriggered: locationActionGroup.enabled.activate()66 onTriggered: locationActionGroup.enabled.activate()
63 }67 }
@@ -65,13 +69,21 @@
65 LocalComponents.CheckableSetting {69 LocalComponents.CheckableSetting {
66 id: termsCheck70 id: termsCheck
67 showDivider: false71 showDivider: false
68 visible: System.hereLicensePath !== "" && termsModel.count > 072 visible: hereInstalled
69 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it73 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
70 text: i18n.tr("I have read and agreed to the HERE <a href='terms.qml'>terms and conditions</a>")74 text: i18n.tr("Accept the HERE <a href='terms.qml'>terms and conditions</a> to enable these services.")
71 onLinkActivated: pageStack.push(Qt.resolvedUrl(link))75 onLinkActivated: pageStack.load(Qt.resolvedUrl(link))
72 checked: System.hereEnabled76 checked: System.hereEnabled
73 onTriggered: System.hereEnabled = checked77 onTriggered: System.hereEnabled = checked
74 }78 }
79
80 Label {
81 anchors.left: parent.left
82 anchors.right: parent.right
83 visible: hereInstalled
84 wrapMode: Text.Wrap
85 text: i18n.tr("This service can be disabled at any time from the <b>System Settings</b> menu.")
86 }
75 }87 }
7688
77 Component {89 Component {
7890
=== renamed file 'wizard/qml/Pages/40-reporting.qml' => 'wizard/qml/Pages/60-reporting.qml'
--- wizard/qml/Pages/40-reporting.qml 2014-08-27 15:47:17 +0000
+++ wizard/qml/Pages/60-reporting.qml 2014-10-10 17:52:06 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical, Ltd.2 * Copyright (C) 2013,2014 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -19,28 +19,26 @@
19import "../Components" as LocalComponents19import "../Components" as LocalComponents
2020
21LocalComponents.Page {21LocalComponents.Page {
22 title: i18n.tr("Bug reporting")22 title: i18n.tr("Improving your experience")
23 forwardButtonSourceComponent: forwardButton23 forwardButtonSourceComponent: forwardButton
2424
25 Column {25 Column {
26 id: column26 id: column
27 anchors.fill: content27 anchors.fill: content
28 spacing: units.gu(2)
2829
29 Label {30 Label {
30 anchors.left: parent.left31 anchors.left: parent.left
31 anchors.right: parent.right32 anchors.right: parent.right
32 wrapMode: Text.Wrap33 wrapMode: Text.Wrap
33 fontSize: "large"34 text: i18n.tr("Your phone is set up to automatically report errors to Canonical and its partners, the makers of the operating system.")
34 font.bold: true
35 text: i18n.tr("Your phone is set up to automatically report errors to Canonical.")
36 }35 }
3736
38 Label {37 Label {
39 anchors.left: parent.left38 anchors.left: parent.left
40 anchors.right: parent.right39 anchors.right: parent.right
41 wrapMode: Text.Wrap40 wrapMode: Text.Wrap
42 fontSize: "large"41 text: i18n.tr("This can be disabled in <b>System Settings</b> under <b>Security &amp; Privacy</b>")
43 text: i18n.tr("This can be disabled in System Settings.")
44 }42 }
45 }43 }
4644
4745
=== modified file 'wizard/qml/Pages/80-finished.qml'
--- wizard/qml/Pages/80-finished.qml 2014-08-27 15:47:17 +0000
+++ wizard/qml/Pages/80-finished.qml 2014-10-10 17:52:06 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical, Ltd.2 * Copyright (C) 2013,2014 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
26 Column {26 Column {
27 id: column27 id: column
28 anchors.fill: content28 anchors.fill: content
29 spacing: units.gu(2)29 spacing: units.gu(1)
3030
31 Label {31 Label {
32 anchors.left: parent.left32 anchors.left: parent.left
@@ -41,7 +41,6 @@
41 anchors.left: parent.left41 anchors.left: parent.left
42 anchors.right: parent.right42 anchors.right: parent.right
43 wrapMode: Text.Wrap43 wrapMode: Text.Wrap
44 fontSize: "large"
45 text: i18n.tr("Your phone is now ready to use.")44 text: i18n.tr("Your phone is now ready to use.")
46 }45 }
47 }46 }
4847
=== renamed file 'wizard/qml/Pages/terms.qml' => 'wizard/qml/Pages/here-terms.qml'
--- wizard/qml/Pages/terms.qml 2014-08-29 19:46:45 +0000
+++ wizard/qml/Pages/here-terms.qml 2014-10-10 17:52:06 +0000
@@ -96,7 +96,8 @@
9696
97 Label {97 Label {
98 id: termsLabel98 id: termsLabel
99 anchors.fill: parent99 anchors.left: parent.left
100 anchors.right: parent.right
100 wrapMode: Text.Wrap101 wrapMode: Text.Wrap
101 linkColor: Theme.palette.normal.foregroundText102 linkColor: Theme.palette.normal.foregroundText
102 onLinkActivated: {103 onLinkActivated: {
@@ -107,7 +108,8 @@
107108
108 WebView {109 WebView {
109 id: webview110 id: webview
110 anchors.fill: parent111 anchors.left: parent.left
112 anchors.right: parent.right
111 visible: !termsLabel.visible113 visible: !termsLabel.visible
112 }114 }
113 }115 }
114116
=== added file 'wizard/qml/Pages/passwd-confirm.qml'
--- wizard/qml/Pages/passwd-confirm.qml 1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/passwd-confirm.qml 2014-10-10 17:52:06 +0000
@@ -0,0 +1,68 @@
1/*
2 * Copyright (C) 2014 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.3
18import Ubuntu.Components 1.1
19import Ubuntu.SystemSettings.SecurityPrivacy 1.0
20import "../Components" as LocalComponents
21import "file:///usr/share/unity8/Components" as UnityComponents
22
23/**
24 * See the main passwd-type page for an explanation of why we don't actually
25 * directly set the password here.
26 */
27
28LocalComponents.Page {
29 id: passwdSetPage
30
31 skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
32
33 // If we are entering this page, clear any saved password and get focus
34 onEnabledChanged: if (enabled) lockscreen.clear(false)
35
36 UnityComponents.Lockscreen {
37 id: lockscreen
38 anchors {
39 fill: parent
40 topMargin: topMargin
41 leftMargin: leftMargin
42 rightMargin: rightMargin
43 bottomMargin: buttonMargin
44 }
45
46 infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
47 i18n.tr("Confirm passphrase") :
48 i18n.tr("Confirm passcode")
49
50 errorText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
51 i18n.tr("Sorry, incorrect passphrase.") + "\n" + i18n.tr("Please try again.") :
52 i18n.tr("Sorry, incorrect passcode.") + "\n" + i18n.tr("Please try again.")
53
54 showEmergencyCallButton: false
55 showCancelButton: false
56 alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
57 minPinLength: 4
58 maxPinLength: 4
59
60 onEntered: {
61 if (passphrase === root.password) {
62 pageStack.next()
63 } else {
64 clear(true)
65 }
66 }
67 }
68}
069
=== modified file 'wizard/qml/main.qml'
--- wizard/qml/main.qml 2014-09-18 12:59:25 +0000
+++ wizard/qml/main.qml 2014-10-10 17:52:06 +0000
@@ -30,11 +30,13 @@
3030
31 // These should be set by a security page and we apply the settings when31 // These should be set by a security page and we apply the settings when
32 // the user exits the wizard.32 // the user exits the wizard.
33 property int passwordMethod: UbuntuSecurityPrivacyPanel.Swipe33 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode
34 property string password: ""34 property string password: ""
3535
36 Component.onCompleted: {36 Component.onCompleted: {
37 Theme.name = "Ubuntu.Components.Themes.SuruGradient"37 Theme.name = "Ubuntu.Components.Themes.SuruGradient"
38 // A visible selected background looks bad in ListItem widgets with our theme
39 Theme.palette.selected.background = "#00000000"
38 i18n.domain = "ubuntu-system-settings"40 i18n.domain = "ubuntu-system-settings"
39 }41 }
4042
@@ -101,13 +103,50 @@
101 // continuing so back button returns to the previous main page.103 // continuing so back button returns to the previous main page.
102 while (pageList.index < pageStack.depth - 1)104 while (pageList.index < pageStack.depth - 1)
103 pop()105 pop()
104 push(pageList.next())106 load(pageList.next())
105 }107 }
106108
107 function prev() {109 function prev() {
108 if (pageList.index >= pageStack.depth - 1)110 if (pageList.index >= pageStack.depth - 1)
109 pageList.prev() // update pageList.index, but not for extra pages111 pageList.prev() // update pageList.index, but not for extra pages
110 pop()112 pop()
113 if (!currentPage || currentPage.opacity === 0) { // undo skipped pages
114 prev()
115 } else {
116 currentPage.enabled = true
117 }
118 }
119
120 function load(path) {
121 if (currentPage) {
122 currentPage.enabled = false
123 }
124
125 // First load it invisible, check that we should actually use
126 // this page, and either skip it or continue.
127 push(path, {"opacity": 0, "enabled": false})
128
129 // Check for immediate skip or not. We may have to wait for
130 // skipValid to be assigned (see Connections object below)
131 _checkSkip()
132 }
133
134 function _checkSkip() {
135 if (!currentPage) { // may have had a parse error
136 next()
137 } else if (currentPage.skipValid) {
138 if (currentPage.skip) {
139 next()
140 } else {
141 currentPage.opacity = 1
142 currentPage.enabled = true
143 }
144 }
145 }
146
147 Connections {
148 target: pageStack.currentPage
149 onSkipValidChanged: pageStack._checkSkip()
111 }150 }
112151
113 Component.onCompleted: next()152 Component.onCompleted: next()
114153
=== modified file 'wizard/test.sh'
--- wizard/test.sh 2014-03-06 18:39:42 +0000
+++ wizard/test.sh 2014-10-10 17:52:06 +0000
@@ -5,8 +5,8 @@
5LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)5LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)
6if [ -n ${LOCAL_PRIVATE_DIR} ]; then6if [ -n ${LOCAL_PRIVATE_DIR} ]; then
7 echo "Testing against locally built version"7 echo "Testing against locally built version"
8 export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/wizard"8 export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/debian/tmp/usr/share"
9 export XDG_DATA_DIRS="${TOPDIR}/debian/tmp/usr/share:${XDG_DATA_DIRS}"9 export UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES="${LOCAL_PRIVATE_DIR}"
10 export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}10 export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}
11 export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}11 export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}
12else12else

Subscribers

People subscribed via source and target branches