Merge lp:~dobey/ubuntu-system-settings/iap-trust-store into lp:ubuntu-system-settings

[dobey]

Add InAppPurchases to privacy plug-in.
Update translation template.
Fix translation template to not include full path to settings.js file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1578
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2552/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/736
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25995

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

review: Needs Fixing (continuous-integration)

[lp:~dobey/ubuntu-system-settings/iap-trust-store]

1579. By dobey on 2015-12-14

Fix missing closing brace.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1579
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2553/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/737
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26027

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

See inline comment

review: Needs Fixing

[lp:~dobey/ubuntu-system-settings/iap-trust-store]

1580. By dobey on 2015-12-16

Fix horrible typo.

1581. By dobey on 2015-12-16

Fix the pot file too.

[Ken VanDine (ken-vandine)]

Please add steps to test this to the description

[Ken VanDine (ken-vandine)]

Currently there isn't a good way to test this because in-app purchases hasn't landed in the phone image yet.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1581
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2554/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5829/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/738
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4501/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5842
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26133

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/security-privacy/AppAccess.qml'
--- plugins/security-privacy/AppAccess.qml	2015-09-18 14:18:11 +0000
+++ plugins/security-privacy/AppAccess.qml	2015-12-16 19:42:32 +0000
@@ -63,6 +63,11 @@
                     caption: QT_TR_NOOP("Apps that have requested access to your microphone")
                     trustStoreService: "PulseAudio"
                 }
+                ListElement {
+                    name: QT_TR_NOOP("In-App Purchases")
+                    caption: QT_TR_NOOP("Apps that have requested access for in-app purchases")
+                    trustStoreService: "InAppPurchases"
+                }
             }
 
             Repeater {

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-02-09 15:43:08 +0000
+++ po/CMakeLists.txt	2015-12-16 19:42:32 +0000
@@ -17,6 +17,8 @@
                         "${CMAKE_SOURCE_DIR}/plugins/*/*.settings")
 file(GLOB PYFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
                         "${CMAKE_SOURCE_DIR}/push-helper/*.py")
+file(GLOB SETTINGSJSFILE RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                   "${CMAKE_CURRENT_BINARY_DIR}/settings.js")
 
 add_custom_command(OUTPUT settings.js
     COMMAND ./extractsettingsinfo ${SETTINGSFILES} -o ${CMAKE_CURRENT_BINARY_DIR}/settings.js
@@ -44,7 +46,7 @@
                             --qt --c++ --add-comments=TRANSLATORS
                             --keyword=QT_TR_NOOP --keyword=ctr:1c,2
                             --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
-                            ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js"
+                            ${QMLFILES} ${SETTINGSJSFILE}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     DEPENDS pot-desktop ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js" #desktop.js
 )

=== modified file 'po/ubuntu-system-settings.pot'
--- po/ubuntu-system-settings.pot	2014-10-29 12:50:36 +0000
+++ po/ubuntu-system-settings.pot	2015-12-16 19:42:32 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 20:04-0600\n"
+"POT-Creation-Date: 2015-12-16 14:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
+#: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:111
 msgid "System Settings"
 msgstr ""
 
@@ -30,428 +30,713 @@
 msgid "Preferences;Settings;"
 msgstr ""
 
-#: ../plugins/background//Preview.qml:70
-msgid "Preview"
-msgstr ""
-
-#: ../plugins/background//Preview.qml:102
-msgid "Remove image"
-msgstr ""
-
-#: ../plugins/background//Preview.qml:102
-#: ../plugins/wifi//OtherNetwork.qml:288
-#: ../plugins/reset//ResetAllSettings.qml:38
-#: ../plugins/reset//ResetLauncherHome.qml:55
-#: ../plugins/reset//EraseEverything.qml:54
-#: ../plugins/language//RebootNecessary.qml:47
-#: ../plugins/language//DisplayLanguage.qml:98
-#: ../plugins/phone//CallForwarding.qml:139
-#: ../plugins/cellular//PageChooseApn.qml:594
-#: ../plugins/cellular//CustomApnEditor.qml:245
-#: ../plugins/cellular//HotspotSetup.qml:85
-#: ../plugins/security-privacy//LockSecurity.qml:283
-#: ../plugins/security-privacy//SimPin.qml:149
-#: ../plugins/security-privacy//SimPin.qml:266
-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:54
-#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:49
-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:55
-#: ../plugins/time-date//TimePicker.qml:173
-#: ../plugins/background//Components//AddRemove.qml:42
-#: ../plugins/cellular//Components//SimEditor.qml:189
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#: ../plugins/brightness/PageComponent.qml:35 ../build/po/settings.js:2
+msgid "Brightness"
+msgstr ""
+
+#: ../plugins/brightness/PageComponent.qml:57
+#: ../plugins/battery/PageComponent.qml:294
+msgid "Display brightness"
+msgstr ""
+
+#: ../plugins/brightness/PageComponent.qml:89
+msgid "Adjust automatically"
+msgstr ""
+
+#: ../plugins/brightness/PageComponent.qml:103
+msgid "Brightens and dims the display to suit the surroundings."
+msgstr ""
+
+#: ../plugins/phone/MultiSim.qml:42 ../plugins/phone/SingleSim.qml:34
+#: ../plugins/phone/CallWaiting.qml:31 ../plugins/phone/CallWaiting.qml:81
+#: ../plugins/phone/NoSims.qml:34
+msgid "Call waiting"
+msgstr ""
+
+#: ../plugins/phone/MultiSim.qml:52 ../plugins/phone/SingleSim.qml:41
+#: ../plugins/phone/CallForwarding.qml:45 ../plugins/phone/NoSims.qml:28
+msgid "Call forwarding"
+msgstr ""
+
+#: ../plugins/phone/MultiSim.qml:63 ../plugins/phone/NoSims.qml:42
+msgid "Services"
+msgstr ""
+
+#. TRANSLATORS: This string will be truncated on smaller displays.
+#: ../plugins/phone/CallForwardItem.qml:157
+#: ../plugins/phone/CallForwardItem.qml:206
+msgid "Forward to"
+msgstr ""
+
+#: ../plugins/phone/CallForwardItem.qml:171
+msgid "Enter a number"
+msgstr ""
+
+#: ../plugins/phone/CallForwardItem.qml:222
+msgid "Call forwarding can’t be changed right now."
+msgstr ""
+
+#: ../plugins/phone/SingleSim.qml:29
+msgid "SIM"
+msgstr ""
+
+#. TRANSLATORS: %1 is the name of the (network) carrier
+#: ../plugins/phone/SingleSim.qml:53 ../plugins/phone/Services.qml:35
+#, qt-format
+msgid "%1 Services"
+msgstr ""
+
+#: ../plugins/phone/CallWaiting.qml:96
+msgid ""
+"Lets you answer or start a new call while on another call, and switch "
+"between them"
+msgstr ""
+
+#: ../plugins/phone/ServiceInfo.qml:109
+#, qt-format
+msgid "Last called %1"
+msgstr ""
+
+#: ../plugins/phone/ServiceInfo.qml:119
+msgid "Call"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:131
+msgid "Forward every incoming call"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:146
+msgid "Redirects all phone calls to another number."
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:158
+msgid "Call forwarding status can’t be checked "
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:166
+msgid "Forward incoming calls when:"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:176
+msgid "I’m on another call"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:187
+msgid "I don’t answer"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:198
+msgid "My phone is unreachable"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:228
+msgid "Contacts…"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:241 ../plugins/wifi/CertDialog.qml:65
+#: ../plugins/wifi/OtherNetwork.qml:890
+#: ../plugins/hotspot/HotspotSetup.qml:288
+#: ../plugins/hotspot/PageComponent.qml:155
+#: ../plugins/security-privacy/SimPin.qml:178
+#: ../plugins/security-privacy/SimPin.qml:318
+#: ../plugins/security-privacy/LockSecurity.qml:357
+#: ../plugins/cellular/PageChooseApn.qml:171
+#: ../plugins/cellular/PageChooseApn.qml:202
+#: ../plugins/cellular/PageChooseApn.qml:233
+#: ../plugins/cellular/PageChooseApn.qml:267
+#: ../plugins/language/RebootNecessary.qml:47
+#: ../plugins/language/DisplayLanguage.qml:97
+#: ../plugins/background/Preview.qml:101
+#: ../plugins/bluetooth/DisplayPinCodeDialog.qml:46
+#: ../plugins/bluetooth/ProvidePinCodeDialog.qml:55
+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:49
+#: ../plugins/bluetooth/ProvidePasskeyDialog.qml:54
+#: ../plugins/bluetooth/DisplayPasskeyDialog.qml:51
+#: ../plugins/time-date/TimePicker.qml:173
+#: ../plugins/reset/ResetLauncherHome.qml:55
+#: ../plugins/reset/ResetAllSettings.qml:38
+#: ../plugins/reset/EraseEverything.qml:54
+#: ../plugins/system-update/PageComponent.qml:110
+#: ../plugins/cellular/Components/SimEditor.qml:204
+#: ../plugins/background/Components/AddRemove.qml:42
 msgid "Cancel"
 msgstr ""
 
-#: ../plugins/background//Preview.qml:109
-#: ../plugins/phone//CallForwarding.qml:152
-#: ../plugins/security-privacy//LockSecurity.qml:304
-#: ../plugins/time-date//TimePicker.qml:182
+#: ../plugins/phone/CallForwarding.qml:254
+#: ../plugins/security-privacy/LockSecurity.qml:378
+#: ../plugins/background/Preview.qml:108
+#: ../plugins/time-date/TimePicker.qml:182
 msgid "Set"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: ../plugins/background//MainPage.qml:35
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:2
-msgid "Background"
-msgstr ""
-
-#: ../plugins/background//MainPage.qml:99
-msgid "Ubuntu Art"
-msgstr ""
-
-#: ../plugins/background//MainPage.qml:115
-#: ../plugins/cellular//PageChooseApn.qml:409
-#: ../plugins/cellular//PageChooseApn.qml:488
-#: ../plugins/cellular//PageChooseApn.qml:496
-msgid "Custom"
-msgstr ""
-
-#: ../plugins/wifi//RemoveBackground.qml:28
-msgid "Clear"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetailsBrief.qml:42
-#: ../plugins/bluetooth//PageComponent.qml:411
-msgid "Disconnect"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetailsBrief.qml:58
+#: ../plugins/phone/CallForwarding.qml:275
+msgid "Please select a phone number"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:284
+msgid "Numbers"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:303
+msgid "Could not forward to this contact"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:304
+msgid "Contact not associated with any phone number."
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:306
+#: ../plugins/system-update/PageComponent.qml:135
+#: ../plugins/cellular/Components/SimEditor.qml:215
+msgid "OK"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:383
+msgid "All calls"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:385
+msgid "Some calls"
+msgstr ""
+
+#: ../plugins/phone/CallForwarding.qml:387
+#: ../plugins/security-privacy/PageComponent.qml:134
+#: ../plugins/security-privacy/PageComponent.qml:199
+#: ../plugins/cellular/Components/DataMultiSim.qml:31
+msgid "Off"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../plugins/phone/PageComponent.qml:32
+#: ../plugins/bluetooth/DevicePage.qml:48 ../build/po/settings.js:14
+msgid "Phone"
+msgstr ""
+
+#: ../plugins/phone/PageComponent.qml:102
+#: ../plugins/sound/PageComponent.qml:180
+msgid "Dialpad tones"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetailsBrief.qml:54
+#: ../plugins/wifi/NetworkDetails.qml:100
+msgid "Forget this network"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetailsBrief.qml:69
 msgid "IP address"
 msgstr ""
 
-#: ../plugins/wifi//PreviousNetworks.qml:27
-#: ../plugins/wifi//PageComponent.qml:132
+#: ../plugins/wifi/CertDialog.qml:22
+msgid "Add certificate?"
+msgstr ""
+
+#: ../plugins/wifi/CertDialog.qml:24
+msgid "Add key?"
+msgstr ""
+
+#: ../plugins/wifi/CertDialog.qml:26
+msgid "Add pac file?"
+msgstr ""
+
+#: ../plugins/wifi/CertDialog.qml:36
+msgid "Content:"
+msgstr ""
+
+#: ../plugins/wifi/CertDialog.qml:49
+msgid "No data available."
+msgstr ""
+
+#: ../plugins/wifi/CertDialog.qml:74
+msgid "Save"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:38
+msgid "Network details"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:57
+#: ../plugins/cellular/PageApnEditor.qml:181
+#: ../plugins/bluetooth/DevicePage.qml:100
+msgid "Name"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:65
+msgid "Last connected"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:70
+#: ../plugins/battery/SleepValues.qml:113
+#: ../plugins/battery/PageComponent.qml:313
+#: ../plugins/battery/PageComponent.qml:322
+#: ../plugins/security-privacy/PhoneLocking.qml:90
+#: ../plugins/security-privacy/PhoneLocking.qml:99
+#: ../plugins/about/PageComponent.qml:183
+#: ../plugins/system-update/Configuration.qml:52
+#: ../plugins/system-update/PageComponent.qml:736
+msgid "Never"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:76 ../plugins/wifi/OtherNetwork.qml:787
+#: ../plugins/cellular/PageApnEditor.qml:359
+msgid "Password"
+msgstr ""
+
+#: ../plugins/wifi/NetworkDetails.qml:89 ../plugins/wifi/OtherNetwork.qml:822
+#: ../plugins/hotspot/HotspotSetup.qml:260
+msgid "Show password"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:93
+msgid "Connect to Wi‑Fi"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:94
+msgid "Connect to Hidden Network"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:286
+msgid "Network name"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:299
+msgid "SSID"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:308
+#: ../plugins/security-privacy/PageComponent.qml:115
+msgid "Security"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:319 ../plugins/wifi/OtherNetwork.qml:458
+#: ../plugins/wifi/OtherNetwork.qml:575 ../plugins/about/PageComponent.qml:109
+#: ../plugins/about/PageComponent.qml:110
+#: ../plugins/about/PageComponent.qml:121
+#: ../plugins/cellular/PageCarriersAndApns.qml:51
+#: ../plugins/cellular/PageCarriersAndApns.qml:77
+#: ../plugins/cellular/PageApnEditor.qml:388
+#: ../plugins/cellular/PageCarrierAndApn.qml:46
+#: ../plugins/bluetooth/DevicePage.qml:72
+#: ../plugins/bluetooth/DevicePage.qml:80
+#: ../plugins/bluetooth/DevicePage.qml:104 ../plugins/wifi/certhandler.cpp:105
+#: ../plugins/wifi/certhandler.cpp:140 ../plugins/wifi/certhandler.cpp:192
+#: ../plugins/wifi/certhandler.cpp:224 ../plugins/wifi/certhandler.cpp:289
+#: ../plugins/wifi/certhandler.cpp:318
+msgid "None"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:320
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:321
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:322
+msgid "WEP"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:323
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:324
+msgid "LEAP"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:333
+msgid "This network is insecure."
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:339
+#: ../plugins/cellular/PageApnEditor.qml:384
+msgid "Authentication"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:364
+msgid "Inner authentication"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:397
+msgid "CA certificate"
+msgstr ""
+
+#. TRANSLATORS: %1 is the name of a certificate file.
+#. The ellipsis indicates that the file name has been
+#. truncated to 30 characters.
+#: ../plugins/wifi/OtherNetwork.qml:451
+#, qt-format
+msgid "%1…"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:459 ../plugins/wifi/OtherNetwork.qml:576
+#: ../plugins/wifi/certhandler.cpp:106 ../plugins/wifi/certhandler.cpp:141
+#: ../plugins/wifi/certhandler.cpp:193 ../plugins/wifi/certhandler.cpp:225
+#: ../plugins/wifi/certhandler.cpp:290 ../plugins/wifi/certhandler.cpp:319
+msgid "Choose…"
+msgstr ""
+
+#. TRANSLATORS: The first position is the name of
+#. the organization that has issued the certificate.
+#. The organization name has been truncated, as
+#. indicated by the ellipsis. The latter position is
+#. the expiry date of the certificate.
+#: ../plugins/wifi/OtherNetwork.qml:466
+#, qt-format
+msgid "%1…, Exp.: %2"
+msgstr ""
+
+#. TRANSLATORS: The first position is the name of
+#. the organization that has issued the certificate.
+#. The latter position is the expiry date of the
+#. certificate.
+#: ../plugins/wifi/OtherNetwork.qml:474
+#, qt-format
+msgid "%1, Exp.: %2"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:495
+msgid "Using certificates is recommend as it increases security."
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:513
+msgid "Client certificate"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:555
+msgid "User private key"
+msgstr ""
+
+#. TRANSLATORS: The first position is the type of
+#. private key, second the key algorithm, and third the
+#. length of the key in bits.
+#: ../plugins/wifi/OtherNetwork.qml:580
+#, qt-format
+msgid "%1, %2, %3 bit"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:623
+msgid "Pac file"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:673
+msgid "Pac provisioning"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:687
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:688
+msgid "Anonymous"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:689
+msgid "Authenticated"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:690
+msgid "Both"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:700
+msgid "PEAP version"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:714
+msgid "Version 0"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:715
+msgid "Version 1"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:716
+msgid "Automatic"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:726
+msgid "Anonymous identity"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:753
+msgid "Identity"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:755
+msgid "Username"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:785
+msgid "Private key password"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:858
+msgid "Remember password"
+msgstr ""
+
+#: ../plugins/wifi/OtherNetwork.qml:906
+#: ../plugins/bluetooth/DevicePage.qml:168
+msgid "Connect"
+msgstr ""
+
+#: ../plugins/wifi/PreviousNetworks.qml:27
+#: ../plugins/wifi/PageComponent.qml:131
 msgid "Previous networks"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:36
+#: ../plugins/wifi/Common.qml:36 ../plugins/hotspot/Common.qml:34
 msgid "Unknown error"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:38
+#: ../plugins/wifi/Common.qml:38 ../plugins/hotspot/Common.qml:36
 msgid "No reason given"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:40
+#: ../plugins/wifi/Common.qml:40 ../plugins/hotspot/Common.qml:38
 msgid "Device is now managed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:42
+#: ../plugins/wifi/Common.qml:42 ../plugins/hotspot/Common.qml:40
 msgid "Device is now unmanaged"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:44
+#: ../plugins/wifi/Common.qml:44 ../plugins/hotspot/Common.qml:42
 msgid "The device could not be readied for configuration"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:46
+#: ../plugins/wifi/Common.qml:46 ../plugins/hotspot/Common.qml:44
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:48
+#: ../plugins/wifi/Common.qml:48 ../plugins/hotspot/Common.qml:46
 msgid "The IP configuration is no longer valid"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:50
+#: ../plugins/wifi/Common.qml:50 ../plugins/hotspot/Common.qml:48
 msgid "Your authentication details were incorrect"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:52
+#: ../plugins/wifi/Common.qml:52 ../plugins/hotspot/Common.qml:50
 msgid "802.1X supplicant disconnected"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:54
+#: ../plugins/wifi/Common.qml:54 ../plugins/hotspot/Common.qml:52
 msgid "802.1X supplicant configuration failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:56
+#: ../plugins/wifi/Common.qml:56 ../plugins/hotspot/Common.qml:54
 msgid "802.1X supplicant failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:58
+#: ../plugins/wifi/Common.qml:58 ../plugins/hotspot/Common.qml:56
 msgid "802.1X supplicant took too long to authenticate"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:60
+#: ../plugins/wifi/Common.qml:60 ../plugins/hotspot/Common.qml:58
 msgid "DHCP client failed to start"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:62
+#: ../plugins/wifi/Common.qml:62 ../plugins/hotspot/Common.qml:60
 msgid "DHCP client error"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:64
+#: ../plugins/wifi/Common.qml:64 ../plugins/hotspot/Common.qml:62
 msgid "DHCP client failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:66
+#: ../plugins/wifi/Common.qml:66 ../plugins/hotspot/Common.qml:64
 msgid "Shared connection service failed to start"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:68
+#: ../plugins/wifi/Common.qml:68 ../plugins/hotspot/Common.qml:66
 msgid "Shared connection service failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:70
+#: ../plugins/wifi/Common.qml:70 ../plugins/hotspot/Common.qml:68
 msgid "Necessary firmware for the device may be missing"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:72
+#: ../plugins/wifi/Common.qml:72 ../plugins/hotspot/Common.qml:70
 msgid "The device was removed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:74
+#: ../plugins/wifi/Common.qml:74 ../plugins/hotspot/Common.qml:72
 msgid "NetworkManager went to sleep"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:76
+#: ../plugins/wifi/Common.qml:76 ../plugins/hotspot/Common.qml:74
 msgid "The device's active connection disappeared"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:78
+#: ../plugins/wifi/Common.qml:78 ../plugins/hotspot/Common.qml:76
 msgid "Device disconnected by user or client"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:80
+#: ../plugins/wifi/Common.qml:80 ../plugins/hotspot/Common.qml:78
 msgid "The device's existing connection was assumed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:82
+#: ../plugins/wifi/Common.qml:82 ../plugins/hotspot/Common.qml:80
 msgid "The supplicant is now available"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:84
+#: ../plugins/wifi/Common.qml:84 ../plugins/hotspot/Common.qml:82
 msgid "The modem could not be found"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:86
+#: ../plugins/wifi/Common.qml:86 ../plugins/hotspot/Common.qml:84
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:88
+#: ../plugins/wifi/Common.qml:88 ../plugins/hotspot/Common.qml:86
 msgid "A dependency of the connection failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:90
+#: ../plugins/wifi/Common.qml:90 ../plugins/hotspot/Common.qml:88
 msgid "ModemManager is unavailable"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:92
+#: ../plugins/wifi/Common.qml:92 ../plugins/hotspot/Common.qml:90
 msgid "The Wi-Fi network could not be found"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:94
+#: ../plugins/wifi/Common.qml:94 ../plugins/hotspot/Common.qml:92
 msgid "A secondary connection of the base connection failed"
 msgstr ""
 
-#: ../plugins/wifi//Common.qml:96 ../plugins/bluetooth//PageComponent.qml:86
+#: ../plugins/wifi/Common.qml:96 ../plugins/hotspot/Common.qml:94
+#: ../plugins/bluetooth/DevicePage.qml:41
 msgid "Unknown"
 msgstr ""
 
-#: ../plugins/wifi//OtherNetwork.qml:96
-msgid "Connect to Hidden Network"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:187
-msgid "Network name"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:203
-#: ../plugins/security-privacy//PageComponent.qml:126
-msgid "Security"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:214
-#: ../plugins/bluetooth//PageComponent.qml:116
-#: ../plugins/bluetooth//PageComponent.qml:326
-#: ../plugins/bluetooth//PageComponent.qml:347
-msgid "None"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:215
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:216
-msgid "WEP"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:222
-#: ../plugins/wifi//NetworkDetails.qml:64
-#: ../plugins/cellular//CustomApnEditor.qml:222
-msgid "Password"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:256
-#: ../plugins/wifi//NetworkDetails.qml:77
-msgid "Show password"
-msgstr ""
-
-#: ../plugins/wifi//OtherNetwork.qml:304
-#: ../plugins/bluetooth//PageComponent.qml:411
-msgid "Connect"
-msgstr ""
-
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
-#: ../plugins/wifi//PageComponent.qml:28
-#: ../plugins/battery//PageComponent.qml:333
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:24
+#: ../plugins/wifi/PageComponent.qml:28
+#: ../plugins/battery/PageComponent.qml:342 ../build/po/settings.js:32
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../plugins/wifi//PageComponent.qml:139
+#: ../plugins/wifi/PageComponent.qml:138
 msgid "Connect to hidden network…"
 msgstr ""
 
-#: ../plugins/wifi//NetworkDetails.qml:38
-msgid "Network details"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetails.qml:45
-#: ../plugins/bluetooth//PageComponent.qml:346
-msgid "Name"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetails.qml:53
-msgid "Last connected"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetails.qml:58
-#: ../plugins/battery//PageComponent.qml:315
-#: ../plugins/battery//PageComponent.qml:324
-#: ../plugins/battery//SleepValues.qml:106
-#: ../plugins/security-privacy//PhoneLocking.qml:78
-#: ../plugins/security-privacy//PhoneLocking.qml:87
-#: ../plugins/security-privacy//PageComponent.qml:140
-#: ../plugins/about//PageComponent.qml:167
-#: ../plugins/system-update//PageComponent.qml:762
-#: ../plugins/system-update//Configuration.qml:52
-msgid "Never"
-msgstr ""
-
-#: ../plugins/wifi//NetworkDetails.qml:88
-msgid "Forget network"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: ../plugins/notifications//PageComponent.qml:29
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:44
-msgid "Notifications"
-msgstr ""
-
-#: ../plugins/notifications//PageComponent.qml:40
-msgid ""
-"Selected apps can alert you using notification bubbles, sounds, vibrations, "
-"and the Notification Center."
-msgstr ""
-
-#: ../plugins/sound//SoundsList.qml:60
-msgid "Stop playing"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: ../plugins/sound//PageComponent.qml:37
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:68
-msgid "Sound"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:76
-msgid "Silent Mode"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:80
-msgid "Ringer:"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:112
-msgid "Phone calls:"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:116
-#: ../plugins/sound//PageComponent.qml:122
-msgid "Ringtone"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:135
-msgid "Vibrate when ringing"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:144
-#: ../plugins/sound//PageComponent.qml:188
-msgid "Vibrate in Silent Mode"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:153
-#: ../plugins/phone//PageComponent.qml:110
-msgid "Dialpad sounds"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:157
-msgid "Messages:"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:161
-#: ../plugins/sound//PageComponent.qml:167
-msgid "Message received"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:179
-msgid "Vibrate with message sound"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:192
-msgid "Other sounds:"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:196
-#: ../plugins/language//PageComponent.qml:209
-msgid "Keyboard sound"
-msgstr ""
-
-#: ../plugins/sound//PageComponent.qml:210
-msgid "Lock sound"
-msgstr ""
-
-#: ../plugins/sound//SilentModeWarning.qml:31
-msgid "The phone is in Silent Mode."
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: ../plugins/reset//PageComponent.qml:32
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:86
-msgid "Reset phone"
-msgstr ""
-
-#: ../plugins/reset//PageComponent.qml:73
-#: ../plugins/reset//ResetLauncherHome.qml:44
-msgid "Reset Launcher"
-msgstr ""
-
-#: ../plugins/reset//PageComponent.qml:87
-msgid "Reset all system settings…"
-msgstr ""
-
-#: ../plugins/reset//PageComponent.qml:101
-msgid "Erase & Reset Everything…"
-msgstr ""
-
-#: ../plugins/reset//ResetAllSettings.qml:29
-msgid ""
-"The contents and layout of the launcher, and the filters in the home screen "
-"will be returned to their original settings."
-msgstr ""
-
-#: ../plugins/reset//ResetAllSettings.qml:31
-msgid "Reset all system settings"
-msgstr ""
-
-#: ../plugins/reset//ResetLauncherHome.qml:40
-msgid "The Launcher will be returned to its original contents."
-msgstr ""
-
-#: ../plugins/reset//ResetLauncherHome.qml:59
-#: ../plugins/language//RebootNecessary.qml:34
-msgid "The phone needs to restart for changes to take effect."
-msgstr ""
-
-#: ../plugins/reset//EraseEverything.qml:41
-msgid ""
-"All documents, saved games, settings, and other items will be permanently "
-"deleted from this phone."
-msgstr ""
-
-#: ../plugins/reset//EraseEverything.qml:44
-msgid "Erase & Reset Everything"
+#: ../plugins/wifi/RemoveBackground.qml:28
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:60
+msgid "Change Hotspot Setup"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:60
+msgid "Set Up Hotspot"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:174
+msgid "Hotspot name"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:175
+msgid "Choose a name"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:217
+msgid "Require a password (recommended):"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:270
+msgid "Starting the hotspot will turn on Wi-Fi."
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:299
+#: ../plugins/security-privacy/SimPin.qml:186
+#: ../plugins/security-privacy/LockSecurity.qml:376
+msgid "Change"
+msgstr ""
+
+#: ../plugins/hotspot/HotspotSetup.qml:300
+msgid "Start"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the hotspot plugin which is used while searching
+#: ../plugins/hotspot/PageComponent.qml:32
+#: ../plugins/hotspot/PageComponent.qml:82 ../build/po/settings.js:64
+msgid "Hotspot"
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:110
+msgid ""
+"When hotspot is on, other devices can use your cellular data connection over "
+"Wi-Fi. Normal data charges apply."
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:111
+msgid ""
+"Other devices can use your cellular data connection over the Wi-Fi network. "
+"Normal data charges apply."
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:120
+msgid "Change Password/Setup…"
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:120
+msgid "Set Up Hotspot…"
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:151
+msgid "Wi-Fi is off"
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:152
+msgid "In order to create a hotspot, you need to turn Wi-Fi on."
+msgstr ""
+
+#: ../plugins/hotspot/PageComponent.qml:161
+msgid "Turn on Wi-Fi"
+msgstr ""
+
+#: ../plugins/battery/SleepValues.qml:78
+msgid "Lock the phone when it's not in use:"
+msgstr ""
+
+#: ../plugins/battery/SleepValues.qml:79
+msgid "Put the phone to sleep when it is not in use:"
+msgstr ""
+
+#. TRANSLATORS: %1 is the number of minutes
+#: ../plugins/battery/SleepValues.qml:90 ../plugins/battery/SleepValues.qml:94
+#: ../plugins/battery/SleepValues.qml:98
+#: ../plugins/battery/SleepValues.qml:102
+#: ../plugins/battery/SleepValues.qml:106
+#: ../plugins/battery/SleepValues.qml:110
+#: ../plugins/battery/PageComponent.qml:310
+#: ../plugins/battery/PageComponent.qml:319
+#, qt-format
+msgid "After %1 minute"
+msgid_plural "After %1 minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/battery/SleepValues.qml:125
+msgid ""
+"Shorter times are more secure. Phone won't lock during calls or video "
+"playback."
+msgstr ""
+
+#: ../plugins/battery/SleepValues.qml:125
+msgid "Phone won’t sleep during calls or video playback."
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: ../plugins/battery//PageComponent.qml:34
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:98
+#: ../plugins/battery/PageComponent.qml:35 ../build/po/settings.js:80
 msgid "Battery"
 msgstr ""
 
 #. TRANSLATORS: %1 is the number of seconds
-#: ../plugins/battery//PageComponent.qml:46
+#: ../plugins/battery/PageComponent.qml:44
 #, qt-format
 msgid "%1 second ago"
 msgid_plural "%1 seconds ago"
@@ -459,7 +744,7 @@
 msgstr[1] ""
 
 #. TRANSLATORS: %1 is the number of minutes
-#: ../plugins/battery//PageComponent.qml:49
+#: ../plugins/battery/PageComponent.qml:47
 #, qt-format
 msgid "%1 minute ago"
 msgid_plural "%1 minutes ago"
@@ -467,2437 +752,2412 @@
 msgstr[1] ""
 
 #. TRANSLATORS: %1 is the number of hours
-#: ../plugins/battery//PageComponent.qml:52
+#: ../plugins/battery/PageComponent.qml:50
 #, qt-format
 msgid "%1 hour ago"
 msgid_plural "%1 hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANSLATORS: %1 is the number of days
-#: ../plugins/battery//PageComponent.qml:55
-#, qt-format
-msgid "%1 day ago"
-msgid_plural "%1 days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../plugins/battery//PageComponent.qml:85
-msgid "Charging now"
-msgstr ""
-
-#: ../plugins/battery//PageComponent.qml:90
-msgid "Last full charge"
-msgstr ""
-
-#: ../plugins/battery//PageComponent.qml:95
-msgid "Fully charged"
-msgstr ""
-
-#: ../plugins/battery//PageComponent.qml:126
+#: ../plugins/battery/PageComponent.qml:104
 msgid "Charge level"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:131
-#: ../plugins/battery//PageComponent.qml:287
-#: ../plugins/cellular//PageChooseCarriers.qml:48
-#: ../plugins/cellular//PageChooseCarriers.qml:65
-#: ../plugins/about//Storage.qml:203
-#: ../plugins/cellular//Components//SingleSim.qml:62
-#: ../plugins/cellular//Components//NoSim.qml:48
+#: ../plugins/battery/PageComponent.qml:109
+#: ../plugins/battery/PageComponent.qml:281 ../plugins/about/Storage.qml:199
 msgid "N/A"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery
-#: ../plugins/battery//PageComponent.qml:134
+#: ../plugins/battery/PageComponent.qml:112
 #, qt-format
 msgid "%1%"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:212
-#: ../plugins/battery//PageComponent.qml:214
+#: ../plugins/battery/PageComponent.qml:190
+#: ../plugins/battery/PageComponent.qml:192
 msgid "Yesterday"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:220
-#: ../plugins/battery//PageComponent.qml:222
+#: ../plugins/battery/PageComponent.qml:198
+#: ../plugins/battery/PageComponent.qml:200
 msgid "Today"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:292
+#: ../plugins/battery/PageComponent.qml:269
+msgid "Charging now"
+msgstr ""
+
+#: ../plugins/battery/PageComponent.qml:271
+msgid "Last full charge"
+msgstr ""
+
+#: ../plugins/battery/PageComponent.qml:273
+msgid "Fully charged"
+msgstr ""
+
+#: ../plugins/battery/PageComponent.qml:290
 msgid "Ways to reduce battery use:"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:296
-#: ../plugins/brightness//BrightnessSlider.qml:51
-msgid "Display brightness"
-msgstr ""
-
-#: ../plugins/battery//PageComponent.qml:306
-#: ../plugins/security-privacy//PhoneLocking.qml:68
+#: ../plugins/battery/PageComponent.qml:304
+#: ../plugins/security-privacy/PhoneLocking.qml:80
 msgid "Lock when idle"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:306
-#: ../plugins/security-privacy//PhoneLocking.qml:69
+#: ../plugins/battery/PageComponent.qml:304
+#: ../plugins/security-privacy/PhoneLocking.qml:81
 msgid "Sleep when idle"
 msgstr ""
 
-#. TRANSLATORS: %1 is the number of minutes
-#: ../plugins/battery//PageComponent.qml:312
-#: ../plugins/battery//PageComponent.qml:321
-#: ../plugins/battery//SleepValues.qml:83
-#: ../plugins/battery//SleepValues.qml:87
-#: ../plugins/battery//SleepValues.qml:91
-#: ../plugins/battery//SleepValues.qml:95
-#: ../plugins/battery//SleepValues.qml:99
-#: ../plugins/battery//SleepValues.qml:103
-#: ../plugins/security-privacy//PageComponent.qml:137
-#: ../plugins/security-privacy//PageComponent.qml:146
-#, qt-format
-msgid "After %1 minute"
-msgid_plural "After %1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+#. TRANSLATORS: “Wi-Fi used for hotspot” is hidden.
+#: ../plugins/battery/PageComponent.qml:342
+msgid "Wi-Fi used for hotspot"
+msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: ../plugins/battery//PageComponent.qml:363
-#: ../plugins/bluetooth//PageComponent.qml:32
-#: ../plugins/bluetooth//PageComponent.qml:147
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:254
+#: ../plugins/battery/PageComponent.qml:376
+#: ../plugins/bluetooth/PageComponent.qml:33
+#: ../plugins/bluetooth/PageComponent.qml:219 ../build/po/settings.js:262
 msgid "Bluetooth"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:394
+#: ../plugins/battery/PageComponent.qml:409
 msgid "GPS"
 msgstr ""
 
-#: ../plugins/battery//PageComponent.qml:412
+#: ../plugins/battery/PageComponent.qml:430
 msgid "Accurate location detection requires GPS and/or Wi-Fi."
 msgstr ""
 
-#: ../plugins/battery//SleepValues.qml:77
-msgid "Lock the phone when it's not in use:"
-msgstr ""
-
-#: ../plugins/battery//SleepValues.qml:77
-msgid "Put the phone to sleep when it is not in use:"
-msgstr ""
-
-#: ../plugins/battery//SleepValues.qml:117
-msgid ""
-"Shorter times are more secure. Phone won't lock during calls or video "
-"playback."
-msgstr ""
-
-#: ../plugins/battery//SleepValues.qml:117
-msgid "Phone won’t sleep during calls or video playback."
-msgstr ""
-
-#: ../plugins/language//SpellChecking.qml:27
-#: ../plugins/language//SpellChecking.qml:36
-#: ../plugins/language//PageComponent.qml:132
-#: ../plugins/language//PageComponent.qml:142
-msgid "Spell checking"
-msgstr ""
-
-#: ../plugins/language//SpellChecking.qml:53
-msgid "Current spelling languages:"
-msgstr ""
-
-#: ../plugins/language//SpellChecking.qml:54
-msgid "All languages available:"
-msgstr ""
-
-#: ../plugins/language//RebootNecessary.qml:38
-msgid "Restart Now"
-msgstr ""
-
-#: ../plugins/language//DisplayLanguage.qml:36
-msgid "Display language"
-msgstr ""
-
-#: ../plugins/language//DisplayLanguage.qml:118
-msgid "Confirm"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: ../plugins/language//PageComponent.qml:34
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:114
-msgid "Language & Text"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:100
-msgid "Display language…"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:117
-#: ../plugins/language//KeyboardLayouts.qml:26
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:152
-msgid "Auto correction"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:162
-msgid "Word suggestions"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:175
-msgid "Auto capitalization"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:185
-msgid "Turns on Shift to capitalize the first letter of each sentence."
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:192
-msgid "Auto punctuation"
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:202
-msgid ""
-"Adds a period, and any missing quotes or brackets, when you tap Space twice."
-msgstr ""
-
-#: ../plugins/language//PageComponent.qml:219
-msgid "Keyboard vibration"
-msgstr ""
-
-#: ../plugins/language//KeyboardLayouts.qml:39
-msgid "Current layouts:"
-msgstr ""
-
-#: ../plugins/language//KeyboardLayouts.qml:40
-msgid "All layouts available:"
-msgstr ""
-
-#: ../plugins/phone//CallWaiting.qml:31 ../plugins/phone//CallWaiting.qml:74
-#: ../plugins/phone//NoSims.qml:34 ../plugins/phone//MultiSim.qml:46
-#: ../plugins/phone//MultiSim.qml:84 ../plugins/phone//SingleSim.qml:40
-msgid "Call waiting"
-msgstr ""
-
-#: ../plugins/phone//CallWaiting.qml:89
-msgid ""
-"Lets you answer or start a new call while on another call, and switch "
-"between them"
-msgstr ""
-
-#. TRANSLATORS: %1 is the name of the (network) carrier
-#: ../plugins/phone//Services.qml:34 ../plugins/phone//SingleSim.qml:51
-#, qt-format
-msgid "%1 Services"
-msgstr ""
-
-#: ../plugins/phone//CallForwarding.qml:32
-#: ../plugins/phone//CallForwarding.qml:76 ../plugins/phone//NoSims.qml:28
-#: ../plugins/phone//MultiSim.qml:36 ../plugins/phone//MultiSim.qml:74
-#: ../plugins/phone//SingleSim.qml:33
-msgid "Call forwarding"
-msgstr ""
-
-#: ../plugins/phone//CallForwarding.qml:91
-msgid ""
-"Redirects phone calls to another number whenever you don't answer, or your "
-"phone is busy, turned off, or out of range."
-msgstr ""
-
-#: ../plugins/phone//CallForwarding.qml:101
-msgid "Forward to"
-msgstr ""
-
-#: ../plugins/phone//ServiceInfo.qml:109
-#, qt-format
-msgid "Last called %1"
-msgstr ""
-
-#: ../plugins/phone//ServiceInfo.qml:119
-msgid "Call"
-msgstr ""
-
-#: ../plugins/phone//NoSims.qml:42 ../plugins/phone//MultiSim.qml:56
-#: ../plugins/phone//MultiSim.qml:94
-msgid "Services"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: ../plugins/phone//PageComponent.qml:32
-#: ../plugins/bluetooth//PageComponent.qml:93
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:140
-msgid "Phone"
-msgstr ""
-
-#: ../plugins/phone//SingleSim.qml:29
-msgid "SIM"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#: ../plugins/brightness//PageComponent.qml:32
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:158
-msgid "Brightness"
-msgstr ""
-
-#: ../plugins/brightness//PageComponent.qml:52
-msgid "Adjust automatically"
-msgstr ""
-
-#: ../plugins/brightness//PageComponent.qml:65
-msgid "Brightens and dims the display to suit the surroundings."
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:30
-#: ../plugins/cellular//Components//SingleSim.qml:58
-#: ../plugins/cellular//Components//SingleSim.qml:67
-#: ../plugins/cellular//Components//NoSim.qml:47
-msgid "Carrier"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:155
-msgid "Choose carrier:"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:156
-#: ../plugins/time-date//ChooseTimeZone.qml:47
-#: ../plugins/time-date//PageComponent.qml:69
-msgid "Automatically"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:156
-#: ../plugins/security-privacy//PageComponent.qml:149
-#: ../plugins/time-date//ChooseTimeZone.qml:47
-#: ../plugins/time-date//PageComponent.qml:69
-msgid "Manually"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:196
-msgid "Searching for carriers…"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarrier.qml:229
-#: ../plugins/cellular//PageChooseApn.qml:31
-#: ../plugins/cellular//Components//SingleSim.qml:73
-msgid "APN"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:372
-msgid "Internet APN:"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:449
-msgid "Custom Internet APN…"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:460
-msgid "MMS APN:"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:485
-#: ../plugins/cellular//CustomApnEditor.qml:143
-msgid "Same APN as for Internet"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:565
-msgid "Custom MMS APN…"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:591
-msgid "Reset APN Settings"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:592
-msgid "Are you sure that you want to Reset APN Settings?"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseApn.qml:598
-msgid "Reset"
-msgstr ""
-
-#: ../plugins/cellular//PageChooseCarriers.qml:27
-#: ../plugins/cellular//Components//MultiSim.qml:68
-msgid "Carriers"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:42
-msgid "Internet"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:42
-msgid "MMS"
-msgstr ""
-
-#. TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
-#: ../plugins/cellular//CustomApnEditor.qml:67
-#, qt-format
-msgid "Custom %1 APN"
-msgstr ""
-
-#. TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
-#: ../plugins/cellular//CustomApnEditor.qml:171
-#, qt-format
-msgid "%1 APN"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:181
-msgid "MMSC"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:191
-msgid "Proxy"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:213
-msgid "Username"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:264
-msgid "Save"
-msgstr ""
-
-#: ../plugins/cellular//CustomApnEditor.qml:264
-msgid "Activate"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: ../plugins/cellular//PageComponent.qml:32
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:170
-msgid "Cellular"
-msgstr ""
-
-#: ../plugins/cellular//Hotspot.qml:29
-#: ../plugins/cellular//Components//MultiSim.qml:48
-#: ../plugins/cellular//Components//SingleSim.qml:43
-msgid "Wi-Fi hotspot"
-msgstr ""
-
-#: ../plugins/cellular//Hotspot.qml:40
-msgid "Hotspot"
-msgstr ""
-
-#: ../plugins/cellular//Hotspot.qml:60
-msgid ""
-"When hotspot is on, other devices can use your cellular data connection over "
-"Wi-Fi. Normal data charges apply."
-msgstr ""
-
-#: ../plugins/cellular//Hotspot.qml:61
-msgid ""
-"Other devices can use your cellular data connection over the Wi-Fi network. "
-"Normal data charges apply."
-msgstr ""
-
-#: ../plugins/cellular//Hotspot.qml:65
-msgid "Set up hotspot"
-msgstr ""
-
-#: ../plugins/cellular//HotspotSetup.qml:29
-msgid "Change hotspot setup"
-msgstr ""
-
-#: ../plugins/cellular//HotspotSetup.qml:40
-msgid "Hotspot name"
-msgstr ""
-
-#: ../plugins/cellular//HotspotSetup.qml:54
-msgid "Key (must be 8 characters or longer)"
-msgstr ""
-
-#: ../plugins/cellular//HotspotSetup.qml:68
-msgid "Show key"
-msgstr ""
-
-#: ../plugins/cellular//HotspotSetup.qml:94
-#: ../plugins/security-privacy//LockSecurity.qml:302
-#: ../plugins/security-privacy//SimPin.qml:157
-msgid "Change"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:32
-#: ../plugins/security-privacy//PhoneLocking.qml:49
-#: ../plugins/about//DevMode.qml:116
-#: ../wizard/qml/Pages//30-passwd-type.qml:37
-msgid "Lock security"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:96
-#: ../plugins/security-privacy//LockSecurity.qml:384
-msgid "Change passcode…"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:98
-#: ../plugins/security-privacy//LockSecurity.qml:385
-msgid "Change passphrase…"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:105
-msgid "Switch to swipe"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:107
-msgid "Switch to passcode"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:109
-msgid "Switch to passphrase"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:118
-msgid "Existing passcode"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:120
-msgid "Existing passphrase"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:174
-msgid "Choose passcode"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:176
-msgid "Choose passphrase"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:220
-#: ../wizard/qml/Pages//passwd-confirm.qml:48
-msgid "Confirm passcode"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:222
-#: ../wizard/qml/Pages//passwd-confirm.qml:47
-msgid "Confirm passphrase"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:265
-msgid "Those passcodes don't match. Try again."
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:268
-msgid "Those passphrases don't match. Try again."
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:299
-msgid "Unset"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:344
-msgid "Unlock the phone using:"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:348
-msgid "Swipe (no security)"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:349
-msgid "4-digit passcode"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:350
-#: ../plugins/security-privacy//PhoneLocking.qml:47
-#: ../wizard/qml/Pages//30-passwd-type.qml:98
-msgid "Passphrase"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:351
-msgid "Swipe (no security)… "
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:352
-msgid "4-digit passcode…"
-msgstr ""
-
-#: ../plugins/security-privacy//LockSecurity.qml:353
-msgid "Passphrase…"
-msgstr ""
-
-#: ../plugins/security-privacy//SimPin.qml:34
-#: ../plugins/security-privacy//SimPin.qml:322
-#: ../plugins/security-privacy//PageComponent.qml:158
+#: ../plugins/security-privacy/here-terms.qml:24
+msgid "Nokia HERE"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:28
+#: ../plugins/security-privacy/PageComponent.qml:208
+msgid "App permissions"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:46
+msgid "Apps that you have granted access to:"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:52
+#: ../plugins/bluetooth/DevicePage.qml:60
+msgid "Camera"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:53
+msgid "Apps that have requested access to your camera"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:57
+#: ../plugins/security-privacy/PageComponent.qml:190
+#: ../plugins/security-privacy/Location.qml:32
+msgid "Location"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:58
+msgid "Apps that have requested access to your location"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:62
+msgid "Microphone"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:63
+msgid "Apps that have requested access to your microphone"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:67
+msgid "In-App Purchases"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:68
+msgid "Apps that have requested access for in-app purchases"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:81
+#, qt-format
+msgid "%1/%2"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:82
+msgid "0"
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:97
+msgid "Apps may also request access to online accounts."
+msgstr ""
+
+#: ../plugins/security-privacy/AppAccess.qml:102
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../plugins/security-privacy/SimPin.qml:36
+#: ../plugins/security-privacy/SimPin.qml:397
+#: ../plugins/security-privacy/PageComponent.qml:127
 msgid "SIM PIN"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:44
+#: ../plugins/security-privacy/SimPin.qml:46
 msgid "Change SIM PIN"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:47
+#: ../plugins/security-privacy/SimPin.qml:51
+#: ../plugins/security-privacy/SimPin.qml:218
 #, qt-format
 msgid "Incorrect PIN. %1 attempt remaining."
 msgid_plural "Incorrect PIN. %1 attempts remaining."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/security-privacy//SimPin.qml:81
+#: ../plugins/security-privacy/SimPin.qml:56
+#: ../plugins/security-privacy/SimPin.qml:118
+#: ../plugins/security-privacy/SimPin.qml:223
+#: ../plugins/security-privacy/SimPin.qml:296
+msgid "No more attempts allowed"
+msgstr ""
+
+#: ../plugins/security-privacy/SimPin.qml:91
 msgid "Current PIN:"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:93
+#: ../plugins/security-privacy/SimPin.qml:113
+#: ../plugins/security-privacy/SimPin.qml:291
 #, qt-format
 msgid "%1 attempt allowed."
 msgid_plural "%1 attempts allowed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/security-privacy//SimPin.qml:107
+#: ../plugins/security-privacy/SimPin.qml:133
 msgid "Choose new PIN:"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:118
+#: ../plugins/security-privacy/SimPin.qml:144
 msgid "Confirm new PIN:"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:137
+#: ../plugins/security-privacy/SimPin.qml:166
 msgid "PINs don't match. Try again."
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:183
+#: ../plugins/security-privacy/SimPin.qml:212
 msgid "Enter SIM PIN"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:184
+#: ../plugins/security-privacy/SimPin.qml:213
 msgid "Enter Previous SIM PIN"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:187
-#, qt-format
-msgid "Incorrect PIN. %1 attempts remaining."
-msgstr ""
-
-#: ../plugins/security-privacy//SimPin.qml:246
-#, qt-format
-msgid "%1 attempts allowed."
-msgstr ""
-
-#: ../plugins/security-privacy//SimPin.qml:282
+#: ../plugins/security-privacy/SimPin.qml:334
 msgid "Unlock"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:282
+#: ../plugins/security-privacy/SimPin.qml:334
 msgid "Lock"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:340
+#: ../plugins/security-privacy/SimPin.qml:412
+msgid "Unlocked"
+msgstr ""
+
+#: ../plugins/security-privacy/SimPin.qml:415
 msgid "Change PIN…"
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:357
+#: ../plugins/security-privacy/SimPin.qml:426
+msgid "Locked"
+msgstr ""
+
+#: ../plugins/security-privacy/SimPin.qml:430
+msgid "Unlock…"
+msgstr ""
+
+#: ../plugins/security-privacy/SimPin.qml:444
 msgid ""
 "When a SIM PIN is set, it must be entered to access cellular services after "
 "restarting the phone or swapping the SIM."
 msgstr ""
 
-#: ../plugins/security-privacy//SimPin.qml:361
+#: ../plugins/security-privacy/SimPin.qml:448
 msgid "Entering an incorrect PIN repeatedly may lock the SIM permanently."
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:31
-msgid "Phone locking"
+#: ../plugins/security-privacy/PhoneLocking.qml:31
+#: ../plugins/security-privacy/PageComponent.qml:120
+msgid "Locking and unlocking"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:45
+#: ../plugins/security-privacy/PhoneLocking.qml:56
 msgctxt "Unlock with swipe"
 msgid "None"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:46
-#: ../wizard/qml/Pages//30-passwd-type.qml:95
+#: ../plugins/security-privacy/PhoneLocking.qml:57
 msgid "Passcode"
 msgstr ""
 
+#: ../plugins/security-privacy/PhoneLocking.qml:58
+#: ../plugins/security-privacy/LockSecurity.qml:451
+msgid "Passphrase"
+msgstr ""
+
+#: ../plugins/security-privacy/PhoneLocking.qml:61
+#: ../plugins/security-privacy/LockSecurity.qml:33
+#: ../plugins/about/DevMode.qml:116
+msgid "Lock security"
+msgstr ""
+
 #. TRANSLATORS: %1 is the number of minutes
-#: ../plugins/security-privacy//PhoneLocking.qml:75
-#: ../plugins/security-privacy//PhoneLocking.qml:84
+#: ../plugins/security-privacy/PhoneLocking.qml:87
+#: ../plugins/security-privacy/PhoneLocking.qml:96
 #, qt-format
 msgid "%1 minute"
 msgid_plural "%1 minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:101
+#: ../plugins/security-privacy/PhoneLocking.qml:113
 msgid "Sleep locks immediately"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:106
+#: ../plugins/security-privacy/PhoneLocking.qml:118
 msgid "When locked, allow:"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:110
+#: ../plugins/security-privacy/PhoneLocking.qml:122
 msgid "Launcher"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:120
+#: ../plugins/security-privacy/PhoneLocking.qml:135
 msgid "Notifications and quick settings"
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:131
+#: ../plugins/security-privacy/PhoneLocking.qml:149
 msgid "Turn on lock security to restrict access when the phone is locked."
 msgstr ""
 
-#: ../plugins/security-privacy//PhoneLocking.qml:132
+#: ../plugins/security-privacy/PhoneLocking.qml:150
 msgid "Other apps and functions will prompt you to unlock."
 msgstr ""
 
+#: ../plugins/security-privacy/LockSecurity.qml:128
+#: ../plugins/security-privacy/LockSecurity.qml:497
+msgid "Change passcode…"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:130
+#: ../plugins/security-privacy/LockSecurity.qml:498
+msgid "Change passphrase…"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:137
+msgid "Switch to swipe"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:139
+msgid "Switch to passcode"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:141
+msgid "Switch to passphrase"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:150
+msgid "Existing passcode"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:152
+msgid "Existing passphrase"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:222
+msgid "Choose passcode"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:224
+msgid "Choose passphrase"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:282
+msgid "Confirm passcode"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:284
+msgid "Confirm passphrase"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:339
+msgid "Those passcodes don't match. Try again."
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:342
+msgid "Those passphrases don't match. Try again."
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:373
+msgid "Unset"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:445
+msgid "Unlock the phone using:"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:449
+msgid "Swipe (no security)"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:450
+msgid "4-digit passcode"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:452
+msgid "Swipe (no security)… "
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:453
+msgid "4-digit passcode…"
+msgstr ""
+
+#: ../plugins/security-privacy/LockSecurity.qml:454
+msgid "Passphrase…"
+msgstr ""
+
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: ../plugins/security-privacy//PageComponent.qml:37
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:218
+#: ../plugins/security-privacy/PageComponent.qml:37 ../build/po/settings.js:96
 msgid "Security & Privacy"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:100
-#: ../plugins/security-privacy//PageComponent.qml:218
-#: ../plugins/security-privacy//Dash.qml:46
+#: ../plugins/security-privacy/PageComponent.qml:89
 msgid "Phone and Internet"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:102
-#: ../plugins/security-privacy//PageComponent.qml:219
-#: ../plugins/security-privacy//Dash.qml:46
+#: ../plugins/security-privacy/PageComponent.qml:91
 msgid "Phone only"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:131
-msgid "Lock phone"
-msgstr ""
-
-#: ../plugins/security-privacy//PageComponent.qml:161
-#: ../plugins/security-privacy//PageComponent.qml:244
+#: ../plugins/security-privacy/PageComponent.qml:130
+#: ../plugins/security-privacy/PageComponent.qml:199
 msgid "On"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:165
-#: ../plugins/security-privacy//PageComponent.qml:244
-#: ../plugins/cellular//Components//CellularMultiSim.qml:30
-#: ../plugins/cellular//Components//NoSim.qml:32
-#: ../plugins/cellular//Components//CellularSingleSim.qml:50
-msgid "Off"
-msgstr ""
-
-#: ../plugins/security-privacy//PageComponent.qml:172
+#: ../plugins/security-privacy/PageComponent.qml:141
 msgid "Encryption"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:181
+#: ../plugins/security-privacy/PageComponent.qml:150
 msgid ""
 "Encryption protects against access to phone data when the phone is connected "
 "to a PC or other device."
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:185
+#: ../plugins/security-privacy/PageComponent.qml:154
 msgid "Privacy"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:188
+#: ../plugins/security-privacy/PageComponent.qml:157
 msgid "Stats on welcome screen"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:201
+#: ../plugins/security-privacy/PageComponent.qml:167
 msgid "Messages on welcome screen"
 msgstr ""
 
-#: ../plugins/security-privacy//PageComponent.qml:216
-#: ../plugins/security-privacy//Dash.qml:29
-msgid "Dash search"
-msgstr ""
-
-#: ../plugins/security-privacy//PageComponent.qml:235
-msgid "Location access"
-msgstr ""
-
-#: ../plugins/security-privacy//PageComponent.qml:253
-#: ../plugins/security-privacy//AppAccess.qml:28
-msgid "Other app access"
-msgstr ""
-
-#: ../plugins/security-privacy//PageComponent.qml:258
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:30
+#: ../plugins/security-privacy/PageComponent.qml:213
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:30
 msgid "Diagnostics"
 msgstr ""
 
 #. TRANSLATORS: This string is shown when crash
 #. reports are to be sent by the system.
-#: ../plugins/security-privacy//PageComponent.qml:263
+#: ../plugins/security-privacy/PageComponent.qml:218
 msgid "Sent"
 msgstr ""
 
 #. TRANSLATORS: This string is shown when crash
 #. reports are not to be sent by the system
-#: ../plugins/security-privacy//PageComponent.qml:266
+#: ../plugins/security-privacy/PageComponent.qml:221
 msgid "Not sent"
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:31
-#: ../wizard/qml/Pages//50-location.qml:25
-msgid "Location"
-msgstr ""
-
-#: ../plugins/security-privacy//Location.qml:59
-msgid "Location detection"
-msgstr ""
-
-#: ../plugins/security-privacy//Location.qml:81
+#: ../plugins/security-privacy/Location.qml:94
+msgid "Let the phone detect your location:"
+msgstr ""
+
+#: ../plugins/security-privacy/Location.qml:173
+msgid "Using GPS only (less accurate)"
+msgstr ""
+
+#: ../plugins/security-privacy/Location.qml:174
+msgid "Using GPS"
+msgstr ""
+
+#. TRANSLATORS: %1 is the resource wherein HERE
+#. terms and conditions reside (typically a qml file).
+#. HERE is a Nokia trademark, so it should probably
+#. not be translated.
+#: ../plugins/security-privacy/Location.qml:185
+#, qt-format
+msgid ""
+"Using GPS, anonymized Wi-Fi and cellular network info.<br>By selecting this "
+"option you accept the <a href='%1'>Nokia HERE terms and conditions</a>."
+msgstr ""
+
+#: ../plugins/security-privacy/Location.qml:191
+msgid "Not at all"
+msgstr ""
+
+#: ../plugins/security-privacy/Location.qml:208
 msgid ""
 "Uses GPS to detect your rough location. When off, GPS turns off to save "
 "battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:83
+#: ../plugins/security-privacy/Location.qml:210
 msgid ""
 "Uses wi-fi and GPS to detect your rough location. Turning off location "
 "detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:85
+#: ../plugins/security-privacy/Location.qml:212
 msgid ""
 "Uses wi-fi (currently off) and GPS to detect your rough location. Turning "
 "off location detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:87
+#: ../plugins/security-privacy/Location.qml:214
 msgid ""
 "Uses wi-fi, cell tower locations, and GPS to detect your rough location. "
 "Turning off location detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:89
+#: ../plugins/security-privacy/Location.qml:216
 msgid ""
 "Uses wi-fi, cell tower locations (no current cellular connection), and GPS "
 "to detect your rough location. Turning off location detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:91
+#: ../plugins/security-privacy/Location.qml:218
 msgid ""
 "Uses wi-fi (currently off), cell tower locations, and GPS to detect your "
 "rough location. Turning off location detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:93
+#: ../plugins/security-privacy/Location.qml:220
 msgid ""
 "Uses wi-fi (currently off), cell tower locations (no current cellular "
 "connection), and GPS to detect your rough location. Turning off location "
 "detection saves battery."
 msgstr ""
 
-#: ../plugins/security-privacy//Location.qml:100
-msgid "Allow access to location:"
-msgstr ""
-
-#: ../plugins/security-privacy//Dash.qml:45
-msgid "Return results from:"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:35
-msgid "Apps that you have granted and have requested access to:"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:41
-#: ../plugins/bluetooth//PageComponent.qml:105
-msgid "Camera"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:42
-msgid "Apps that have requested access to your camera"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:46
-msgid "Mic"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:47
-msgid "Apps that have requested access to your mic"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:59
-#, qt-format
-msgid "%1/%2"
-msgstr ""
-
-#: ../plugins/security-privacy//AppAccess.qml:60
-msgid "0"
-msgstr ""
-
-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:28
-#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:28
-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:28
+#: ../plugins/security-privacy/Location.qml:227
+msgid "Let apps access this location:"
+msgstr ""
+
+#: ../plugins/security-privacy/Location.qml:250
+msgid "None requested"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../plugins/sound/PageComponent.qml:38 ../build/po/settings.js:120
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:84
+msgid "Silent Mode"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:88
+msgid "Ringer:"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:129
+msgid "High volume can damage your hearing."
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:133
+msgid "Phone calls:"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:137
+#: ../plugins/sound/PageComponent.qml:143
+msgid "Ringtone"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:158
+msgid "Vibrate on ring"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:169
+#: ../plugins/sound/PageComponent.qml:219
+msgid "Vibrate in Silent Mode"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:184
+msgid "Messages:"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:188
+#: ../plugins/sound/PageComponent.qml:194
+msgid "Message received"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:208
+msgid "Vibrate with message sound"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:223
+msgid "Other sounds:"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:227
+#: ../plugins/language/PageComponent.qml:216
+msgid "Keyboard sound"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:243
+msgid "Lock sound"
+msgstr ""
+
+#: ../plugins/sound/PageComponent.qml:250
+msgid "Other vibrations"
+msgstr ""
+
+#: ../plugins/sound/SoundsList.qml:127
+msgid "Custom Ringtone"
+msgstr ""
+
+#: ../plugins/sound/SoundsList.qml:207
+msgid "Choose from"
+msgstr ""
+
+#: ../plugins/about/DevMode.qml:35 ../plugins/about/DevMode.qml:90
+msgid "Developer Mode"
+msgstr ""
+
+#: ../plugins/about/DevMode.qml:84
+msgid ""
+"In Developer Mode, anyone can access, change or delete anything on this "
+"phone by connecting it to another device."
+msgstr ""
+
+#: ../plugins/about/DevMode.qml:110
+msgid "You need a passcode or passphrase set to use Developer Mode."
+msgstr ""
+
+#: ../plugins/about/Version.qml:36
+msgid "OS Build Details"
+msgstr ""
+
+#: ../plugins/about/Version.qml:63
+msgid "OS build number"
+msgstr ""
+
+#: ../plugins/about/Version.qml:69
+msgid "Ubuntu Image part"
+msgstr ""
+
+#: ../plugins/about/Version.qml:77
+msgid "Ubuntu build description"
+msgstr ""
+
+#: ../plugins/about/Version.qml:83
+msgid "Device Image part"
+msgstr ""
+
+#: ../plugins/about/Version.qml:90
+msgid "Device build description"
+msgstr ""
+
+#: ../plugins/about/Version.qml:97
+msgid "Customization Image part"
+msgstr ""
+
+#: ../plugins/about/Software.qml:11 ../plugins/about/PageComponent.qml:214
+msgid "Software licenses"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:33 ../plugins/about/PageComponent.qml:149
+msgid "Storage"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:85
+msgid "Used by Ubuntu"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:86
+msgid "Videos"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:87
+msgid "Audio"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:88
+msgid "Pictures"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:89
+msgid "Other files"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:90
+msgid "Used by apps"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:136
+msgid "Total storage"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:148
+msgid "Free space"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:168
+msgid "By name"
+msgstr ""
+
+#: ../plugins/about/Storage.qml:168
+msgid "By size"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#: ../plugins/about/PageComponent.qml:34 ../build/po/settings.js:150
+msgid "About this phone"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:99
+msgid "Serial"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:130
+msgid "Wi-Fi address"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:138
+msgid "Bluetooth address"
+msgstr ""
+
+#. TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit
+#: ../plugins/about/PageComponent.qml:151
+#, qt-format
+msgid "%1 free"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:158
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:169
+msgid "OS"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:181
+msgid "Last updated"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:189
+msgid "Check for updates"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:209
+msgid "Legal:"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:222
+msgid "Regulatory info"
+msgstr ""
+
+#: ../plugins/about/PageComponent.qml:230
+msgid "Developer mode"
+msgstr ""
+
+#: ../plugins/about/License.qml:30
+msgid "Sorry, this license could not be displayed."
+msgstr ""
+
+#: ../plugins/cellular/PageCarriersAndApns.qml:27
+#: ../plugins/cellular/Components/MultiSim.qml:66
+msgid "Carriers"
+msgstr ""
+
+#: ../plugins/cellular/PageCarriersAndApns.qml:48
+#: ../plugins/cellular/PageCarriersAndApns.qml:74
+#: ../plugins/cellular/PageChooseCarrier.qml:32
+#: ../plugins/cellular/PageChooseCarrier.qml:129
+#: ../plugins/cellular/PageCarrierAndApn.qml:27
+#: ../plugins/cellular/PageCarrierAndApn.qml:44
+#: ../plugins/cellular/PageCarrierAndApn.qml:52
+#: ../plugins/cellular/Components/SingleSim.qml:81
+msgid "Carrier"
+msgstr ""
+
+#. TRANSLATORS: This string is a description of a text
+#. field and should thus be concise.
+#: ../plugins/cellular/PageCarriersAndApns.qml:62
+#: ../plugins/cellular/PageCarriersAndApns.qml:88
+#: ../plugins/cellular/PageApnEditor.qml:205
+#: ../plugins/cellular/PageChooseApn.qml:37
+#: ../plugins/cellular/PageCarrierAndApn.qml:57
+msgid "APN"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseCarrier.qml:153
+#: ../plugins/time-date/PageComponent.qml:84
+#: ../plugins/time-date/ChooseTimeZone.qml:49
+msgid "Automatically"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:70
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:70
+msgid "New APN"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:156
+msgid "Used for:"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:160
+#: ../plugins/cellular/PageChooseApn.qml:85
+msgid "Internet and MMS"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:161
+#: ../plugins/cellular/PageChooseApn.qml:87
+msgid "Internet"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:162
+#: ../plugins/cellular/PageChooseApn.qml:91
+msgid "MMS"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:163
+#: ../plugins/cellular/PageChooseApn.qml:89
+msgid "LTE"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:189
+msgid "Enter a name describing the APN"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:214
+msgid "Enter the name of the access point"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:228
+msgid "MMSC"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:237
+msgid "Enter message center"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:255
+msgid "Proxy"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:264
+msgid "Enter message proxy"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:309
+msgid "Proxy port"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:319
+msgid "Enter message proxy port"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:337
+msgid "User name"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:346
+msgid "Enter username"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:370
+msgid "Enter password"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:389
+msgid "PAP or CHAP"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:390
+msgid "PAP only"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:391
+msgid "CHAP only"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:402
+msgid "Protocol"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:406
+msgid "IPv4"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:407
+msgid "IPv6"
+msgstr ""
+
+#: ../plugins/cellular/PageApnEditor.qml:408
+msgid "IPv4v6"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:63
+msgid "MMS APN"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:69
+msgid "Internet APN"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:75
+msgid "LTE APN"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:149
+msgid "Reset All APN Settings…"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:158
+msgid "Reset APN Settings"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:159
+msgid "Are you sure that you want to Reset APN Settings?"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:162
+msgid "Reset"
+msgstr ""
+
+#. TRANSLATORS: %1 is the MMS APN that the user has chosen to be
+#. “preferred”.
+#. TRANSLATORS: %1 is the Internet APN that the user has chosen to
+#. be “preferred”.
+#: ../plugins/cellular/PageChooseApn.qml:185
+#: ../plugins/cellular/PageChooseApn.qml:216
+#, qt-format
+msgid "Prefer %1"
+msgstr ""
+
+#. TRANSLATORS: %1 is the MMS APN that the user has chosen to be
+#. “preferred”, i.e. used to retrieve MMS messages. %2 is the Internet
+#. APN that will be “de-preferred” as a result of this action.
+#: ../plugins/cellular/PageChooseApn.qml:189
+#, qt-format
+msgid "You have chosen %1 as your preferred MMS APN. "
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:194
+#: ../plugins/cellular/PageChooseApn.qml:259
+#: ../plugins/bluetooth/DevicePage.qml:168
+msgid "Disconnect"
+msgstr ""
+
+#. TRANSLATORS: %1 is the Internet APN that the user has chosen to
+#. be “preferred”, i.e. used to connect to the Internet. %2 is the MMS
+#. APN that will be “de-preferred” as a result of this action.
+#: ../plugins/cellular/PageChooseApn.qml:220
+#, qt-format
+msgid "You have chosen %1 as your preferred Internet APN. "
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:225
+#: ../plugins/cellular/PageChooseApn.qml:258
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:247
+#, qt-format
+msgid "Disconnect %1"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:248
+#, qt-format
+msgid "Disable %1"
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:253
+#, qt-format
+msgid "This disconnects %1."
+msgstr ""
+
+#: ../plugins/cellular/PageChooseApn.qml:254
+#, qt-format
+msgid "This disables %1."
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../plugins/cellular/PageComponent.qml:33 ../build/po/settings.js:186
+msgid "Cellular"
+msgstr ""
+
+#: ../plugins/language/KeyboardLayouts.qml:26
+#: ../plugins/language/PageComponent.qml:118
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../plugins/language/KeyboardLayouts.qml:39
+msgid "Current layouts:"
+msgstr ""
+
+#: ../plugins/language/KeyboardLayouts.qml:40
+msgid "All layouts available:"
+msgstr ""
+
+#: ../plugins/language/RebootNecessary.qml:34
+msgid "The phone needs to restart for changes to take effect."
+msgstr ""
+
+#: ../plugins/language/RebootNecessary.qml:38
+msgid "Restart Now"
+msgstr ""
+
+#: ../plugins/language/DisplayLanguage.qml:36
+msgid "Display language"
+msgstr ""
+
+#: ../plugins/language/DisplayLanguage.qml:116
+msgid "Confirm"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../plugins/language/PageComponent.qml:34 ../build/po/settings.js:220
+msgid "Language & Text"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:101
+msgid "Display language…"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:133
+#: ../plugins/language/PageComponent.qml:143
+#: ../plugins/language/SpellChecking.qml:29
+#: ../plugins/language/SpellChecking.qml:44
+msgid "Spell checking"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:154
+msgid "Auto correction"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:165
+msgid "Word suggestions"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:179
+msgid "Auto capitalization"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:190
+msgid "Turns on Shift to capitalize the first letter of each sentence."
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:197
+msgid "Auto punctuation"
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:209
+msgid "Inserts a period when you tap Space twice."
+msgstr ""
+
+#: ../plugins/language/PageComponent.qml:227
+msgid "Keyboard vibration"
+msgstr ""
+
+#: ../plugins/language/SpellChecking.qml:62
+msgid "Current spelling languages:"
+msgstr ""
+
+#: ../plugins/language/SpellChecking.qml:63
+msgid "All languages available:"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
+#: ../plugins/background/MainPage.qml:35 ../build/po/settings.js:246
+msgid "Background"
+msgstr ""
+
+#: ../plugins/background/MainPage.qml:99
+msgid "Ubuntu Art"
+msgstr ""
+
+#: ../plugins/background/MainPage.qml:115
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/background/Preview.qml:69
+msgid "Preview"
+msgstr ""
+
+#: ../plugins/background/Preview.qml:101
+msgid "Remove image"
+msgstr ""
+
+#: ../plugins/bluetooth/DisplayPinCodeDialog.qml:26
+#: ../plugins/bluetooth/ProvidePinCodeDialog.qml:28
+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:28
+#: ../plugins/bluetooth/ProvidePasskeyDialog.qml:28
+#: ../plugins/bluetooth/DisplayPasskeyDialog.qml:26
 msgid "Bluetooth Pairing Request"
 msgstr ""
 
-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:36
-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:36
+#. TRANSLATORS: %1 is the name of the bluetooth device being paired
+#: ../plugins/bluetooth/DisplayPinCodeDialog.qml:34
+#: ../plugins/bluetooth/DisplayPasskeyDialog.qml:35
+#, qt-format
+msgid "Please enter the following PIN on %1 and press “Enter” on the keyboard:"
+msgstr ""
+
+#: ../plugins/bluetooth/AuthorizationRequestDialog.qml:26
+msgid "Bluetooth Pairing Authorization Request"
+msgstr ""
+
+#. TRANSLATORS: %1 is the name of the bluetooth device which requires authorization
+#: ../plugins/bluetooth/AuthorizationRequestDialog.qml:34
+#, qt-format
+msgid ""
+"The device %1 wants to pair with this device. Do you want to allow this?"
+msgstr ""
+
+#: ../plugins/bluetooth/AuthorizationRequestDialog.qml:39
+msgid "Allow"
+msgstr ""
+
+#: ../plugins/bluetooth/AuthorizationRequestDialog.qml:46
+msgid "Refuse"
+msgstr ""
+
+#: ../plugins/bluetooth/ProvidePinCodeDialog.qml:36
+#: ../plugins/bluetooth/ProvidePasskeyDialog.qml:36
 #, qt-format
 msgid "PIN for '%1'"
 msgstr ""
 
-#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:62
-#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:63
+#: ../plugins/bluetooth/ProvidePinCodeDialog.qml:63
+#: ../plugins/bluetooth/ProvidePasskeyDialog.qml:62
 msgid "Pair"
 msgstr ""
 
-#. TRANSLATORS: %1 is the name of the bluetooth device being paired
-#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:37
-#, qt-format
-msgid "Please confirm that the PIN displayed on '%1' matches this one"
-msgstr ""
-
-#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:57
-msgid "Confirm PIN"
-msgstr ""
-
-#: ../plugins/bluetooth//PageComponent.qml:82
+#: ../plugins/bluetooth/DevicePage.qml:37
 msgid "Connected"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:83
+#: ../plugins/bluetooth/DevicePage.qml:38
 msgid "Connecting…"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:84
+#: ../plugins/bluetooth/DevicePage.qml:39
 msgid "Disconnecting…"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:85
+#: ../plugins/bluetooth/DevicePage.qml:40
 msgid "Disconnected"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:92
+#: ../plugins/bluetooth/DevicePage.qml:47
 msgid "Computer"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:94
+#: ../plugins/bluetooth/DevicePage.qml:49
 msgid "Modem"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:95 ../src/qml/MainWindow.qml:147
+#: ../plugins/bluetooth/DevicePage.qml:50 ../src/qml/MainWindow.qml:146
 msgid "Network"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:96
+#: ../plugins/bluetooth/DevicePage.qml:51
 msgid "Headset"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:97
+#: ../plugins/bluetooth/DevicePage.qml:52
 msgid "Headphones"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:98
+#: ../plugins/bluetooth/DevicePage.qml:53
 msgid "Video"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:99
+#: ../plugins/bluetooth/DevicePage.qml:54
 msgid "Other Audio"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:100
+#: ../plugins/bluetooth/DevicePage.qml:55
 msgid "Joypad"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:101
+#: ../plugins/bluetooth/DevicePage.qml:56
 msgid "Keyboard"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:102
+#: ../plugins/bluetooth/DevicePage.qml:57
 msgid "Tablet"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:103
+#: ../plugins/bluetooth/DevicePage.qml:58
 msgid "Mouse"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:104
+#: ../plugins/bluetooth/DevicePage.qml:59
 msgid "Printer"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:106
+#: ../plugins/bluetooth/DevicePage.qml:61
+msgid "Watch"
+msgstr ""
+
+#: ../plugins/bluetooth/DevicePage.qml:62
 msgid "Other"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:112
+#: ../plugins/bluetooth/DevicePage.qml:68
 msgid "Excellent"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:113
+#: ../plugins/bluetooth/DevicePage.qml:69
 msgid "Good"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:114
+#: ../plugins/bluetooth/DevicePage.qml:70
 msgid "Fair"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:115
+#: ../plugins/bluetooth/DevicePage.qml:71
 msgid "Poor"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:182
+#: ../plugins/bluetooth/DevicePage.qml:121
+msgid "Type"
+msgstr ""
+
+#: ../plugins/bluetooth/DevicePage.qml:145
+msgid "Status"
+msgstr ""
+
+#: ../plugins/bluetooth/DevicePage.qml:149
+msgid "Signal Strength"
+msgstr ""
+
+#: ../plugins/bluetooth/DevicePage.qml:154
+#: ../plugins/bluetooth/PageComponent.qml:361
+msgid "Connect automatically when detected:"
+msgstr ""
+
+#: ../plugins/bluetooth/DevicePage.qml:189
+msgid "Forget this device"
+msgstr ""
+
+#. TRANSLATORS: %1 is the name of the bluetooth device being paired
+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:37
+#, qt-format
+msgid "Please confirm that the PIN displayed on '%1' matches this one"
+msgstr ""
+
+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:57
+msgid "Confirm PIN"
+msgstr ""
+
+#: ../plugins/bluetooth/PageComponent.qml:253
 msgid "Discoverable"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:182
+#: ../plugins/bluetooth/PageComponent.qml:253
 msgid "Not discoverable"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:213
+#: ../plugins/bluetooth/PageComponent.qml:283
 msgid "Connected devices:"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:251
+#: ../plugins/bluetooth/PageComponent.qml:320
 msgid "Connect another device:"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:251
+#: ../plugins/bluetooth/PageComponent.qml:320
 msgid "Connect a device:"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:285
+#: ../plugins/bluetooth/PageComponent.qml:354
 msgid "None detected"
 msgstr ""
 
-#: ../plugins/bluetooth//PageComponent.qml:293
-#: ../plugins/bluetooth//PageComponent.qml:397
-msgid "Connect automatically when detected:"
-msgstr ""
-
-#: ../plugins/bluetooth//PageComponent.qml:364
-msgid "Type"
-msgstr ""
-
-#: ../plugins/bluetooth//PageComponent.qml:388
-msgid "Status"
-msgstr ""
-
-#: ../plugins/bluetooth//PageComponent.qml:392
-msgid "Signal Strength"
-msgstr ""
-
-#: ../plugins/bluetooth//PageComponent.qml:429
-msgid "Forget this device"
-msgstr ""
-
-#: ../plugins/about//PhoneNumbers.qml:31
-msgid "Phone number:"
-msgstr ""
-
-#: ../plugins/about//PhoneNumber.qml:36
-msgid "Phone number"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:33 ../plugins/about//PageComponent.qml:143
-msgid "Storage"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:85
-msgid "Used by Ubuntu"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:86
-msgid "Videos"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:87
-msgid "Audio"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:88
-msgid "Pictures"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:89
-msgid "Other files"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:90
-msgid "Used by apps"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:140
-msgid "Total storage"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:152
-msgid "Free space"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:172
-msgid "By name"
-msgstr ""
-
-#: ../plugins/about//Storage.qml:172
-msgid "By size"
-msgstr ""
-
-#: ../plugins/about//DevMode.qml:35 ../plugins/about//DevMode.qml:90
-msgid "Developer Mode"
-msgstr ""
-
-#: ../plugins/about//DevMode.qml:84
-msgid ""
-"In Developer Mode, anyone can access, change or delete anything on this "
-"phone by connecting it to another device."
-msgstr ""
-
-#: ../plugins/about//DevMode.qml:110
-msgid "You need a passcode or passphrase set to use Developer Mode."
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: ../plugins/about//PageComponent.qml:34
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:278
-msgid "About this phone"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:109
-msgid "Serial"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:124
-msgid "Wi-Fi address"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:132
-msgid "Bluetooth address"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:144
-#, qt-format
-msgid "%1 free"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:151
-msgid "Software:"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:156
-msgid "OS"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:165
-msgid "Last updated"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:173
-msgid "Check for updates"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:182
-msgid "Legal:"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:187 ../plugins/about//Software.qml:11
-msgid "Software licenses"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:195
-msgid "Regulatory info"
-msgstr ""
-
-#: ../plugins/about//PageComponent.qml:203
-msgid "Developer mode"
-msgstr ""
-
-#: ../plugins/about//License.qml:30
-msgid "Sorry, this license could not be displayed."
-msgstr ""
-
-#: ../plugins/about//Version.qml:36
-msgid "OS Build Details"
-msgstr ""
-
-#: ../plugins/about//Version.qml:61
-msgid "OS build number"
-msgstr ""
-
-#: ../plugins/about//Version.qml:67
-msgid "Ubuntu Image part"
-msgstr ""
-
-#: ../plugins/about//Version.qml:75
-msgid "Ubuntu build description"
-msgstr ""
-
-#: ../plugins/about//Version.qml:81
-msgid "Device Image part"
-msgstr ""
-
-#: ../plugins/about//Version.qml:88
-msgid "Device build description"
-msgstr ""
-
-#: ../plugins/about//Version.qml:95
-msgid "Customization Image part"
-msgstr ""
-
-#: ../plugins/time-date//ChooseTimeZone.qml:28
-msgid "Time zone"
-msgstr ""
-
-#: ../plugins/time-date//ChooseTimeZone.qml:46
-msgid "Set the time zone:"
-msgstr ""
-
-#: ../plugins/time-date//ChooseTimeZone.qml:126
-msgid "Enter your current location."
-msgstr ""
-
-#: ../plugins/time-date//ChooseTimeZone.qml:127
-msgid "No matching place"
-msgstr ""
-
-#: ../plugins/time-date//TimePicker.qml:26
+#: ../plugins/time-date/TimePicker.qml:26
 msgid "Set time & date"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:68
+#: ../plugins/time-date/TimePicker.qml:68
 msgid "Time"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:81
+#: ../plugins/time-date/TimePicker.qml:81
 msgid "Hour"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:95
+#: ../plugins/time-date/TimePicker.qml:95
 msgid "Minute"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:109
+#: ../plugins/time-date/TimePicker.qml:109
 msgid "Second"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:118
+#: ../plugins/time-date/TimePicker.qml:118
 msgid "Date"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:130
+#: ../plugins/time-date/TimePicker.qml:130
 msgid "Day"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:144
+#: ../plugins/time-date/TimePicker.qml:144
 msgid "Month"
 msgstr ""
 
-#: ../plugins/time-date//TimePicker.qml:162
+#: ../plugins/time-date/TimePicker.qml:162
 msgid "Year"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
-#: ../plugins/time-date//PageComponent.qml:29
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:314
+#: ../plugins/time-date/PageComponent.qml:30 ../build/po/settings.js:286
 msgid "Time & Date"
 msgstr ""
 
-#: ../plugins/time-date//PageComponent.qml:53
+#: ../plugins/time-date/PageComponent.qml:63
 msgid "Time zone:"
 msgstr ""
 
-#: ../plugins/time-date//PageComponent.qml:68
+#: ../plugins/time-date/PageComponent.qml:78
 msgid "Set the time and date:"
 msgstr ""
 
+#: ../plugins/time-date/PageComponent.qml:84
+#: ../plugins/time-date/ChooseTimeZone.qml:49
+msgid "Manually"
+msgstr ""
+
+#: ../plugins/time-date/ChooseTimeZone.qml:28
+msgid "Time zone"
+msgstr ""
+
+#: ../plugins/time-date/ChooseTimeZone.qml:48
+msgid "Set the time zone:"
+msgstr ""
+
+#: ../plugins/time-date/ChooseTimeZone.qml:128
+msgid "Enter your current location."
+msgstr ""
+
+#: ../plugins/time-date/ChooseTimeZone.qml:129
+msgid "No matching place"
+msgstr ""
+
+#: ../plugins/reset/ResetLauncherHome.qml:40
+msgid "The Launcher will be returned to its original contents."
+msgstr ""
+
+#: ../plugins/reset/ResetLauncherHome.qml:44
+#: ../plugins/reset/PageComponent.qml:73
+msgid "Reset Launcher"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
+#: ../plugins/reset/PageComponent.qml:32 ../build/po/settings.js:296
+msgid "Reset phone"
+msgstr ""
+
+#: ../plugins/reset/PageComponent.qml:87
+msgid "Reset all system settings…"
+msgstr ""
+
+#: ../plugins/reset/PageComponent.qml:101
+msgid "Erase & Reset Everything…"
+msgstr ""
+
+#: ../plugins/reset/ResetAllSettings.qml:29
+msgid ""
+"The contents and layout of the launcher, and the filters in the home screen "
+"will be returned to their original settings."
+msgstr ""
+
+#: ../plugins/reset/ResetAllSettings.qml:31
+msgid "Reset all system settings"
+msgstr ""
+
+#: ../plugins/reset/EraseEverything.qml:41
+msgid ""
+"All documents, saved games, settings, and other items will be permanently "
+"deleted from this phone."
+msgstr ""
+
+#: ../plugins/reset/EraseEverything.qml:44
+msgid "Erase & Reset Everything"
+msgstr ""
+
+#: ../plugins/system-update/Configuration.qml:29
+#: ../plugins/system-update/PageComponent.qml:733
+msgid "Auto download"
+msgstr ""
+
+#: ../plugins/system-update/Configuration.qml:34
+msgid "Download future updates automatically:"
+msgstr ""
+
+#: ../plugins/system-update/Configuration.qml:53
+msgid "When on wi-fi"
+msgstr ""
+
+#: ../plugins/system-update/Configuration.qml:54
+msgid "On any data connection"
+msgstr ""
+
+#: ../plugins/system-update/Configuration.qml:55
+msgid "Data charges may apply."
+msgstr ""
+
 #. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
-#: ../plugins/system-update//PageComponent.qml:38
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:326
+#: ../plugins/system-update/PageComponent.qml:37 ../build/po/settings.js:310
 msgid "Updates"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:117
+#: ../plugins/system-update/PageComponent.qml:96
 msgid "Update System"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:118
+#: ../plugins/system-update/PageComponent.qml:97
 msgid "The phone needs to restart to install the system update."
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:118
+#: ../plugins/system-update/PageComponent.qml:97
 msgid "Connect the phone to power before installing the system update."
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:121
-msgid "Install & Restart"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:131
-msgid "Not Now"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:137
+#: ../plugins/system-update/PageComponent.qml:100
+msgid "Restart & Install"
+msgstr ""
+
+#: ../plugins/system-update/PageComponent.qml:116
 msgid "Install"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:152
+#: ../plugins/system-update/PageComponent.qml:131
 msgid "Installation failed"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:156
-#: ../plugins/cellular//Components//SimEditor.qml:200
-msgid "OK"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:176
+#: ../plugins/system-update/PageComponent.qml:155
 msgid "Software is up to date"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:235
-#: ../plugins/system-update//PageComponent.qml:241
+#: ../plugins/system-update/PageComponent.qml:219
+#: ../plugins/system-update/PageComponent.qml:225
 msgid "Sorry, the system update failed."
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:254
+#: ../plugins/system-update/PageComponent.qml:238
 msgid "Restarting…"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:298
+#: ../plugins/system-update/PageComponent.qml:282
 msgid "Checking for updates…"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:298
+#: ../plugins/system-update/PageComponent.qml:282
 msgid "Connect to the Internet to check for updates"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:313
-#: ../plugins/system-update//PageComponent.qml:471
-msgid "Retry"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:338
+#: ../plugins/system-update/PageComponent.qml:303
 #, qt-format
 msgid "Install %1 update…"
 msgid_plural "Install %1 updates…"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/system-update//PageComponent.qml:339
+#: ../plugins/system-update/PageComponent.qml:304
 #, qt-format
 msgid "Install %1 update"
 msgid_plural "Install %1 updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/system-update//PageComponent.qml:340
+#: ../plugins/system-update/PageComponent.qml:305
 msgid "Pause All"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:474
+#: ../plugins/system-update/PageComponent.qml:439
+msgid "Retry"
+msgstr ""
+
+#: ../plugins/system-update/PageComponent.qml:442
 msgid "Install…"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:476
+#: ../plugins/system-update/PageComponent.qml:444
 msgid "Download"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:480
+#: ../plugins/system-update/PageComponent.qml:448
 msgid "Pause"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:482
+#: ../plugins/system-update/PageComponent.qml:450
 msgid "Resume"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:484
+#: ../plugins/system-update/PageComponent.qml:452
 msgid "Update"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:522
+#: ../plugins/system-update/PageComponent.qml:492
 msgid "Installing"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:524
+#: ../plugins/system-update/PageComponent.qml:494
 msgid "Installed"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:525
+#: ../plugins/system-update/PageComponent.qml:495
 msgid "Downloading"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:536
+#: ../plugins/system-update/PageComponent.qml:507
 #, qt-format
 msgid "%1 of %2"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:635
+#: ../plugins/system-update/PageComponent.qml:607
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:667
+#: ../plugins/system-update/PageComponent.qml:639
 msgid "Sign in to Ubuntu One to receive updates for apps."
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:676
+#: ../plugins/system-update/PageComponent.qml:648
 msgid "Sign In…"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:720
+#: ../plugins/system-update/PageComponent.qml:692
 msgid "Installing update…"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:759
-#: ../plugins/system-update//Configuration.qml:29
-msgid "Auto download"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:764
+#: ../plugins/system-update/PageComponent.qml:738
 msgid "On wi-fi"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:766
+#: ../plugins/system-update/PageComponent.qml:740
 msgid "Always"
 msgstr ""
 
-#: ../plugins/system-update//PageComponent.qml:781
-msgid " bytes"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:784
-msgid " KiB"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:787
-msgid " MiB"
-msgstr ""
-
-#: ../plugins/system-update//PageComponent.qml:790
-msgid " GiB"
-msgstr ""
-
-#: ../plugins/system-update//Configuration.qml:34
-msgid "Download future updates automatically:"
-msgstr ""
-
-#: ../plugins/system-update//Configuration.qml:53
-msgid "When on wi-fi"
-msgstr ""
-
-#: ../plugins/system-update//Configuration.qml:54
-msgid "On any data connection"
-msgstr ""
-
-#: ../plugins/system-update//Configuration.qml:55
-msgid "Data charges may apply."
-msgstr ""
-
-#: ../plugins/background//Components//AddRemove.qml:52
-msgid "No images selected"
-msgstr ""
-
-#: ../plugins/background//Components//AddRemove.qml:65
-#, qt-format
-msgid "Remove %1 image"
-msgid_plural "Remove %1 images"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../plugins/background//Components//AddRemove.qml:80
-msgid "Add an image…"
-msgstr ""
-
-#: ../plugins/background//Components//AddRemove.qml:91
-msgid "Remove images…"
-msgstr ""
-
-#: ../plugins/cellular//Components//CellularMultiSim.qml:82
-#: ../plugins/cellular//Components//NoSim.qml:29
-#: ../plugins/cellular//Components//CellularSingleSim.qml:32
-msgid "Cellular data:"
-msgstr ""
-
-#: ../plugins/cellular//Components//CellularMultiSim.qml:138
-#: ../plugins/cellular//Components//NoSim.qml:32
-#: ../plugins/cellular//Components//CellularSingleSim.qml:51
-msgid "2G only (saves battery)"
-msgstr ""
-
-#: ../plugins/cellular//Components//CellularMultiSim.qml:139
-#: ../plugins/cellular//Components//CellularSingleSim.qml:52
-msgid "2G/3G (faster)"
-msgstr ""
-
-#: ../plugins/cellular//Components//CellularMultiSim.qml:140
-#: ../plugins/cellular//Components//NoSim.qml:32
-#: ../plugins/cellular//Components//CellularSingleSim.qml:53
-msgid "2G/3G/4G (faster)"
-msgstr ""
-
-#: ../plugins/cellular//Components//CellularMultiSim.qml:182
-#: ../plugins/cellular//Components//NoSim.qml:37
-#: ../plugins/cellular//Components//CellularSingleSim.qml:72
-msgid "Data roaming"
-msgstr ""
-
-#: ../plugins/cellular//Components//SimEditor.qml:77
-msgid "Edit SIM Name"
-msgstr ""
-
-#: ../plugins/cellular//Components//DefaultSim.qml:31
+#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
+#: ../plugins/notifications/PageComponent.qml:29 ../build/po/settings.js:330
+msgid "Notifications"
+msgstr ""
+
+#: ../plugins/notifications/PageComponent.qml:40
+msgid ""
+"Selected apps can alert you using notification bubbles, sounds, vibrations, "
+"and the Notifications list."
+msgstr ""
+
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:58
+msgid "Privacy policy"
+msgstr ""
+
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:66
+msgid "Report to Canonical:"
+msgstr ""
+
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:80
+msgid "App crashes and errors"
+msgstr ""
+
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:86
+msgid "Previous error reports"
+msgstr ""
+
+#: ../plugins/security-privacy/diagnostics/PageComponent.qml:97
+msgid "Includes info about what an app was doing when it failed."
+msgstr ""
+
+#: ../plugins/cellular/Components/DefaultSim.qml:32
 msgid "Ask me each time"
 msgstr ""
 
-#: ../plugins/cellular//Components//DefaultSim.qml:36
+#: ../plugins/cellular/Components/DefaultSim.qml:35
 msgid "For outgoing calls, use:"
 msgstr ""
 
-#: ../plugins/cellular//Components//DefaultSim.qml:50
+#: ../plugins/cellular/Components/DefaultSim.qml:52
 msgid ""
 "You can change the SIM for individual calls, or for contacts in the address "
 "book."
 msgstr ""
 
-#: ../plugins/cellular//Components//DefaultSim.qml:57
+#: ../plugins/cellular/Components/DefaultSim.qml:57
 msgid "For messages, use:"
 msgstr ""
 
-#: ../plugins/cellular//Components//MultiSim.qml:42
-#: ../plugins/cellular//Components//SingleSim.qml:37
-msgid "Hotspot disabled because Wi-Fi is off."
-msgstr ""
-
-#: ../plugins/cellular//Components//MultiSim.qml:58
-#: ../plugins/cellular//Components//SingleSim.qml:52
+#: ../plugins/cellular/Components/SimEditor.qml:88
+msgid "Edit SIM Name"
+msgstr ""
+
+#: ../plugins/cellular/Components/Sim.qml:42
+msgid "2G only (saves battery)"
+msgstr ""
+
+#: ../plugins/cellular/Components/Sim.qml:43
+msgid "2G/3G (faster)"
+msgstr ""
+
+#: ../plugins/cellular/Components/Sim.qml:44
+msgid "2G/3G/4G (faster)"
+msgstr ""
+
+#: ../plugins/cellular/Components/MultiSim.qml:58
+#: ../plugins/cellular/Components/SingleSim.qml:63
 msgid "Data usage statistics"
 msgstr ""
 
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:51
-msgid "Privacy policy"
-msgstr ""
-
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:59
-msgid "Report to Canonical:"
-msgstr ""
-
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:73
-msgid "App crashes and errors"
-msgstr ""
-
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:79
-msgid "Previous error reports"
-msgstr ""
-
-#: ../plugins/security-privacy//diagnostics//PageComponent.qml:90
-msgid "Includes info about what an app was doing when it failed."
-msgstr ""
-
-#: ../src/qml/MainWindow.qml:133
+#: ../plugins/cellular/Components/MultiSim.qml:92
+#: ../plugins/cellular/Components/RadioSingleSim.qml:31
+msgid "Connection type:"
+msgstr ""
+
+#: ../plugins/cellular/Components/SingleSim.qml:37
+#: ../plugins/cellular/Components/DataMultiSim.qml:39
+msgid "Cellular data:"
+msgstr ""
+
+#: ../plugins/cellular/Components/SingleSim.qml:50
+#: ../plugins/cellular/Components/DataMultiSim.qml:76
+msgid "Data roaming"
+msgstr ""
+
+#. TRANSLATORS: This is the text that will be used on the "return" key for the virtual keyboard,
+#. this word must be less than 5 characters
+#: ../plugins/cellular/Components/LabelTextField.qml:51
+msgid "Next"
+msgstr ""
+
+#: ../plugins/cellular/Components/NoSim.qml:36
+msgid "No SIM detected"
+msgstr ""
+
+#: ../plugins/cellular/Components/NoSim.qml:45
+msgid "Insert a SIM, then restart the phone."
+msgstr ""
+
+#: ../plugins/background/Components/AddRemove.qml:52
+msgid "No images selected"
+msgstr ""
+
+#: ../plugins/background/Components/AddRemove.qml:65
+#, qt-format
+msgid "Remove %1 image"
+msgid_plural "Remove %1 images"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/background/Components/AddRemove.qml:80
+msgid "Add an image…"
+msgstr ""
+
+#: ../plugins/background/Components/AddRemove.qml:91
+msgid "Remove images…"
+msgstr ""
+
+#: ../src/qml/MainWindow.qml:132
 msgid "Search"
 msgstr ""
 
-#: ../src/qml/MainWindow.qml:152
+#: ../src/qml/MainWindow.qml:151
 msgid "Personal"
 msgstr ""
 
-#: ../src/qml/MainWindow.qml:157
+#: ../src/qml/MainWindow.qml:156
 msgid "System"
 msgstr ""
 
-#: ../wizard/qml/Pages//30-passwd-type.qml:72
-msgid "Please select how you’d like to unlock your phone."
-msgstr ""
-
-#: ../wizard/qml/Pages//30-passwd-type.qml:92
-msgid "Swipe"
-msgstr ""
-
-#: ../wizard/qml/Pages//30-passwd-type.qml:93
-msgid "No security"
-msgstr ""
-
-#: ../wizard/qml/Pages//30-passwd-type.qml:96
-msgid "4 numbers"
-msgstr ""
-
-#: ../wizard/qml/Pages//30-passwd-type.qml:99
-msgid "Numbers and letters"
-msgstr ""
-
-#: ../wizard/qml/Pages//30-passwd-type.qml:112
-#: ../wizard/qml/Pages//40-wifi.qml:196 ../wizard/qml/Pages//10-welcome.qml:85
-#: ../wizard/qml/Pages//50-location.qml:92
-#: ../wizard/qml/Pages//60-reporting.qml:48
-msgid "Continue"
-msgstr ""
-
-#: ../wizard/qml/Pages//40-wifi.qml:27
-msgid "Connect to Wi‑Fi"
-msgstr ""
-
-#: ../wizard/qml/Pages//40-wifi.qml:146
-msgid "Available networks…"
-msgstr ""
-
-#: ../wizard/qml/Pages//40-wifi.qml:147
-msgid "No available networks."
-msgstr ""
-
-#: ../wizard/qml/Pages//40-wifi.qml:196
-#: ../wizard/qml/Pages//31-passwd-set.qml:77
-#: ../wizard/qml/Pages//20-sim.qml:67
-msgid "Skip"
-msgstr ""
-
-#: ../wizard/qml/Pages//here-terms.qml:25
-msgid "Terms & Conditions"
-msgstr ""
-
-#: ../wizard/qml/Pages//31-passwd-set.qml:48
-msgid "Enter passphrase"
-msgstr ""
-
-#: ../wizard/qml/Pages//31-passwd-set.qml:49
-msgid "Choose your passcode"
-msgstr ""
-
-#: ../wizard/qml/Pages//31-passwd-set.qml:56
-msgid "Passphrase must be 4 characters long"
-msgstr ""
-
-#: ../wizard/qml/Pages//20-sim.qml:23
-msgid "Add a SIM card and restart your device"
-msgstr ""
-
-#: ../wizard/qml/Pages//20-sim.qml:53
-msgid "Without it, you won’t be able to make calls or use text messaging."
-msgstr ""
-
-#: ../wizard/qml/Pages//passwd-confirm.qml:51
-msgid "Sorry, incorrect passphrase."
-msgstr ""
-
-#: ../wizard/qml/Pages//passwd-confirm.qml:51
-#: ../wizard/qml/Pages//passwd-confirm.qml:52
-msgid "Please try again."
-msgstr ""
-
-#: ../wizard/qml/Pages//passwd-confirm.qml:52
-msgid "Sorry, incorrect passcode."
-msgstr ""
-
-#: ../wizard/qml/Pages//80-finished.qml:22
-msgid "All done"
-msgstr ""
-
-#: ../wizard/qml/Pages//80-finished.qml:37
-msgid "Nice work!"
-msgstr ""
-
-#: ../wizard/qml/Pages//80-finished.qml:44
-msgid "Your phone is now ready to use."
-msgstr ""
-
-#: ../wizard/qml/Pages//80-finished.qml:51
-msgid "Finish"
-msgstr ""
-
-#: ../wizard/qml/Pages//10-welcome.qml:25
-msgid "Hi!"
-msgstr ""
-
-#: ../wizard/qml/Pages//10-welcome.qml:42
-msgid "Welcome to your Ubuntu phone."
-msgstr ""
-
-#: ../wizard/qml/Pages//10-welcome.qml:50
-msgid "Let’s get started."
-msgstr ""
-
-#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
-#: ../wizard/qml/Pages//50-location.qml:58
-msgid ""
-"Ubuntu includes location services provided by HERE, enabling apps to "
-"pinpoint your location."
-msgstr ""
-
-#: ../wizard/qml/Pages//50-location.qml:64
-msgid ""
-"Allow apps to use your mobile and Wi-Fi networks to determine your location."
-msgstr ""
-
-#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
-#: ../wizard/qml/Pages//50-location.qml:74
-msgid ""
-"Accept the HERE <a href='terms.qml'>terms and conditions</a> to enable these "
-"services."
-msgstr ""
-
-#: ../wizard/qml/Pages//50-location.qml:85
-msgid ""
-"This service can be disabled at any time from the <b>System Settings</b> "
-"menu."
-msgstr ""
-
-#: ../wizard/qml/Pages//60-reporting.qml:22
-msgid "Improving your experience"
-msgstr ""
-
-#: ../wizard/qml/Pages//60-reporting.qml:34
-msgid ""
-"Your phone is set up to automatically report errors to Canonical and its "
-"partners, the makers of the operating system."
-msgstr ""
-
-#: ../wizard/qml/Pages//60-reporting.qml:41
-msgid ""
-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
-"Privacy</b>"
-msgstr ""
-
-#: ../wizard/qml/Components//Page.qml:89
-msgid "Back"
-msgstr ""
-
-#: ../wizard/qml/Components//StackButton.qml:40
-#, qt-format
-msgid "〈  %1"
-msgstr ""
-
-#: ../wizard/qml/Components//StackButton.qml:43
-#, qt-format
-msgid "%1  〉"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:4
-msgid "appearance"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:6
-msgid "background"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:8
-msgid "wallpaper"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:10
-msgid "art"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:12
-msgid "photo"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:14
-msgid "picture"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:16
-msgid "image"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:18
-msgid "Accessibility"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:20
-msgid "accessibility"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:22
-msgid "a11y"
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#: ../build/po/settings.js:4
+msgid "brightness"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:6 ../build/po/settings.js:240
+msgid "display"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#: ../build/po/settings.js:8 ../build/po/settings.js:60
+msgid "screen"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
+#: ../build/po/settings.js:10 ../build/po/settings.js:228
+#: ../build/po/settings.js:294 ../build/po/settings.js:322
+msgid "automatic"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
+#: ../build/po/settings.js:12
+msgid "adjust"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#: ../build/po/settings.js:16 ../build/po/settings.js:158
+msgid "phone"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:18
+msgid "services"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:20
+msgid "forwarding"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:22
+msgid "waiting"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:24
+msgid "call"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:26 ../build/po/settings.js:130
+msgid "dialpad"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:28
+msgid "shortcuts"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
+#: ../build/po/settings.js:30
+msgid "numbers"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the hotspot plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:26
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:174
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:216
+#: ../build/po/settings.js:34 ../build/po/settings.js:66
+#: ../build/po/settings.js:148 ../build/po/settings.js:190
 msgid "network"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:28
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:270
+#: ../build/po/settings.js:36 ../build/po/settings.js:278
 msgid "wireless"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:30
+#: ../build/po/settings.js:38
 msgid "wifi"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:32
+#: ../build/po/settings.js:40
 msgid "wi-fi"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:34
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:272
+#: ../build/po/settings.js:42 ../build/po/settings.js:280
 msgid "connect"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:36
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:274
+#: ../build/po/settings.js:44 ../build/po/settings.js:282
 msgid "disconnect"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:38
+#: ../build/po/settings.js:46
 msgid "hidden"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:40
+#: ../build/po/settings.js:48
 msgid "ip"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:42
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:294
+#: ../build/po/settings.js:50 ../build/po/settings.js:166
 msgid "address"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:46
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:302
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:330
-msgid "software"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:48
-msgid "notifications"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:50
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:252
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:334
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#: ../build/po/settings.js:52
+msgid "Rotation Lock"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#: ../build/po/settings.js:54
+msgid "rotation"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#: ../build/po/settings.js:56
+msgid "orientation"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
+#: ../build/po/settings.js:58 ../build/po/settings.js:90
+#: ../build/po/settings.js:102
+msgid "lock"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
+#: ../build/po/settings.js:62 ../build/po/settings.js:318
+#: ../build/po/settings.js:336
 msgid "apps"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:52
-msgid "authorize"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:54
-msgid "alerts"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:56
-msgid "permissions"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:58
-msgid "badges"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:60
-msgid "facebook"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:62
-msgid "twitter"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:64
-msgid "flickr"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:66
-msgid "gmail"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:70
-msgid "sound"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:72
-msgid "silent"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:74
-msgid "ringtone"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:76
-msgid "vibrate"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:78
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:152
-msgid "dialpad"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:80
-msgid "message"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:82
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:118
-msgid "keyboard"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:84
-msgid "volume"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:88
-msgid "reset"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:90
-msgid "erase"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:92
-msgid "factory"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:94
-msgid "clear"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the reset plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:96
-msgid "restore"
+#. TRANSLATORS: This is a keyword or name for the hotspot plugin which is used while searching
+#: ../build/po/settings.js:68
+msgid "hotspot"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the hotspot plugin which is used while searching
+#: ../build/po/settings.js:70
+msgid "tethering"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
+#: ../build/po/settings.js:72
+msgid "Example"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
+#: ../build/po/settings.js:74
+msgid "example"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
+#: ../build/po/settings.js:76
+msgid "test"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
+#: ../build/po/settings.js:78
+msgid "sample"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:100
+#: ../build/po/settings.js:82
 msgid "battery"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:102
+#: ../build/po/settings.js:84
 msgid "power"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:104
+#: ../build/po/settings.js:86
 msgid "charge"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:106
+#: ../build/po/settings.js:88
 msgid "idle"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:108
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:224
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:248
-msgid "lock"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:110
+#: ../build/po/settings.js:92
 msgid "disable"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the battery plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:112
+#: ../build/po/settings.js:94
 msgid "enable"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:116
-msgid "language"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:120
-msgid "spellcheck"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the time-date plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:122
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:166
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:322
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:336
-msgid "automatic"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:124
-msgid "correct"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:126
-msgid "suggestions"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:128
-msgid "capitalization"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:130
-msgid "punctuation"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:132
-msgid "layout"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:134
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:162
-msgid "display"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:136
-msgid "words"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:138
-msgid "vibration"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:142
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:286
-msgid "phone"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:144
-msgid "services"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:146
-msgid "forwarding"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:148
-msgid "waiting"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:150
-msgid "call"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:154
-msgid "shortcuts"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:156
-msgid "numbers"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:160
-msgid "brightness"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:164
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:250
-msgid "screen"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:168
-msgid "adjust"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:172
-msgid "cellular"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:176
-msgid "mobile"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:178
-msgid "gsm"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:180
-msgid "data"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:182
-msgid "carrier"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:184
-msgid "4g"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:186
-msgid "3g"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:188
-msgid "2g"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:190
-msgid "lte"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:192
-msgid "apn"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:194
-msgid "roam"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:196
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:226
-msgid "sim"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:198
-msgid "Example"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:200
-msgid "example"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:202
-msgid "test"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:204
-msgid "sample"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:206
-msgid "Flight Mode"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:208
-msgid "flight"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:210
-msgid "plane"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:212
-msgid "offline"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:214
-msgid "airplane"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:220
+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
+#: ../build/po/settings.js:98
 msgid "security"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:222
+#: ../build/po/settings.js:100
 msgid "privacy"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:228
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:104 ../build/po/settings.js:212
+msgid "sim"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
+#: ../build/po/settings.js:106
 msgid "pin"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:230
+#: ../build/po/settings.js:108
 msgid "code"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:232
+#: ../build/po/settings.js:110
 msgid "password"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:234
+#: ../build/po/settings.js:112
 msgid "passphrase"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:236
+#: ../build/po/settings.js:114
 msgid "swipe"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:238
+#: ../build/po/settings.js:116
 msgid "allow"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:240
+#: ../build/po/settings.js:118
 msgid "access"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:242
-msgid "Orientation Lock"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:244
-msgid "rotation"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:246
-msgid "orientation"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:256
-msgid "bluetooth"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:258
-msgid "headset"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:260
-msgid "pair"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:262
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:282
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:122
+msgid "sound"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:124
+msgid "silent"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:126
+msgid "ringtone"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:128
+msgid "vibrate"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:132
+msgid "message"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:134 ../build/po/settings.js:224
+msgid "keyboard"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+#: ../build/po/settings.js:136
+msgid "volume"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
+#: ../build/po/settings.js:138
+msgid "Flight Mode"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
+#: ../build/po/settings.js:140
+msgid "flight"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
+#: ../build/po/settings.js:142
+msgid "plane"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
+#: ../build/po/settings.js:144
+msgid "offline"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
+#: ../build/po/settings.js:146
+msgid "airplane"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#: ../build/po/settings.js:152
+msgid "about"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
+#: ../build/po/settings.js:154 ../build/po/settings.js:270
 msgid "device"
 msgstr ""
 
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:264
-msgid "discover"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:266
-msgid "car"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:268
-msgid "handsfree"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:276
-msgid "stereo"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:280
-msgid "about"
-msgstr ""
-
-#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:284
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#: ../build/po/settings.js:156
 msgid "info"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:288
+#: ../build/po/settings.js:160
 msgid "number"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:290
+#: ../build/po/settings.js:162
 msgid "imei"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:292
+#: ../build/po/settings.js:164
 msgid "serial"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:296
+#: ../build/po/settings.js:168
 msgid "mac"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:298
+#: ../build/po/settings.js:170
 msgid "licenses"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:300
+#: ../build/po/settings.js:172
 msgid "developer"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:304
+#. TRANSLATORS: This is a keyword or name for the system-update plugin which is used while searching
+#. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
+#: ../build/po/settings.js:174 ../build/po/settings.js:314
+#: ../build/po/settings.js:332
+msgid "software"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
+#: ../build/po/settings.js:176
 msgid "storage"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:306
+#: ../build/po/settings.js:178
 msgid "disk"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:308
+#: ../build/po/settings.js:180
 msgid "space"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:310
+#: ../build/po/settings.js:182
 msgid "version"
 msgstr ""
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
-#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:312
+#: ../build/po/settings.js:184
 msgid "revision"
 msgstr ""
 
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:188
+msgid "cellular"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:192
+msgid "mobile"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:194
+msgid "gsm"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:196
+msgid "data"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:198
+msgid "carrier"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:200
+msgid "4g"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:202
+msgid "3g"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:204
+msgid "2g"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:206
+msgid "lte"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:208
+msgid "apn"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
+#: ../build/po/settings.js:210
+msgid "roam"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
+#: ../build/po/settings.js:214
+msgid "Accessibility"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
+#: ../build/po/settings.js:216
+msgid "accessibility"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the accessibility plugin which is used while searching
+#: ../build/po/settings.js:218
+msgid "a11y"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:222
+msgid "language"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:226
+msgid "spellcheck"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:230
+msgid "correct"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:232
+msgid "suggestions"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:234
+msgid "capitalization"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:236
+msgid "punctuation"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:238
+msgid "layout"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:242
+msgid "words"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
+#: ../build/po/settings.js:244
+msgid "vibration"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
+#: ../build/po/settings.js:248
+msgid "appearance"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
+#: ../build/po/settings.js:250
+msgid "background"
+msgstr ""
+
+#. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
+#: ../build/po/settings.js:252
+msgid "wallpaper"
+msgstr ""
+