[gnome-control-center/gnome-3-26] Update Afrikaans translation



commit 7d25fa1b0a6531aa14370400d34fc7f2b695b892
Author: Pieter Schalk Schoeman <pieter sonbesie co za>
Date:   Sun Jan 21 10:43:23 2018 +0000

    Update Afrikaans translation

 po/af.po | 5490 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3146 insertions(+), 2344 deletions(-)
---
diff --git a/po/af.po b/po/af.po
index c3f006b..d668571 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,21 +3,23 @@
 # This file is distributed under the same license as the gnome-control-center package.
 # Zuza Software Foundation <info translate org za>, 2004
 # F Wolff <friedel translate org za>, 2009, 2011, 2013, 2014, 2016.
+# Pieter Schoeman <pieter sonbesie co za>, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.6-branch\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-29 08:39+0000\n"
-"PO-Revision-Date: 2016-02-29 20:57+0200\n"
-"Last-Translator: F Wolff <friedel translate org za>\n"
-"Language-Team: translate-discuss-af lists sourceforge net\n"
+"POT-Creation-Date: 2017-10-30 17:18+0000\n"
+"PO-Revision-Date: 2018-01-21 12:41+0200\n"
+"Last-Translator: Pieter Schoeman <pieter sonbesie co za>\n"
+"Language-Team: Afrikaans <pieter sonbesie co za>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Poedit 2.0.3\n"
 "X-Project-Style: gnome\n"
 
 #: ../panels/background/background.ui.h:1
@@ -62,76 +64,75 @@ msgstr "Opvul"
 #: ../panels/background/background.ui.h:11
 msgctxt "background, style"
 msgid "Span"
-msgstr ""
+msgstr "Span"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
-msgstr "Geen muurpapier"
+msgstr "Muurpapier"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Kleure"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
-msgstr "Kies agtergrond"
+msgstr "Kies Agtergrond"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Prente"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 msgid "No Pictures Found"
 msgstr "Geen prente gevind nie"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/background/cc-background-chooser-dialog.c:554
+#: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Tuis"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Voeg prente by die %s-gids dan sal hulle hier verskyn"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:29
+#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2023
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:2697
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1269
-#: ../panels/network/net-device-wifi.c:1462
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1325
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1641
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:1963
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:568
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/pp-details-dialog.c:319
+#: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
-#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:382
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
 #: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:708
-#: ../panels/user-accounts/um-user-panel.c:726
+#: ../panels/user-accounts/um-photo-dialog.c:221
+#: ../panels/user-accounts/um-user-panel.c:644
+#: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "_Kies"
 
@@ -150,96 +151,104 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "Geen werkskermagtergrond"
 
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:497
 msgid "Current background"
 msgstr "Huidige agtergrond"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#| msgid "Background"
+msgid "Back­ground"
 msgstr "Agtergrond"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
-msgstr "Verander die agtergrondbeeld na muurpapier of 'n foto"
+msgstr "Verander die agtergrondbeeld na 'n muurpapier of foto"
 
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
-msgstr "Wallpaper;Screen;Desktop;agtergrond;werkskerm;muurpapier;"
+msgstr "Muurpapier;Skerm;Werkskerm;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "Skakel vlugmodus af"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "Geen Bluetooth-hardeware gevind nie"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Prop 'n passtuk in om Bluetooth te gebruik."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth is afgeskakel"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Skakel aan om toestelle te koppel en lêers oor te dra."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "Vlugmodus is aan"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth word gedeaktiveer tydens vlugmodus."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
 msgstr "Hardewarevlugmodus is aan"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Skakel die vlugmodusskakelaar af om Bluetooth te aktiveer."
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#| msgid "Bluetooth"
+msgid "Blue­tooth"
 msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Skakel Bluetooth aan en af en koppel toestelle"
 
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
 msgid "share;sharing;bluetooth;obex;"
-msgstr "share;sharing;bluetooth;obex;deel;deling;"
+msgstr "deel;deling;bluetooth;obex;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
-msgstr "Plaas die kalibreertoestel oor die vierkant en druk 'Begin'"
+#| msgid "Place your calibration device over the square and press 'Start'"
+msgid "Place your calibration device over the square and press “Start”"
+msgstr "Plaas die kalibreertoestel oor die vierkant en druk \"Begin\""
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:367
+#| msgid ""
+#| "Move your calibration device to the calibrate position and press "
+#| "'Continue'"
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
-"Skuif die kalibreertoestel na die kalibreerposisie en druk 'Gaan voort'"
+"Skuif die kalibreertoestel na die kalibreerposisie en druk \"Gaan voort\""
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:373
+#| msgid ""
+#| "Move your calibration device to the surface position and press 'Continue'"
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"Move your calibration device to the surface position and press “Continue”"
 msgstr ""
-"Skuif die kalibreertoestel na die oppervlakposisie en druk 'Gaan voort'"
+"Skuif die kalibreertoestel na die oppervlakposisie en druk \"Gaan voort\""
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -252,7 +261,7 @@ msgstr "Vou die skootrekenaar toe"
 #. * good idea why or any suggestions
 #: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
-msgstr "'n Interne fout het voorgekom waarvan nie herstel kon word nie."
+msgstr "'n Interne fout het voorgekom waarvan daar nie herstel kon word nie."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
@@ -386,7 +395,7 @@ msgstr "Ondersteunde ICC-profiele"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Alle lêers"
 
@@ -426,7 +435,7 @@ msgid "Save Profile"
 msgstr "Stoor profiel"
 
 #: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_Stoor"
 
@@ -598,17 +607,19 @@ msgstr "Kalibreertoestel"
 
 #: ../panels/color/color.ui.h:11
 msgid "Select the type of display that is connected."
-msgstr "Kies die tipe vertoon wat ingeprop is."
+msgstr "Kies die tipe skerm wat ingeprop is."
 
 #: ../panels/color/color.ui.h:12
 msgid "Display Type"
-msgstr "Vertoontipe"
+msgstr "Skermtipe"
 
 #: ../panels/color/color.ui.h:13
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 msgstr ""
+"Selekteer 'n skerm teiken witpunt. Meeste skerms moet gekalibreer word na 'n "
+"D65 verligting."
 
 #: ../panels/color/color.ui.h:14
 msgid "Profile Whitepoint"
@@ -632,7 +643,7 @@ msgstr ""
 
 #: ../panels/color/color.ui.h:17
 msgid "Display Brightness"
-msgstr "Vertoonhelderheid"
+msgstr "Skermhelderheid"
 
 #: ../panels/color/color.ui.h:18
 msgid ""
@@ -681,23 +692,28 @@ msgstr ""
 "\"windows\">Microsoft Windows</a>."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:723
 msgid "Summary"
 msgstr "Opsomming"
 
 #: ../panels/color/color.ui.h:28
+#| msgid "_Add profile"
+msgid "Add Profile"
+msgstr "Voeg profiel by"
+
+#: ../panels/color/color.ui.h:29
 msgid "_Import File…"
 msgstr "_Voer lêer in…"
 
-#: ../panels/color/color.ui.h:30 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:519
+#: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
 msgstr "_Voeg by"
 
-#: ../panels/color/color.ui.h:31
+#: ../panels/color/color.ui.h:32
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -705,167 +721,165 @@ msgstr ""
 "Probleme teëgekom. Die profiel gaan dalk nie werk nie. <a href=\"\">Wys "
 "besonderhede.</a>"
 
-#: ../panels/color/color.ui.h:32
+#: ../panels/color/color.ui.h:33
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
 "Elke toestel benodig 'n kleurprofiel wat op datum is om sy kleur te bestuur."
 
-#: ../panels/color/color.ui.h:33
+#: ../panels/color/color.ui.h:34
 msgid "Learn more"
 msgstr "Meer inligting"
 
-#: ../panels/color/color.ui.h:34
+#: ../panels/color/color.ui.h:35
 msgid "Learn more about color management"
 msgstr "Meer oor kleurbestuur"
 
-#: ../panels/color/color.ui.h:35
+#: ../panels/color/color.ui.h:36
 msgid "_Set for all users"
 msgstr "_Stel vir alle gebruikers"
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:37
 msgid "Set this profile for all users on this computer"
 msgstr "Stel dié profiel vir alle gebruikers op dié rekenaar"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:38
 msgid "_Enable"
 msgstr "_Aktiveer"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:39
 msgid "_Add profile"
 msgstr "_Voeg profiel by"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:40
 msgid "_Calibrate…"
 msgstr "_Kalibreer…"
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:41
 msgid "Calibrate the device"
 msgstr "Kalibreer die toestel"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:42
 msgid "_Remove profile"
 msgstr "Ve_rwyder 'n profiel"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:43
 msgid "_View details"
 msgstr "_Bekyk besonderhede"
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:44
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Kan nie enige toestelle bespeur waarvoor kleur bestuur kan word nie"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:45
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:46
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:47
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:48
 msgid "Projector"
 msgstr "Projektor"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:49
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL-agterlig)"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED-agterlig)"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:52
 msgid "LCD (white LED backlight)"
 msgstr "LCD (wit LED-agterlig)"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgid "Wide gamut LCD (CCFL backlight)"
-msgstr ""
+msgstr "Wye spektrum LCD (CCFL-agterlig)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54
 msgid "Wide gamut LCD (RGB LED backlight)"
-msgstr ""
+msgstr "Wye spektrum LCD (RGB LED-agterlig)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:55
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Hoog"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "40 minutes"
 msgstr "40 minute"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:2
+#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minute"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Laag"
 
-#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:1
+#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
 msgid "15 minutes"
 msgstr "15 minute"
 
-#: ../panels/color/color.ui.h:60
-#, fuzzy
+#: ../panels/color/color.ui.h:61
 #| msgid "Panel to display"
 msgid "Native to display"
-msgstr "Paneel se eie"
+msgstr "Ingebou in die skerm"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:62
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (drukwerk en publisering)"
 
-#: ../panels/color/color.ui.h:62
+#: ../panels/color/color.ui.h:63
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:64
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (fotografie en grafika)"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:65
 msgid "D75"
 msgstr "D75"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
 msgstr "Kleur"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "Kalibreer die kleur van toestelle, bv. skerms, kameras of drukkers"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;kleur;profiel;kalibreer;drukker;s"
-"kerm;"
+msgstr "kleur;ICC;profiel;kalibreer;drukker;skerm;"
 
 #: ../panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "Ander…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "Meer…"
@@ -874,6 +888,26 @@ msgstr "Meer…"
 msgid "No languages found"
 msgstr "Geen tale gevind nie"
 
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:106
+msgid "Today"
+msgstr "Vandag"
+
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:108
+msgid "Yesterday"
+msgstr "Gister"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: ../panels/common/cc-util.c:138
+msgid "%b %e"
+msgstr "%e %b"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013".
+#: ../panels/common/cc-util.c:143
+msgid "%b %e, %Y"
+msgstr "%e %b %Y"
+
 #: ../panels/common/language-chooser.ui.h:1
 msgid "Language"
 msgstr "Taal"
@@ -894,17 +928,17 @@ msgid "Year"
 msgstr "Jaar"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e %B %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -912,7 +946,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -920,23 +954,23 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -990,8 +1024,9 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "Datum en tyd"
 
@@ -1046,16 +1081,16 @@ msgstr "24-uur"
 
 #: ../panels/datetime/datetime.ui.h:27
 msgid "AM / PM"
-msgstr "v.m. / n.m."
+msgstr "VM / NM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
 msgstr "Verander die datum en tyd, asook tydsone"
 
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
-msgstr "Clock;Timezone;Location;horlosie;tydsone;ligging;"
+msgstr "horlosie;tydsone;ligging;"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
 msgid "Change system time and date settings"
@@ -1063,195 +1098,322 @@ msgstr "Verander instellings vir datum en tyd"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
 msgid "To change time or date settings, you need to authenticate."
-msgstr ""
-
-#: ../panels/display/cc-display-panel.c:573
-msgid "Lid Closed"
-msgstr "Skerm toegevou"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
-msgid "Mirrored"
-msgstr "Gedupliseer"
-
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2195
-msgid "Primary"
-msgstr "Primêr"
-
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "Af"
+msgstr "Om datum of tyd verstellings te maak moet jy eers aanteken."
 
-#: ../panels/display/cc-display-panel.c:583
-msgid "Secondary"
-msgstr "Sekondêr"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
-msgid "Arrange Combined Displays"
-msgstr "Rangskik gekombineerde vertone"
+#: ../panels/display/cc-display-panel.c:738
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Landskap"
 
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2024
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "P_as toe"
+#: ../panels/display/cc-display-panel.c:741
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portret Regs"
 
-#: ../panels/display/cc-display-panel.c:1586
-msgid "Drag displays to rearrange them"
-msgstr "Sleep vertone om te herrangskik"
+#: ../panels/display/cc-display-panel.c:744
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portret Links"
 
-#: ../panels/display/cc-display-panel.c:2073
-msgid "Rotate counterclockwise by 90°"
-msgstr "Draai 90° antikloksgewys"
+#: ../panels/display/cc-display-panel.c:747
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Landskap (omgedraai)"
 
-#: ../panels/display/cc-display-panel.c:2091
-msgid "Rotate by 180°"
-msgstr "Draai 180°"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Oriëntasie"
 
-#: ../panels/display/cc-display-panel.c:2109
-msgid "Rotate clockwise by 90°"
-msgstr "Draai 90° kloksgewys"
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1751
+#: ../panels/display/cc-display-panel.c:1797
+#: ../panels/printers/pp-options-dialog.c:87
+msgid "Resolution"
+msgstr "Resolusie"
 
-#: ../panels/display/cc-display-panel.c:2130
-msgid "Size"
-msgstr "Grootte"
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
+msgid "Refresh Rate"
+msgstr "Verfristempo"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2143
-msgid "Aspect Ratio"
-msgstr "Aspekverhouding"
+#: ../panels/display/cc-display-panel.c:1186
+#| msgctxt "background, style"
+#| msgid "Scale"
+msgid "Scale"
+msgstr "Skaleer"
 
-#: ../panels/display/cc-display-panel.c:2165
-#: ../panels/printers/pp-options-dialog.c:85
-msgid "Resolution"
-msgstr "Resolusie"
+#: ../panels/display/cc-display-panel.c:1239
+msgid "Adjust for TV"
+msgstr "Verstel vir televisie"
 
-#: ../panels/display/cc-display-panel.c:2196
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "Wys die boonste balk en Aktiwiteitoorsig op dié vertoon"
+#: ../panels/display/cc-display-panel.c:1451
+#: ../panels/display/cc-display-panel.c:1497
+#| msgid "Secondary Display"
+msgid "Primary Display"
+msgstr "Primêre skerm"
 
-#: ../panels/display/cc-display-panel.c:2202
-msgid "Secondary Display"
-msgstr "Sekondêre vertoon"
+#: ../panels/display/cc-display-panel.c:1546
+#| msgid "Display language:"
+msgid "Display Arrangement"
+msgstr "Skerm uitleg"
 
-#: ../panels/display/cc-display-panel.c:2203
-msgid "Join this display with another to create an extra workspace"
+#: ../panels/display/cc-display-panel.c:1547
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
 msgstr ""
+"Trek die skerms om te lyk soos jou werklike skerm uitleg. Die balk bo aan "
+"die skerm word slegs vertoon op die primere skerm."
 
-#: ../panels/display/cc-display-panel.c:2210
-msgid "Presentation"
-msgstr "Voorlegging"
+#: ../panels/display/cc-display-panel.c:1985
+#| msgid "Display Type"
+msgid "Display Mode"
+msgstr "Skermmodus"
 
-#: ../panels/display/cc-display-panel.c:2211
-msgid "Show slideshows and media only"
-msgstr "Wys slegs skyfievertonings en media"
+#: ../panels/display/cc-display-panel.c:2001
+#| msgid "Displays"
+msgid "Join Displays"
+msgstr "Koppel skerms"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2216
+#: ../panels/display/cc-display-panel.c:2004
 msgid "Mirror"
 msgstr "Dupliseer"
 
-#: ../panels/display/cc-display-panel.c:2217
-msgid "Show your existing view on both displays"
-msgstr "Wys die bestaande aansig op altwee vertoone"
+#: ../panels/display/cc-display-panel.c:2007
+#| msgctxt "universal access, seeing"
+#| msgid "Display"
+msgid "Single Display"
+msgstr "Enkel skerm"
 
-#: ../panels/display/cc-display-panel.c:2223
-msgid "Turn Off"
-msgstr "Skakel af"
+#: ../panels/display/cc-display-panel.c:2693
+msgid "Apply Changes?"
+msgstr "Pas veranderinge toe?"
+
+#: ../panels/display/cc-display-panel.c:2707
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "P_as toe"
 
-#: ../panels/display/cc-display-panel.c:2224
-msgid "Don't use this display"
-msgstr "Moenie hierdie vertoon gebruik nie"
+#: ../panels/display/cc-display-panel.c:3083
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
+
+#. TRANSLATORS: the state of the night light setting
+#: ../panels/display/cc-display-panel.c:3299
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+msgid "On"
+msgstr "Aan"
 
-#: ../panels/display/cc-display-panel.c:2525
+#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Af"
+
+#: ../panels/display/cc-display-panel.c:3320
+#| msgid "Right ring finger"
+msgid "_Night Light"
+msgstr "_Naglig"
+
+#: ../panels/display/cc-display-panel.c:3385
 msgid "Could not get screen information"
 msgstr "Kon nie skerminligting kry nie"
 
-#: ../panels/display/cc-display-panel.c:2556
-msgid "_Arrange Combined Displays"
-msgstr "R_angskik gekombineerde vertone"
+#. This cancels the redshift inhibit.
+#: ../panels/display/display.ui.h:2
+#| msgid "Restart Now"
+msgid "Restart Filter"
+msgstr "Herbegin filter"
+
+#. Inhibit the redshift functionality until the next day starts
+#: ../panels/display/display.ui.h:4
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "Tydelik gestop tot die volgende dag"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
-msgstr "Vertoonareas"
+#: ../panels/display/display.ui.h:5
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr ""
+"Naglig maak die skermkleur warmer. Dit kan help om oog stremming en "
+"slapeloosheid te voorkom."
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: ../panels/display/display.ui.h:7
+#| msgid "Right ring finger"
+msgid "Night Light"
+msgstr "Naglig"
 
+#: ../panels/display/display.ui.h:8
+msgid "Schedule"
+msgstr "Skeduleer"
+
+#: ../panels/display/display.ui.h:9
+msgid "Sunset to Sunrise"
+msgstr "Sonsondergang tot Sonsopkoms"
+
+#: ../panels/display/display.ui.h:10
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
+#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Manual"
+msgstr "Handmatig"
+
+#: ../panels/display/display.ui.h:11
+msgid "From"
+msgstr "Van"
+
+#: ../panels/display/display.ui.h:12
+msgid ":"
+msgstr ":"
+
+#. This is the short form for the time period in the morning
+#: ../panels/display/display.ui.h:14
+msgid "AM"
+msgstr "VM"
+
+#. This is the short form for the time period in the afternoon
+#: ../panels/display/display.ui.h:16
+msgid "PM"
+msgstr "NM"
+
+#: ../panels/display/display.ui.h:17
+msgid "To"
+msgstr "Tot"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#| msgid "Displays"
+msgid "Dis­plays"
+msgstr "Skerms"
+
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Kies hoe om ingepropte monitors en projektors te gebruik"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
 msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;lcd;projektor;skerm;"
-"resolusie;vertoon;"
-
-#: ../panels/info/cc-info-panel.c:385
-msgid "Wayland"
-msgstr "Wayland"
+"paneel;projektor;xrandr;skerm;resolusie;verfris;monitor;nag;lig;blou;"
+"rooiverskuiwing;kleur;sonsondergang;sonsopkoms;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../panels/info/cc-info-panel.c:473
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-bis"
+msgid "%s; Build ID: %s"
+msgstr "%s; Bou ID: %s"
 
-#: ../panels/info/cc-info-panel.c:475
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%d-bit"
-msgstr "%d-bis"
+#| msgid "%d-bit"
+msgid "64-bit"
+msgstr "64-bis"
 
-#: ../panels/info/cc-info-panel.c:1155
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
+#, c-format
+#| msgid "%d-bit"
+msgid "32-bit"
+msgstr "32-bis"
+
+#: ../panels/info/cc-info-overview-panel.c:807
+#, c-format
+msgid "Version %s"
+msgstr "Weergawe %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Afdeling"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Oorsig"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Verstektoepassings"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Verwyderbare media"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "Vra wat om te doen"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "Doen niks"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "Open gids"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "Ander media"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "Kies 'n toepassing vir oudio-CD's"
 
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "Kies 'n toepassing vir video-DVD's"
 
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr ""
 "Kies 'n toepassing om uit te voer wanneer 'n musiekspeler ingeprop word"
 
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "Kies 'n toepassing om uit te voer wanneer 'n kamera ingeprop word"
 
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "Kies 'n toepassing vir sagteware-CD's"
 
@@ -1260,198 +1422,226 @@ msgstr "Kies 'n toepassing vir sagteware-CD's"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "oudio-DVD"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "skoon Blu-Ray-skyf"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "skoon CD-skyf"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "skoon DVD-skyf"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "skoon HD-DVD-skyf"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "Blu-ray-videoskyf"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "e-boekleser"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoskyf"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "Prente-CD"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "Super Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Windows-sagteware"
 
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1949
-msgid "Section"
-msgstr "Afdeling"
-
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Oorsig"
-
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+#| msgid "Default Applications"
+msgid "Defa­ult Applications"
 msgstr "Verstektoepassings"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Verwyderbare media"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#| msgid "Default Applications"
+msgid "Configure Default Applications"
+msgstr "Stel verstektoepassings in"
 
-#: ../panels/info/cc-info-panel.c:1480
-#, c-format
-msgid "Version %s"
-msgstr "Weergawe %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr "verstek;toepassing;voorkeur;media;"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
-msgstr "Besonderhede"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "Aangaande"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
-msgstr "Bekyk inligting oor die stelsel"
+msgstr "Vertoon inligting oor die stelsel"
 
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;toestel;"
-"stelsel;inligting;geheue;verwerker;weergawe;verstek;toepassing;terugval;"
-"voorkeur;oudio;klank;skyf;verwyderbaar;outoloop;"
+"toestel;stelsel;inligting;geheue;verwerker;weergawe;verstek;toepassing;"
+"voorkeur;cd;dvd;usb;klank;video;skyf;verwyderbaar;media;outoloop;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Kies hoe ander media hanteer moet word"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Aksie:"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Tipe:"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "Toestelnaam"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "Geheue"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "Verwerker"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Onderliggende stelsel"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "Skyf"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "Bereken tans…"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#| msgid "Details"
+msgid "De­tails"
+msgstr "Besonderhede"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "Grafika"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+#| msgid "Removable Media"
+msgid "Remo­vable Media"
+msgstr "Verwyderbare media"
 
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Virtualisering"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#| msgid "Change keyboard settings"
+msgid "Configure Removable Media settings"
+msgstr "Verander verwyderbare media instellings"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "Kontroleer vir bywerkings"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"toestel;stelsel;verstek;toepassing;voorkeur;cd;dvd;usb;klank;video;skyf;"
+"verwyderbaar;media;outoloop;"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "_Web"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
 msgid "_Mail"
 msgstr "_Pos"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
 msgid "_Calendar"
 msgstr "_Kalender"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
 msgid "M_usic"
 msgstr "M_usiek"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
 msgid "_Photos"
 msgstr "_Foto's"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "Toestelnaam"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "Geheue"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "Verwerker"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Grafika"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "Bedryfstelsel naam"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "Tipe bedryfstelsel"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Virtualisering"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "Skyf"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "Bereken tans…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "Kontroleer vir bywerkings"
+
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "Kies hoe die media hanteer moet word"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD-_oudio"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "_DVD-video"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "_Musiekspeler"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "_Sagteware"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "_Ander media…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "As media ingedruk word, moet _nooit programme begin of vra daaroor nie"
 
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Kies hoe ander media hanteer moet word"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Aksie:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Tipe:"
+
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Klank en media"
@@ -1470,7 +1660,7 @@ msgstr "Volume harder"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:5
 msgid "Launch media player"
-msgstr "Laat begin mediaspeler"
+msgstr "Lanseer mediaspeler"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:6
 msgid "Play (or play/pause)"
@@ -1497,7 +1687,7 @@ msgid "Eject"
 msgstr "Uitskiet"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Typing"
 msgstr "Tik"
 
@@ -1517,22 +1707,23 @@ msgstr "Lanseerders"
 msgid "Launch help browser"
 msgstr "Laat loop hulpblaaier"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1605
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:831
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Instellings"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:4
 msgid "Launch calculator"
-msgstr "Laat loop sakrekenaar"
+msgstr "Lanseer sakrekenaar"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
-msgstr "Laat loop e-poskliënt"
+msgstr "Lanseer e-poskliënt"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
-msgstr "Laat loop webblaaier"
+msgstr "Lanseer webblaaier"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
@@ -1591,7 +1782,6 @@ msgid "Lock screen"
 msgstr "Sluit skerm"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "Universele toegang"
 
@@ -1627,14 +1817,25 @@ msgstr "Verklein teks"
 msgid "High contrast on or off"
 msgstr "Skakel hoë kontras aan of af"
 
+#: ../panels/keyboard/cc-keyboard-manager.c:506
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:822
+msgid "Custom Shortcuts"
+msgstr "Pasgemaakte kortpaaie"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
+#: ../panels/keyboard/keyboard-shortcuts.c:435
+#: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "Gedeaktiveer"
 
@@ -1651,129 +1852,181 @@ msgstr "Sleutel vir alternatiewe karakters"
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
 #: ../panels/keyboard/cc-keyboard-option.c:363
-#, fuzzy
 #| msgid "Mouse Keys"
 msgid "Compose Key"
-msgstr "Muissleutels"
+msgstr "Saamstelsleutel"
 
 #: ../panels/keyboard/cc-keyboard-option.c:368
 msgid "Modifiers-only switch to next source"
+msgstr "Wysigers verander slegs na volgende bron"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:181
+#| msgid "Remove Shortcut"
+msgid "Reset All Shortcuts?"
+msgstr "Skrap alle kortpaaie?"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:184
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
 msgstr ""
+"Die herstel van alle kortpaaie mag jou pasgemaakte kortpaaie affekteer. Die "
+"aksie kan nie ongedaan gemaak word nie."
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "Sleutelbord"
+#: ../panels/keyboard/cc-keyboard-panel.c:188
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:189
+#| msgid "Reset"
+msgid "Reset All"
+msgstr "Herstel alles"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:281
+msgid "Reset the shortcut to its default value"
+msgstr "Herstel die kortpad na sy oorspronklike waarde"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr ""
+"%s word klaar gebruik deur <b>%s</b>. Indien jy dit vervang sal, %s "
+"gedeaktiveer word"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#| msgid "Custom Shortcut"
+msgid "Set Custom Shortcut"
+msgstr "Stel 'n pasgemaakte kortpad"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#| msgid "Shortcuts"
+msgid "Set Shortcut"
+msgstr "Stel Kortpad"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "Voeg 'n nuwe kortpad by om <b>%s</b> te verander."
 
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#| msgid "Custom Shortcut"
+msgid "Add Custom Shortcut"
+msgstr "Voeg 'n pasgemaakte kortpad by"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#| msgid "Keyboard"
+msgid "Key­board"
+msgstr "Sleutelbord"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr "Bekyk en verander sleutelbordkortpaaie en stel tikvoorkeure"
+msgstr "Vertoon en verander sleutelbordkortpaaie en stel tikvoorkeure"
 
 #. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;kortpad;herhaal;flikker;"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"kortpad;werkspasie;venster;verander;grootte;zoem;kontras;invoer;bron;sluit;"
+"volume;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Pasgemaakte kortpad"
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+msgid "Keyboard Shortcuts"
+msgstr "Sleutelbordkortpaaie"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "_Naam:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Reset All…"
+msgstr "Stel alles terug…"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "_Opdrag:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Herstel alle kortpaaie na hul oorspronklike sleutelbindinge"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "Voeg kortpad by"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#| msgid "Keyboard Shortcuts"
+msgid "No keyboard shortcut found"
+msgstr "Geen sleutelbord kortpad gevind nie"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "Skrap kortpad"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
+msgid "Try a different search"
+msgstr "Probeer 'n ander soektog"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 msgstr ""
-"Om 'n kortpad te verander, klik op die ry en tik die nuwe sleutelkombinasie, "
-"of druk Backspace om skoon te maak."
+"Druk Esc om te kanselleer of Backspace om die sleutelbordkortpaaie te "
+"herstel."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "Pasgemaakte kortpaaie"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/printers/details-dialog.ui.h:1
+#: ../panels/sound/gvc-mixer-dialog.c:1499
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Naam"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<Onbekende aksie>"
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+#| msgid "_Command:"
+msgid "Command"
+msgstr "Opdrag"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"Die kortpad \"%s\" kan nie gebruik word nie omdat dit dan onmoontlik sal "
-"wees om met dié sleutel te tik.\n"
-"Probeer eerder met 'n knoppie soos Control, Alt of Shift op die selfde tyd."
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+#| msgid "Shortcuts"
+msgid "Shortcut"
+msgstr "Kortpad"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"Die kortpad \"%s\" word reeds gebruik vir\n"
-"\"%s\""
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+#| msgid "New shortcut…"
+msgid "Set Shortcut…"
+msgstr "Nuwe Kortpad…"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr ""
-"As u die kortpad hertoeken aan \"%s\" sal die \"%s\"-kortpad gedeaktiveer "
-"word."
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "Geen"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "He_rtoeken"
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#| msgid "Error saving the new shortcut"
+msgid "Enter the new shortcut"
+msgstr "Voer 'n nuwe kortpad in"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr ""
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Verwyder"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, fuzzy, c-format
-#| msgid ""
-#| "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
-#| "disabled."
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr ""
-"As u die kortpad hertoeken aan \"%s\" sal die \"%s\"-kortpad gedeaktiveer "
-"word."
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+msgid "Add"
+msgstr "Voeg by"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "_Ken toe"
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "Vervang"
 
-#: ../panels/mouse/cc-mouse-panel.c:82
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+#| msgid "Select"
+msgid "Set"
+msgstr "Kies"
+
+#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "Toet_s die instellings"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
-msgstr "Muis en raakblad"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#| msgid "Mouse & Touchpad"
+msgid "Mouse & Touch­pad"
+msgstr "Muis en Raakblad"
+
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr ""
@@ -1781,11 +2034,9 @@ msgstr ""
 "linkerhandigheid"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
-msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;raakblad;wyser;"
-"klik;kliek;raak;dubbel;knoppie;"
+msgstr "raakblad;wyser;klik;kliek;raak;dubbel;knoppie;rolbal;rol;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
 msgid "General"
@@ -1841,6 +2092,11 @@ msgid "Tap to Click"
 msgstr "Raak om te klik"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#| msgid "Two _finger scroll"
+msgid "Two-finger Scrolling"
+msgstr "Rol met twee vingers"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Edge Scrolling"
 msgstr "Rol op die rand"
 
@@ -1851,7 +2107,7 @@ msgstr "Probeer klik, dubbelklik, rol"
 
 #: ../panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
-msgstr ""
+msgstr "Vyf kliks, GEGL tyd!"
 
 #: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
@@ -1877,13 +2133,8 @@ msgstr "Dubbelklik, sekondêre knoppie"
 msgid "Single click, secondary button"
 msgstr "Enkelklik, sekondêre knoppie"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:358
-msgid "Air_plane Mode"
-msgstr "_Vlugmodus"
-
-#: ../panels/network/cc-network-panel.c:967
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Netwerkinstaner"
 
@@ -1891,114 +2142,115 @@ msgstr "Netwerkinstaner"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s-VPN"
 
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Oeps! Iets het foutgeloop. Kontak die sagtewareverskaffer."
 
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager moet loop."
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "802.1x-_sekuriteit"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "bladsy 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity"
 msgstr "Anonie_me identiteit"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#, fuzzy
+#: ../panels/network/connection-editor/security-page.ui.h:4
 #| msgid "<b>_Use authentication</b>"
 msgid "Inner _authentication"
-msgstr "<b>_Gebruik verifiëring</b>"
+msgstr "Binne _verifikasie"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "bladsy 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:445
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "Sekuriteit"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "outomaties"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "Profiel %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:388
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Onderneming"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Geen"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Nooit"
 
-#: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:815
-msgid "Today"
-msgstr "Vandag"
-
-#: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:818
-msgid "Yesterday"
-msgstr "Gister"
-
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/connection-editor/ce-page-details.c:110
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:506
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2006,179 +2258,118 @@ msgstr[0] "%i dag gelede"
 msgstr[1] "%i dae gelede"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:176
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:562
 #, c-format
 msgid "%d Mb/s"
-msgstr "%d Mb/s"
+msgstr "%d Mg/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:591
 msgctxt "Signal strength"
 msgid "None"
-msgstr "Niks"
+msgstr "Geen"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:593
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Swak"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:595
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Redelik"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:597
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Goed"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:599
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Uitstekend"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
-#: ../panels/network/network-wifi.ui.h:47
-msgid "Identity"
-msgstr "Identiteit"
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#| msgid "Connection"
+msgid "Forget Connection"
+msgstr "Vergeet verbinding"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
-msgid "Address"
-msgstr "Adres"
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "Verwyder verbindingprofiel"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
-msgid "Netmask"
-msgstr "Netmasker"
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#| msgid "_Remove"
+msgid "Remove VPN"
+msgstr "Verwyder VPN"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "Deurgang"
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
+#: ../shell/panel-list.ui.h:2
+msgid "Details"
+msgstr "Besonderhede"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
+#: ../panels/network/network-wifi.ui.h:47
+msgid "Identity"
+msgstr "Identiteit"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Skrap adres"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "Voeg by"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
-msgid "Server"
-msgstr "Bediener"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
-msgid "Delete DNS Server"
-msgstr "Skrap DNS-bediener"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Mates"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Skrap roete"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Outomaties (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:182
-msgid "Manual"
-msgstr "Handmatig"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
-msgid "Link-Local Only"
-msgstr ""
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
-msgid "Prefix"
-msgstr "Voorvoegsel"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:182
-msgid "Automatic"
-msgstr "Outomaties"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
-msgid "Automatic, DHCP only"
-msgstr "Outomaties, slegs DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "Stel terug"
-
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bis-sleutel (Heks of ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bis wagwoordfrase"
 
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamiese WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA en WPA2 (persoonlik)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA en WPA2 (onderneming)"
 
@@ -2193,42 +2384,37 @@ msgid "Link speed"
 msgstr "Skakelspoed"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
-#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695
+#: ../panels/network/net-device-ethernet.c:153
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4-adres"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6-adres"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/net-device-ethernet.c:161
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Hardewareadres"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
 msgstr "Verstekroete"
 
 #: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2237,13 +2423,30 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Laas gebruik"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Koppel _outomaties"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Maak beskikbaar aan _ander gebruikers"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Outomaties"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
-msgstr "Gedraaide draadpaar"
+msgstr "Gedraaide draadpaar (TP)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:3
 msgid "Attachment Unit Interface (AUI)"
-msgstr ""
+msgstr "Aanhangsel Eenheid Koppelvlak (AEK)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:4
 msgid "BNC"
@@ -2251,23 +2454,23 @@ msgstr "BNC"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:5
 msgid "Media Independent Interface (MII)"
-msgstr ""
+msgstr "Media Onafhankilike Koppelvlak (MOK)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:6
 msgid "10 Mb/s"
-msgstr "10 Mb/s"
+msgstr "10 Mg/s"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:7
 msgid "100 Mb/s"
-msgstr "100 Mb/s"
+msgstr "100 Mg/s"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:8
 msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgstr "1 Gg/s"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:9
 msgid "10 Gb/s"
-msgstr "10 Gb/s"
+msgstr "10 Gg/s"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:10
 #: ../panels/network/connection-editor/vpn-page.ui.h:1
@@ -2293,204 +2496,195 @@ msgstr "_Gekloonde adres"
 msgid "bytes"
 msgstr "grepe"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "Maak beskikbaar aan ander gebr_uikers"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "IPv_4 Metode"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Koppel _outomaties"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Outomaties (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "Brandmuur_sone"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Skakel slegs plaaslik"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "Verstek"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "Deaktiveer"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-msgid "The zone defines the trust level of the connection"
-msgstr "Die sone bepaal die vertrouensvlak van die verbinding"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgid "_Addresses"
+msgid "Addresses"
+msgstr "Adresse"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Adres"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "_Adresse"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Netmasker"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Deurgang"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "Outomatiese DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "Verdeel IP adresse met kommas"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Roetes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "Outomatiese roetes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#| msgctxt "network parameters"
+#| msgid "Metric"
+msgid "Metric"
+msgstr "Mates"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "Gebruik hierdie verbinding _slegs vir hulpbronne op sy netwerk"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#| msgid "_Method"
+msgid "IPv_6 Method"
+msgstr "IPv_6 Metode"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Outomaties, slegs DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Voorvoegsel"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Kan nie verbindingredigeerder open nie"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Nuwe profiel"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Saambind"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "Span"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Brug"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "Kon nie VPN-inproppe laai nie"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Voer vanaf lêer in…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "Voeg netwerkverbinding by"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "Stel te_rug"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1463
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Vergeet"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"Stel die instellings, insluitend wagwoorde, vir dié netwerk terug, maar "
-"onthou dit as 'n voorkeurnetwerk"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr ""
-"Verwyder alle besonderhede wat met dié netwerk te doen het en moenie weer "
-"outomaties probeer koppel nie"
+#: ../panels/network/connection-editor/net-connection-editor.c:785
+#| msgid "%s VPN"
+msgid "Add VPN"
+msgstr "Voeg 'n VPN by"
 
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
 msgstr "S_ekuriteit"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Kan nie VPN-verbinding invoer nie"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
+#| msgid ""
+#| "The file '%s' could not be read or does not contain recognized VPN "
+#| "connection information\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"Die lêer '%s' kon nie gelees word nie of die inligting vir VPN-verbinding "
+"Die lêer \"%s\" kon nie gelees word nie of die inligting vir VPN-verbinding "
 "word nie herken nie.\n"
 "\n"
 "Fout: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Kies lêer om in te voer"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1964
-#: ../panels/sharing/cc-sharing-panel.c:373
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/pp-details-dialog.c:320
+#: ../panels/sharing/cc-sharing-panel.c:383
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Open"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-msgid "A file named \"%s\" already exists."
+#| msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "'n Lêer genaamd \"%s\" bestaan reeds."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "Ve_rvang"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Wil u %s vervang met die VPN-verbinding wat u nou stoor?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Kan nie VPN-verbinding uitvoer nie"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
+#| msgid ""
+#| "The VPN connection '%s' could not be exported to %s.\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
-"Die VPN-verbinding '%s' kon nie uitgevoer word na %s nie.\n"
+"Die VPN-verbinding \"%s\" kon nie uitgevoer word na %s nie.\n"
 "\n"
 "Fout: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Voer VPN-verbinding uit"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Fout: kan nie VPN-verbindingredigeerder laai nie)"
 
@@ -2509,64 +2703,63 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "Huisnetwerk"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Maak beskikbaar aan _ander gebruikers"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#| msgid "Network"
+msgid "Net­work"
 msgstr "Netwerk"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 msgid "Control how you connect to the Internet"
 msgstr "Bepaal hoe om te koppel aan die internet"
 
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;vlan;bridge;bond;DNS;"
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
 msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vl"
-"an;bridge;bond;DNS;netwerk;draadloos;instaanbediener;breëband;brug;"
+"netwerk;draadloos;Wi-Fi;IP;LAN;instaanbediener;WAN;breëband;modem;bluetooth;"
+"vpn;brug;DNS;"
 
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Saambindslawe"
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#| msgid "Control how you connect to the Internet"
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Bepaal hoe om te koppel aan Wi-Fi verbindings"
 
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(geen)"
-
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Brugslawe"
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;vlan;bridge;bond;DNS;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr "netwerk;draadloos;Wi-Fi;wifi;LAN;breeband;DNS;"
 
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:463
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:492
 msgid "never"
 msgstr "nog nooit"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:502
 msgid "today"
 msgstr "vandag"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:504
 msgid "yesterday"
 msgstr "gister"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "Laas gebruik"
@@ -2576,72 +2769,71 @@ msgstr "Laas gebruik"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Draad"
 
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1621
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1800
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "Keuses…"
 
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "Profiel %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Voeg nuwe verbinding by"
 
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "Spanslawe"
-
-#: ../panels/network/net-device-wifi.c:1176
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"As u 'n internetverbinding het buiten vir 'n draadlose een, kan u 'n "
-"draadlose toegangsarea opstel om die verbinding te deel met ander."
-
-#: ../panels/network/net-device-wifi.c:1180
+#: ../panels/network/net-device-wifi.c:1282
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr ""
-"Deur die draadlose toegangsarea aan te skakel, sal u ontkoppel van <b>%s</b>."
+msgstr "Deur die kuberkol aan te skakel, sal u ontkoppel van <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1184
+#: ../panels/network/net-device-wifi.c:1286
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr ""
 "Dis nie moontlik om deur die draadloos internettoegang te kry terwyl die "
-"toegangsarea aktief is nie."
+"kuberkol aktief is nie."
+
+#: ../panels/network/net-device-wifi.c:1293
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Skakel 'n Wi-Fi-kuberkol aan?"
 
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1315
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+"'n Wi-Fi kuberkol word gewoonlik gebruik om 'n addisionele internet "
+"verbinding oor Wi-Fi te deel."
+
+#: ../panels/network/net-device-wifi.c:1326
+msgid "_Turn On"
+msgstr "_Skakel aan"
+
+#: ../panels/network/net-device-wifi.c:1403
 msgid "Stop hotspot and disconnect any users?"
-msgstr "Stop toegangsarea en ontkoppel alle gebruikers?"
+msgstr "Stop kuberkol en ontkoppel alle gebruikers?"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1406
 msgid "_Stop Hotspot"
-msgstr "_Stop toegangsarea"
+msgstr "_Stop kuberkol"
 
-#: ../panels/network/net-device-wifi.c:1327
+#: ../panels/network/net-device-wifi.c:1503
 msgid "System policy prohibits use as a Hotspot"
-msgstr "Stelselbeleid verbied gebruik vir toegangsarea"
+msgstr "Stelselbeleid verbied die gebruik van 'n kuberkol"
 
-#: ../panels/network/net-device-wifi.c:1330
+#: ../panels/network/net-device-wifi.c:1506
 msgid "Wireless device does not support Hotspot mode"
-msgstr "Draadlose toestel het nie steun vir toegangsarea nie"
+msgstr "Draadlose toestel het nie steun vir kuberkolmodus nie"
 
-#: ../panels/network/net-device-wifi.c:1459
+#: ../panels/network/net-device-wifi.c:1638
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2649,25 +2841,24 @@ msgstr ""
 "Netwerkbesonderhede vir die gekose netwerke sal verloor word, insluitend "
 "wagwoorde en enige eie opstelling."
 
-#: ../panels/network/net-device-wifi.c:1774
-msgid "History"
-msgstr "Geskiedenis"
+#: ../panels/network/net-device-wifi.c:1642
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Vergeet"
 
-#: ../panels/network/net-device-wifi.c:1778
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "_Sluit"
+#: ../panels/network/net-device-wifi.c:1951
+#: ../panels/network/net-device-wifi.c:1958
+msgid "Known Wi-Fi Networks"
+msgstr "Bekende Wi-Fi netwerke"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1786
+#: ../panels/network/net-device-wifi.c:1991
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Vergeet"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -2678,18 +2869,10 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "Dié word nié aanbeveel vir onvertroude openbare netwerke nie."
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Instaanbediener"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Voeg profiel by…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2698,95 +2881,70 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Geen"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Handmatig"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Outomaties"
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Netwerk"
 
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Metode"
+#: ../panels/network/network-proxy.ui.h:1
+#| msgid "Network proxy"
+msgid "Network Proxy"
+msgstr "Netwerkinstaner"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Konfigurasie-URL"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP-instaanbediener"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS-instaanbediener"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "_FTP-instaanbediener"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "_Socks-gasheer"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
-msgstr "_Ignoreer rekenaars"
+msgstr "_Ignoreer gashere"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "HTTP-instaanpoort"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "HTTPS-instaanpoort"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "FTP-instaanpoort"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "SOCKS-instaanpoort"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "_Konfigurasie-URL"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Skakel toestel af"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Voeg toestel by"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Verwyder toestel"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "Nie opgestel nie"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN-Tipe"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Groepnaam"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Groepwagwoord"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "Gebruikernaam"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Skakel VPN-verbinding af"
 
@@ -2803,16 +2961,12 @@ msgstr "besonderhede"
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:2
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:11
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "_Wagwoord"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "Geen"
-
 #: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "Wys w_agwoord"
@@ -2825,13 +2979,21 @@ msgstr "Maak beskikbaar aan ander gebruikers"
 msgid "identity"
 msgstr "identiteit"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "_Adresse"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Slegs outomatiese (DHCP-) adresse"
 
 #: ../panels/network/network-wifi.ui.h:29
 msgid "Link-local only"
-msgstr ""
+msgstr "Skakel slegs plaaslik"
 
 #: ../panels/network/network-wifi.ui.h:30
 msgid "Shared with other computers"
@@ -2845,6 +3007,10 @@ msgstr "_Ignoreer roetes wat outomaties verkry is"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -2857,6 +3023,10 @@ msgstr "_Gekloonde MAC-adres"
 msgid "hardware"
 msgstr "hardeware"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "Stel te_rug"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -2875,506 +3045,575 @@ msgstr ""
 
 #: ../panels/network/network-wifi.ui.h:45
 msgid "reset"
-msgstr "stel terug"
+msgstr "herstel"
 
 #: ../panels/network/network-wifi.ui.h:50
 msgid "Hardware"
 msgstr "Hardeware"
 
+#: ../panels/network/network-wifi.ui.h:51
+#| msgid "Reset"
+msgctxt "tab"
+msgid "Reset"
+msgstr "Herstel"
+
 #: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi Hotspot"
-msgstr "Wi-Fi-toegangsarea"
+msgstr "Wi-Fi-Kuberkol"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Skakel aan"
+msgid "Switch off to connect to a Wi-Fi network"
+msgstr "Skakel af om aan 'n Wi-Fi-netwerk te koppel"
 
 #: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgid "Network Name"
+msgstr "Netwerknaam"
 
 #: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Skakel Wi-Fi af"
+msgid "Connected Devices"
+msgstr "Gekoppelde toestelle"
 
 #: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "Gebr_uik as toegangsarea…"
+msgid "Security type"
+msgstr "Sekuriteitstipe"
 
 #: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Koppel aan 'n versteekte netwerk…"
-
-#: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-msgid "_History"
-msgstr "_Geskiedenis"
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/printers/new-printer-dialog.ui.h:14
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "Password"
+msgstr "Wagwoord"
 
 #: ../panels/network/network-wifi.ui.h:59
-msgid "Switch off to connect to a Wi-Fi network"
-msgstr "Skakel af om aan 'n Wi-Fi-netwerk te koppel"
+msgid "Turn Wi-Fi off"
+msgstr "Skakel Wi-Fi af"
 
 #: ../panels/network/network-wifi.ui.h:60
-msgid "Network Name"
-msgstr "Netwerknaam"
+msgid "_Connect to Hidden Network…"
+msgstr "_Koppel aan 'n versteekte netwerk…"
 
 #: ../panels/network/network-wifi.ui.h:61
-msgid "Connected Devices"
-msgstr "Gekoppelde toestelle"
+#| msgid "Wi-Fi Hotspot"
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "_Skakel Wi-Fi-kuberkol aan…"
 
 #: ../panels/network/network-wifi.ui.h:62
-msgid "Security type"
-msgstr "Sekuriteitstipe"
+msgid "_Known Wi-Fi Networks"
+msgstr "_Bekende Wi-Fi Netwerke"
 
-#: ../panels/network/network-wifi.ui.h:63
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "Password"
-msgstr "Wagwoord"
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Maak seker u het 'n Wi-Fi-passtuk ingeprop en dat dit aangeskakel is"
+
+#: ../panels/network/wifi.ui.h:2
+#| msgid "No Pictures Found"
+msgid "No Wi-Fi Adapter Found"
+msgstr "Geen Wi-Fi passtukke gevind nie"
+
+#: ../panels/network/wifi.ui.h:3
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode"
+msgstr "Vlugmodus"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Deaktiveer Wi-Fi, Bluetooth en mobiele breëband"
+
+#: ../panels/network/wifi.ui.h:5
+#| msgid "Networks"
+msgid "Visible Networks"
+msgstr "Sigbare netwerke"
+
+#: ../panels/network/wifi.ui.h:6
+#| msgid "NetworkManager needs to be running."
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager moet loop"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Infrastruktuur"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "Status onbekend"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Nie bestuur nie"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Nie beskikbaar nie"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "Koppel tans"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
-msgstr ""
+msgstr "Verifikasie word vereis"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "Gekoppel"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Ontkoppel tans"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "Koppeling het misluk"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "Status onbekend (ontbreek)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Nie gekoppel nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Opstelling het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP-opstelling het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP-opstelling het verval"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "Geheime was nodig, maar is nie verskaf nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
-msgstr ""
+msgstr "802.1x supplicant ontkoppel"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
-msgstr ""
+msgstr "802.1x supplicant konfigurasie het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
-msgstr ""
+msgstr "802.1x supplicant het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
-msgstr ""
+msgstr "802.1x supplicant het te lank geneem om te verifieer"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPP-diens kon nie begin nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP-diens het ontkoppel"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP-kliënt kon nie begin nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP-kliëntfout"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP-kliënt het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
-msgstr ""
+msgstr "Gedeelde verbinding diens kon nie begin nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
-msgstr ""
+msgstr "Gedeelde verbinding diens het gebreek"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
-msgstr ""
+msgstr "AutoIP diens kon nie begin nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
-msgstr ""
+msgstr "AutoIP diens fout"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
-msgstr ""
+msgstr "AutoIP diens het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Lyn beset"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "Geen luitoon nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
-msgstr ""
+msgstr "Geen draer kon vasgestel word nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "Inbelversoek het uitgetel"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Inbelpoging het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Inisialisering van modem het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "Kon nie die gespesifiseerde APN kies nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "Soek nie tans vir netwerke nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Netwerkregistrasie geweier"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "Netwerkregistrasie het uitgetel"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "Kon nie registreer met die aangevraagde netwerk nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN-kontrole het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
-msgstr "Fermware vir die toestel ontbreek dalk"
+msgstr "Fermware vir die toestel ontbreek moontlik"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Verbinding het verdwyn"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "Het aangeneem daar is 'n bestaande verbinding"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "Modem nie gevind nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth-koppeling het misluk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIM-kaart nie in nie"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIM-PIN benodig"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIM-PUK benodig"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM verkeerd"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr ""
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Koppeling se afhanklikheid het misluk"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "Fermware ontbreek"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "Kabel uitgeprop"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Geen sertifikaatowerheid se sertifikaat is gekies nie"
+#: ../panels/network/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "ongedefinieerde vout in 802.1X sekuriteit (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Deur nie 'n sertifikaatowerheid (CA) se sertifikaat te gebruik nie kan lei "
-"tot onveilige, skelm Wi-Fi-netwerkverbindings.  Wil u 'n sertifikaat van 'n "
-"sertifikaatowerheid kies?"
+#: ../panels/network/wireless-security/eap-method.c:233
+#| msgid "No input source selected"
+msgid "no file selected"
+msgstr "geen lêer is geselekteer nie"
 
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "Ignoreer"
-
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Kies SO-sertifikaat"
+#: ../panels/network/wireless-security/eap-method.c:264
+msgid "unspecified error validating eap-method file"
+msgstr ""
+"ongespesifiseerde vout ondervind terwyl eap-metode lêer gevalideer word"
 
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER-, PEM-, of PKCS#12- private sleutels (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:439
+#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER-, PEM-, of PKCS#12- private sleutels (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- of PEM-sertifikate (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "vermiste EAP-FAST PAC lêer"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "Kies 'n PAC-lêer"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC-lêers (*.pac)"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+msgid "Anonymous"
+msgstr "Anoniem"
+
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+msgid "Authenticated"
+msgstr "Geverifieer"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+msgid "Both"
+msgstr "Altwee"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "PAC-_lêer"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:7
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-#, fuzzy
 #| msgid "<b>_Use authentication</b>"
 msgid "_Inner authentication"
-msgstr "<b>_Gebruik verifiëring</b>"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr ""
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr ""
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
-msgid "Anonymous"
-msgstr "Anoniem"
+msgstr "_Binne verifiëring"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-msgid "Authenticated"
-msgstr ""
+msgid "Allow automatic PAC pro_visioning"
+msgstr "Laat outomatiese PAC voorsiening toe"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
-msgid "Both"
-msgstr ""
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "vermisde EAP-LEAP gebruikersnaam"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "vermisde EAP-LEAP wagwoord"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "Gebr_uikernaam"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "_Wys wagwoord"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "ongeldige EAP-PEAP CA sertifikaat: %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "ongeldige EAP-PEAP CA sertifikaat: geen sertifikaat is verskaf nie"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:492
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Kies 'n sertifikaat vir die sertifikaatowerheid"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Weergawe 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Weergawe 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate"
 msgstr "S_O-sertifikaat"
 
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#| msgid "C_A certificate"
+msgid "No CA certificate is _required"
+msgstr "Geen CA sertifikaat word _benodig nie"
+
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "PEAP-_weergawe"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Vra tel_kens vir dié wagwoord"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "vermisde EAP gebruikersnaam"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+#| msgid "Wrong password"
+msgid "missing EAP password"
+msgstr "EAP wagwoord nie teenwoordig nie"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "vermisde EAP-TLS identiteit"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "ongeldige EAP-TLS CA sertifikaat: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "ongeldige EAP-TLS CA sertifikaat: geen sertifikaat is verskaf nie"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:100
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "ongeldige EAP-TLS privaat-sleutel: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:110
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "ongeldige EAP-TLS gebruikers-sertifikaat: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "Ongeënkripteerde privaatsleutels is onveilig"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:310
+#| msgid ""
+#| "The selected private key does not appear to be protected by a password.  "
+#| "This could allow your security credentials to be compromised.  Please "
+#| "select a password-protected private key.\n"
+#| "\n"
+#| "(You can password-protect your private key with openssl)"
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"Die gekose privaatsleutel word klaarblyklik nie met 'n wagwoord beskerm "
-"nie.  Dit kan dalk toelaat dat u sekuriteitsinligting gekompromitteer word.  "
-"Kies asb. 'n wagwoordbeskermde privaatsleutel.\n"
+"Die gekose privaatsleutel word klaarblyklik nie met 'n wagwoord beskerm nie. "
+"Dit kan dalk toelaat dat u sekuriteitsinligting gesteel word.  Kies asb. 'n "
+"wagwoordbeskermde privaatsleutel.\n"
 "\n"
 "('n Privaatsleutel kan d.m.v. openssl met 'n wagwoord beskerm word)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "Kies u persoonlike sertifikaat"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "Kies u privaatsleutel"
 
@@ -3386,114 +3625,156 @@ msgstr "I_dentiteit"
 msgid "_User certificate"
 msgstr "Gebr_uikersertifikaat"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "Privaats_leutel"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "Wagwoord vir _privaatsleutel"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "ongeldige EAP-TTLS CA sertifikaat: %s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "ongeldige EAP-TTLS CA sertifikaat: geen sertifikaat is verskaf nie"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (geen EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Moenie my _weer waarsku nie"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nee"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1X security"
+msgstr "Onbekende fout ervaar tydens die verifikasie van 802.1X sekuriteit"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:477
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Getonnelde TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Beskermde EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
-#, fuzzy
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
 #| msgid "<b>_Use authentication</b>"
 msgid "Au_thentication"
-msgstr "<b>_Gebruik verifiëring</b>"
+msgstr "Verifiëring"
+
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "vermisde leap-gebruikersnaam"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+#| msgid "Wrong password"
+msgid "missing leap-password"
+msgstr "leap-wagwoord nie teenwoordig nie"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "geen wep-kode verskaf nie"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+"ongeldige wep-kode: 'n kode met 'n lengte van %zu mag slegs hex-getalle bevat"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"ongeldige wep-kode: 'n kode met 'n lengte van %zu mag slegs ascii karakters "
+"bevat"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"ongeldige wep-kode: verkeerde kode lengte %zu 'n Kode moet 'n lengte van "
+"5/13 (ascii) of 10/26 (hex) hê"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "ongeldige wep-kode: wagwoord mag nie leeg wees nie"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "ongeldige wep-kode: wagwoord moet korter as 64 karakters wees"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (verstek)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "Oop stelsel"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Gedeelde sleutel"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "S_leutel"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "_Wys sleutel"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x"
+msgstr "WEP inde_ks"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
 msgstr ""
+"ongeldige wpa-psk: ongeldige kode lengte %zu. Moet [8,63] grepe of 64 hex "
+"nommers wees"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr "ongeldige wpa-psk: kan nie kode met 64 grepe as hex verstaan nie"
 
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "_Tipe"
 
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
-msgid "On"
-msgstr "Aan"
-
 #. This is the per application switch for message tray usage.
 #: ../panels/notifications/edit-dialog.ui.h:2
 msgctxt "notifications"
@@ -3507,42 +3788,56 @@ msgid "Sound _Alerts"
 msgstr "_Klankkennisgewings"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
+#| msgid "Notifications"
 msgctxt "notifications"
-msgid "Notification _Banners"
-msgstr "Kennisgewing_baniere"
+msgid "Notification _Popups"
+msgstr "Kennisgewings _Baniere"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
+#: ../panels/notifications/edit-dialog.ui.h:6
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr ""
+"Kennisgewings sal aanhou om in die kenisgewing lys vertoon te word as "
+"baniere gedeaktiveer word."
+
+#. Popups here refers to message tray notifications in the middle of the screen.
+#: ../panels/notifications/edit-dialog.ui.h:8
+#| msgctxt "notifications"
+#| msgid "Show Message _Content in Banners"
 msgctxt "notifications"
-msgid "Show Message _Content in Banners"
+msgid "Show Message _Content in Popups"
 msgstr "Wys _boodskapinhoud in baniere"
 
-#: ../panels/notifications/edit-dialog.ui.h:8
+#: ../panels/notifications/edit-dialog.ui.h:9
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "_Kennisgewings op geslote skerm"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: ../panels/notifications/edit-dialog.ui.h:10
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Wys _boodskapinhoud op geslote skerm"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#| msgid "Notifications"
+msgid "No­ti­fi­ca­tions"
 msgstr "Kennisgewings"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 msgid "Control which notifications are displayed and what they show"
 msgstr "Beheer watter kennisgewings wys en wat hulle bevat"
 
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr "Notifications;Banner;Message;Tray;Popup;kennisgewings;banier;boodskap;"
+msgstr "kennisgewings;banier;boodskap;"
 
 #: ../panels/notifications/notifications.ui.h:1
-msgid "Notification _Banners"
-msgstr "Kennisgewing_baniere"
+#| msgid "Notifications"
+msgid "Notification _Popups"
+msgstr "Kennisgewings _Baniere"
 
 #: ../panels/notifications/notifications.ui.h:2
 msgid "_Lock Screen Notifications"
@@ -3550,109 +3845,78 @@ msgstr "_Kennisgewings op geslote skerm"
 
 #. List of applications.
 #: ../panels/notifications/notifications.ui.h:4
-#: ../panels/sound/gvc-mixer-dialog.c:1781
+#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1787
 msgid "Applications"
 msgstr "Toepassings"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Ander"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "Voeg rekening by"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
-msgid "Mail"
-msgstr "Pos"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
-msgid "Chat"
-msgstr "Gesels"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
-msgid "Resources"
-msgstr "Hulpbronne"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "Fout met aanmeld met die rekening"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "Aanmeldinligting het verstryk."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "Meld aan om dié rekening te aktiveer."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "_Meld aan"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
-msgid "Error creating account"
-msgstr "Kon nie rekening skep nie"
+#. translators: This is the title of the "Show Account" dialog. The
+#. * %s is the name of the provider. e.g., 'Google'.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
+#, c-format
+#| msgid "My Account"
+msgid "%s Account"
+msgstr "%s Rekening"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "Kon nie rekening verwyder nie"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "Are you sure you want to remove the account?"
-msgstr "Wil u definitief die rekening skrap?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
-msgid "This will not remove the account on the server."
-msgstr "Die rekening op die bediener sal nié verwyder word nie."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
-msgid "_Remove"
-msgstr "_Verwyder"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
+#, c-format
+msgid "<b>%s</b> removed"
+msgstr "<b>%s</b> verwyder"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#| msgid "Online Accounts"
+msgid "On­line Accounts"
 msgstr "Aanlynrekeninge"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "Koppel met aanlynrekeninge en kies waarvoor hulle gebruik moet word"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;Pocket;ReadItLater;gesels;kalender;pos;epos;e-pos;kontak;"
+"google;facebook;twitter;yahoo;web;aanlyn;klets;kalender;pos;kontak;owncloud;"
+"kerberos;IMAP;SMTP;pocket;readitlater;"
 
+#. Translators: This is the button which allows undoing the removal of the printer.
 #: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "Geen aanlynrekeninge opgetel nie"
+#: ../panels/printers/printers.ui.h:4
+msgid "Undo"
+msgstr "Ontdoen"
+
+#: ../panels/online-accounts/online-accounts.ui.h:2
+msgid "Connect to your data in the cloud"
+msgstr "Koppel aan jou data in die wolk"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
-msgid "Remove Account"
-msgstr "Verwyder rekening"
+msgid "No internet connection — connect to set up new online accounts"
+msgstr ""
+"Geen internet verbinding. Koppel aan die internet om aanlyn rekeninge by te "
+"voeg"
 
 #: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "Voeg 'n aanlynrekening by"
+#| msgid "Add an online account"
+msgid "Add an account"
+msgstr "Voeg 'n rekening by"
 
 #: ../panels/online-accounts/online-accounts.ui.h:5
-msgid ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
-msgstr ""
-"Deur 'n rekening by te voeg, kan programme dit gebruik om dokumente, pos, "
-"kontakte, kalender, gesels, ens. te bekom."
+msgid "Remove Account"
+msgstr "Verwyder rekening"
 
 #: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
@@ -3757,7 +4021,7 @@ msgstr "Ononderbreekbare kragbron"
 #. TRANSLATORS: secondary battery
 #: ../panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
-msgstr "Persoonlike digitale assistent (PDA)"
+msgstr "Persoonlike digitale assistent"
 
 #. TRANSLATORS: secondary battery
 #: ../panels/power/cc-power-panel.c:549
@@ -3770,7 +4034,7 @@ msgid "Media player"
 msgstr "Mediaspeler"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "Tablet"
 
@@ -3781,7 +4045,7 @@ msgstr "Rekenaar"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2252
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "Battery"
 
@@ -3829,107 +4093,113 @@ msgstr "Batterye"
 msgid "When _idle"
 msgstr "Indien _ongebruik"
 
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1681
 msgid "Power Saving"
 msgstr "Kragbesparing"
 
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "_Skermhelderheid"
 
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1731
 msgid "Automatic brightness"
 msgstr "Outomatiese helderheid"
 
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "S_leutelbordhelderheid"
 
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "Ver_dof skerm wanneer onaktief"
 
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "_Wys swart skerm"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1828
 msgid "Turn off Wi-Fi to save power."
-msgstr "Skakel die draadlose netwerk af om krag te spaar."
+msgstr "Skakel die Wi-Fi af om krag te spaar."
 
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1853
 msgid "_Mobile broadband"
 msgstr "S_elfoonbreëband"
 
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1858
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr ""
 "Skakel selfoonbreëbandtoestelle (3G, 4G, LTE, ens.) af om krag te spaar."
 
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1966
 msgid "When on battery power"
 msgstr "Terwyl op batterykrag"
 
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "Terwyl ingeprop"
 
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2063
 msgid "Suspend"
 msgstr "Sluimer"
 
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "Skakel af"
+
+#: ../panels/power/cc-power-panel.c:2065
 msgid "Hibernate"
 msgstr "Hiberneer"
 
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Nothing"
 msgstr "Doen niks"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2180
 msgid "Suspend & Power Button"
 msgstr "Sluimer en kragknoppie"
 
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2219
 msgid "_Automatic suspend"
 msgstr "_Outomatiese sluimer"
 
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2220
 msgid "Automatic suspend"
 msgstr "Outomatiese sluimer"
 
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2287
 msgid "_When the Power Button is pressed"
 msgstr "_Wanneer die kragknoppie gedruk word"
 
-#: ../panels/power/cc-power-panel.c:2306
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
+#: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Toestelle"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
 msgstr "Krag"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "Bekyk batterystatus en verander instellings vir kragbesparing"
 
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"krag;slaap;sluimer;hiberneer;hiberneer;helderheid;dof;"
+"krag;slaap;sluimer;hiberneer;battery;helderheid;verdof;blanko;monitor;DPMS;"
+"onaktief;"
 
 #: ../panels/power/power.ui.h:3
 msgid "45 minutes"
@@ -3999,222 +4269,89 @@ msgstr "Ingepr_op"
 msgid "On _Battery Power"
 msgstr "Op _batterykrag"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
 msgid "Delay"
 msgstr "Wagtyd"
 
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "Kanselleer"
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
 
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
-msgstr ""
+msgstr "Verifieer"
+
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Gebruikernaam"
 
 #: ../panels/printers/authentication-dialog.ui.h:6
+#: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
-msgstr ""
-
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:589
-msgid "Low on toner"
-msgstr "Poeierink is min"
-
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:591
-msgid "Out of toner"
-msgstr "Poeierink is op"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:594
-msgid "Low on developer"
-msgstr "Ontwikkelingvloeistof is min"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:597
-msgid "Out of developer"
-msgstr "Ontwikkelingvloeistof is op"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
-msgid "Low on a marker supply"
-msgstr ""
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
-msgid "Out of a marker supply"
-msgstr ""
-
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
-msgid "Open cover"
-msgstr "Open deksel"
-
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
-msgid "Open door"
-msgstr "Oop deur"
-
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:607
-msgid "Low on paper"
-msgstr "Papier is min"
-
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:609
-msgid "Out of paper"
-msgstr "Papier is op"
-
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:611
-msgctxt "printer state"
-msgid "Offline"
-msgstr "Vanlyn"
-
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:613
-#: ../panels/printers/cc-printers-panel.c:804
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Gestop"
-
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:615
-msgid "Waste receptacle almost full"
-msgstr ""
-
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:617
-msgid "Waste receptacle full"
-msgstr ""
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:619
-msgid "The optical photo conductor is near end of life"
-msgstr ""
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
-msgid "The optical photo conductor is no longer functioning"
-msgstr ""
-
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:731
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "Word tans ingestel"
+msgstr "Verifikasie benodig"
 
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:790
-msgctxt "printer state"
-msgid "Ready"
-msgstr "Gereed"
-
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:795
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "Aanvaar nie take nie"
-
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:800
-msgctxt "printer state"
-msgid "Processing"
-msgstr "Verwerk tans"
-
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:920
-msgid "Toner Level"
-msgstr "Poeierinkvlak"
-
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:923
-msgid "Ink Level"
-msgstr "Inkvlak"
-
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:926
-msgid "Supply Level"
-msgstr "Voorraadvlak"
-
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:944
-msgctxt "printer state"
-msgid "Installing"
-msgstr "Word tans geïnstalleer"
-
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1452
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
 #, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u aktief"
-msgstr[1] "%u aktief"
+msgid "Printer “%s” has been deleted"
+msgstr "Die drukker \"%s\" is verwyder"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1793
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "Kon nie nuwe drukker byvoeg nie."
 
-#: ../panels/printers/cc-printers-panel.c:1960
-msgid "Select PPD File"
-msgstr "Kies PPD-lêer"
+#. Translators: The XML file containing user interface can not be loaded
+#: ../panels/printers/cc-printers-panel.c:1221
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "Kon nie die gebruikerkoppelvlak laai nie: %s"
 
-#: ../panels/printers/cc-printers-panel.c:1969
-msgid ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
-msgstr ""
-"PostScript-drukkerbeskrywings (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+#: ../panels/printers/details-dialog.ui.h:2
+#: ../panels/printers/printer-entry.ui.h:9
+msgid "Location"
+msgstr "Ligging"
 
-#: ../panels/printers/cc-printers-panel.c:2276
-msgid "No suitable driver found"
-msgstr "Geen gepaste drywer gevind nie"
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/details-dialog.ui.h:4
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Aandrywer"
 
-#: ../panels/printers/cc-printers-panel.c:2347
+#: ../panels/printers/details-dialog.ui.h:5
 msgid "Searching for preferred drivers…"
 msgstr "Soek tans vir voorkeurdrywers…"
 
-#: ../panels/printers/cc-printers-panel.c:2368
-msgid "Select from database…"
-msgstr "Kies uit database…"
+#: ../panels/printers/details-dialog.ui.h:6
+#| msgid "Search for a city"
+msgid "Search for Drivers"
+msgstr "Soek vir 'n drywerprogramatuur"
 
-#: ../panels/printers/cc-printers-panel.c:2377
-msgid "Provide PPD File…"
-msgstr "Verskaf PPD-lêer…"
+#: ../panels/printers/details-dialog.ui.h:7
+#| msgid "Select from database…"
+msgid "Select from Database…"
+msgstr "Kies uit 'n databasis…"
 
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2528
-#: ../panels/printers/cc-printers-panel.c:2551
-msgid "Test page"
-msgstr "Toetsbladsy"
-
-#: ../panels/printers/cc-printers-panel.c:2664
-msgid "No printers"
-msgstr "Geen drukkers nie"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3010
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "Kon nie die gebruikerkoppelvlak laai nie: %s"
+#: ../panels/printers/details-dialog.ui.h:8
+#| msgid "Provide PPD File…"
+msgid "Install PPD File…"
+msgstr "Verskaf PPD-lêer…"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#| msgid "Printers"
+msgid "Prin­ters"
 msgstr "Drukkers"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "Voeg drukkers by, bekyk druktake en kies hoe om te druk"
 
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr "Printer;Queue;Print;Paper;Ink;Toner;drukker;druk;papier;"
+msgstr "drukker;tou;druk;papier;ink;toner;"
 
 #. Translators: this action removes (purges) all the listed jobs from the list.
 #: ../panels/printers/jobs-dialog.ui.h:2
@@ -4226,28 +4363,67 @@ msgstr "Verwyder almal"
 msgid "No Active Printer Jobs"
 msgstr "Geen aktiewe druktake nie"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
+#. Translators: This is the title presented at top of the dialog.
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/printers/pp-new-printer-dialog.c:384
+#: ../panels/printers/pp-new-printer-dialog.c:456
+msgid "Add Printer"
 msgstr "Voeg drukker by"
 
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr ""
+#. Translators: This buttons submits the credentials for the selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:6
+#| msgid "Unlock"
+msgid "_Unlock"
+msgstr "_Ontsluit"
 
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "Geen drukkers bespeur nie."
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+#| msgid "No Pictures Found"
+msgid "No Printers Found"
+msgstr "Geen drukkers gevind nie"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
+#: ../panels/printers/new-printer-dialog.ui.h:10
 msgid "Enter a network address or search for a printer"
 msgstr "Tik 'n netwerkadres of soek vir 'n drukker"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "Laai tans keuses…"
+#: ../panels/printers/new-printer-dialog.ui.h:12
+#| msgid "Enter your username and password to view printers available on %s."
+msgid "Enter username and password to view printers on Print Server."
+msgstr ""
+"Voer u gebruikernaam en wagwoord in om beskikbare drukkers op bediener te "
+"sien."
+
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+#| msgid "Test page"
+msgid "Test Page"
+msgstr "Toetsbladsy"
+
+#. Translators: This is the title of the dialog. %s is the printer name.
+#: ../panels/printers/pp-details-dialog.c:123
+#: ../panels/printers/pp-details-dialog.c:415
+#, c-format
+#| msgid "Details"
+msgid "%s Details"
+msgstr "%s Besonderhede"
+
+#: ../panels/printers/pp-details-dialog.c:172
+msgid "No suitable driver found"
+msgstr "Geen gepaste drywer gevind nie"
+
+#: ../panels/printers/pp-details-dialog.c:316
+msgid "Select PPD File"
+msgstr "Kies PPD-lêer"
+
+#: ../panels/printers/pp-details-dialog.c:325
+msgid ""
+"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
+"PPD.GZ)"
+msgstr ""
+"PostScript-drukkerbeskrywings (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
@@ -4259,16 +4435,17 @@ msgid "Select"
 msgstr "Kies"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
-msgstr "Laai tans drywerdatabasis..."
+#| msgid "Loading drivers database..."
+msgid "Loading drivers database…"
+msgstr "Laai tans drywerdatabasis…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:526
+#: ../panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect-drukker"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:782
+#: ../panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD-drukker"
 
@@ -4311,169 +4488,196 @@ msgid "Reverse portrait"
 msgstr "Omgekeerde portret"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: ../panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "Hangend"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: ../panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "Wagtend"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "Verwerk tans"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: ../panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Gestop"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: ../panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Gekanselleer"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: ../panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Gestaak"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: ../panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "Voltooid"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:310
 #, c-format
+#| msgctxt "Printer jobs dialog title"
+#| msgid "%s - Active Jobs"
 msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s - Aktiewe take"
+msgid "%s — Active Jobs"
+msgstr "%s - Aktiewe Take"
+
+#: ../panels/printers/pp-new-printer-dialog.c:402
+#| msgid "Select Printer Driver"
+msgid "Unlock Print Server"
+msgstr "Sluit die druk bediener oop"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-new-printer-dialog.c:406
+#, c-format
+#| msgid "Unlock"
+msgid "Unlock %s."
+msgstr "Ontsluit %s."
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-new-printer-dialog.c:411
+#, c-format
+#| msgid "Enter your username and password to view printers available on %s."
+msgid "Enter username and password to view printers on %s."
+msgstr ""
+"Voer u gebruikersnaam en wagwoord in om beskikbare drukkers op %s te sien."
+
+#: ../panels/printers/pp-new-printer-dialog.c:876
+#| msgid "Not searching for networks"
+msgid "Searching for Printers"
+msgstr "Soek tans vir drukkers"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1659
+#: ../panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: ../panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "Seriepoort"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: ../panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "Parallelle poort"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "Ligging: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: ../panels/printers/pp-new-printer-dialog.c:1858
 #, c-format
 msgid "Address: %s"
 msgstr "Adres: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1747
+#: ../panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
-msgstr ""
+msgstr "Bediener nodig verifikasie"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Albei kante"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Papiertipe"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Papierbron"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Afvoerrakkie"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript-voor-filtrering"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Bladsye per kant"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Albei kante"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "Oriëntasie"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Algemeen"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Bladsyopstelling"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Installeerbare keuses"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Taak"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Beeldkwaliteit"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Kleur"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Afwerking"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Gevorderd"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Toetsbladsy"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4515,135 +4719,269 @@ msgstr "Geen filtrering vooraf nie"
 msgid "Manufacturer"
 msgstr "Vervaardiger"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Aandrywer"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:577
+#| msgid "Active Jobs"
+msgid "No Active Jobs"
+msgstr "Geen aktiewe take"
 
-#. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:248
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:582
 #, c-format
-msgid "Enter your username and password to view printers available on %s."
-msgstr "Tik u gebruikernaam en wagwoord om beskikbare drukkers op %s te sien."
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] "%u Taak"
+msgstr[1] "%u Take"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "Voeg drukker by"
+#. Translators: The printer is low on toner
+#: ../panels/printers/pp-printer-entry.c:730
+msgid "Low on toner"
+msgstr "Poeierink is min"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "Verwyder drukker"
+#. Translators: The printer has no toner left
+#: ../panels/printers/pp-printer-entry.c:732
+msgid "Out of toner"
+msgstr "Poeierink is op"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "Voorraad"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:735
+msgid "Low on developer"
+msgstr "Ontwikkelingvloeistof is min"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "Ligging"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:738
+msgid "Out of developer"
+msgstr "Ontwikkelingvloeistof is op"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "_Verstekdrukker"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:740
+msgid "Low on a marker supply"
+msgstr "Merkervoorraad is laag"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "Take"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:742
+msgid "Out of a marker supply"
+msgstr "Merkervoorraad is klaar"
 
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "Wys _take"
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/pp-printer-entry.c:744
+msgid "Open cover"
+msgstr "Open deksel"
+
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/pp-printer-entry.c:746
+msgid "Open door"
+msgstr "Oop deur"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/pp-printer-entry.c:748
+msgid "Low on paper"
+msgstr "Papier is min"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/pp-printer-entry.c:750
+msgid "Out of paper"
+msgstr "Papier is op"
+
+#. Translators: The printer is offline
+#: ../panels/printers/pp-printer-entry.c:752
+msgctxt "printer state"
+msgid "Offline"
+msgstr "Vanlyn"
+
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "Gestop"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/pp-printer-entry.c:756
+msgid "Waste receptacle almost full"
+msgstr "Afvalhouer byna vol"
 
-#: ../panels/printers/printers.ui.h:12
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/pp-printer-entry.c:758
+msgid "Waste receptacle full"
+msgstr "Afvalhouer vol"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:760
+msgid "The optical photo conductor is near end of life"
+msgstr "Die optiese fotogeleier is naby die einde van sy funksionele lewe"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:762
+msgid "The optical photo conductor is no longer functioning"
+msgstr "Die optiese fotogeleier werk nie meer nie"
+
+#. Translators: Printer's state (can start new job without waiting)
+#: ../panels/printers/pp-printer-entry.c:870
+msgctxt "printer state"
+msgid "Ready"
+msgstr "Gereed"
+
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: ../panels/printers/pp-printer-entry.c:875
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "Aanvaar nie take nie"
+
+#. Translators: Printer's state (jobs are processing)
+#: ../panels/printers/pp-printer-entry.c:880
+msgctxt "printer state"
+msgid "Processing"
+msgstr "Verwerk tans"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+#| msgid "Change printer settings"
+msgid "Clean print heads"
+msgstr "Maak drukkoppe skoon"
+
+#: ../panels/printers/printer-entry.ui.h:1
+#| msgid "Login Options"
+msgid "Printing Options"
+msgstr "Drukker Instellings"
+
+#: ../panels/printers/printer-entry.ui.h:2
+#| msgid "Printer Default"
+msgid "Printer Details"
+msgstr "Drukker Besonderhede"
+
+#. Set this printer as default
+#: ../panels/printers/printer-entry.ui.h:4
+#| msgid "Printer Default"
+msgid "Use Printer by Default"
+msgstr "Gebruik as verstek drukker"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:6
+#| msgid "Cancel Print Job"
+msgid "Clean Print Heads"
+msgstr "Maak drukkoppe skoon"
+
+#: ../panels/printers/printer-entry.ui.h:7
+msgid "Remove Printer"
+msgstr "Verwyder drukker"
+
+#: ../panels/printers/printer-entry.ui.h:8
 msgid "Model"
 msgstr "Model"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "etiket"
+#: ../panels/printers/printer-entry.ui.h:10
+msgid "Ink Level"
+msgstr "Inkvlak"
 
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr ""
+#. Translators: This is the message which follows the printer error.
+#: ../panels/printers/printer-entry.ui.h:12
+msgid "Please restart when the problem is resolved."
+msgstr "Herbegin die toestel as die probleem opgelos is."
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "bladsy 3"
+#. Translators: This is the button which restarts the printer.
+#: ../panels/printers/printer-entry.ui.h:14
+#| msgid "Restart Now"
+msgid "Restart"
+msgstr "Herbegin"
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "Druk _toetsbladsy"
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:2
+msgid "Add…"
+msgstr "Voeg by…"
 
-#. Translators: This button opens printer
-#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
-msgid "_Options"
-msgstr "_Keuses"
+#: ../panels/printers/printers.ui.h:5
+msgid "No printers"
+msgstr "Geen drukkers nie"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
-msgid "Add a Printer"
-msgstr "Voeg 'n drukker by"
+#: ../panels/printers/printers.ui.h:7
+#| msgid "Add a Printer"
+msgid "Add a Printer…"
+msgstr "Voeg 'n drukker by…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:9
+#| msgid ""
+#| "Sorry! The system printing service\n"
+#| "doesn't seem to be available."
 msgid ""
 "Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
 msgstr ""
 "Jammer! Die stelsel se drukdiens blyk\n"
 "nie beskikbaar te wees nie."
 
-#: ../panels/privacy/cc-privacy-panel.c:352 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "Skermslot"
 
-#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:438
+msgid "In use"
+msgstr "In gebruik"
+
+#: ../panels/privacy/cc-privacy-panel.c:443
+#| msgid "On"
+msgctxt "Location services status"
+msgid "On"
+msgstr "Aan"
+
+#: ../panels/privacy/cc-privacy-panel.c:444
+#| msgid "Off"
+msgctxt "Location services status"
+msgid "Off"
+msgstr "Af"
+
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#| msgid "_Location Services"
+msgid "Location Services"
+msgstr "Liggingdienste"
+
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "Gebruik en geskiedenis"
 
-#: ../panels/privacy/cc-privacy-panel.c:587
+#: ../panels/privacy/cc-privacy-panel.c:1071
 msgid "Empty all items from Trash?"
 msgstr "Skrap alle items uit die asblik?"
 
-#: ../panels/privacy/cc-privacy-panel.c:588
+#: ../panels/privacy/cc-privacy-panel.c:1072
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Alle items in die asblik sal permanent geskrap word."
 
-#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1073
 msgid "_Empty Trash"
 msgstr "Maak _asblik leeg"
 
-#: ../panels/privacy/cc-privacy-panel.c:612
+#: ../panels/privacy/cc-privacy-panel.c:1096
 msgid "Delete all the temporary files?"
 msgstr "Skrap alle tydelike lêers?"
 
-#: ../panels/privacy/cc-privacy-panel.c:613
+#: ../panels/privacy/cc-privacy-panel.c:1097
 msgid "All the temporary files will be permanently deleted."
 msgstr "Al die tydelike lêers sal permanent geskrap word."
 
-#: ../panels/privacy/cc-privacy-panel.c:614 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1098
 msgid "_Purge Temporary Files"
 msgstr "Vee tydelike lêers _permanent uit"
 
-#: ../panels/privacy/cc-privacy-panel.c:636 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "Permanente uitvee en tydelike lêers"
 
-#: ../panels/privacy/cc-privacy-panel.c:676 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "Sagtewaregebruik"
 
-#: ../panels/privacy/cc-privacy-panel.c:717 ../panels/privacy/privacy.ui.h:44
+#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "Probleemrapportering"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:731
+#: ../panels/privacy/cc-privacy-panel.c:1215
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4652,31 +4990,31 @@ msgstr ""
 "Verslae oor tegniese probleme help ons om %s te verbeter. Verslae word "
 "anoniem gestuur en word gesuiwer van persoonlike data."
 
-#: ../panels/privacy/cc-privacy-panel.c:743 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "Privaatheidbeleid"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
 msgstr "Privaatheid"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr "Beskerm persoonlike inligting en bepaal wat anders moontlik kan sien"
 
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;skerm;slot;sluit;privaat;onlangs;tydelik;indeks;naam;"
-"netwerk;identiteit;"
+"skerm;sluit;diagnose;privaat;onlangs;voorlopig;tmp;indeks;naam;netwerk;"
+"identiteit;"
 
 #: ../panels/privacy/privacy.ui.h:1
 msgid "Screen Turns Off"
-msgstr "skerm afskakel"
+msgstr "Skerm afskakel"
 
 #: ../panels/privacy/privacy.ui.h:2
 msgid "30 seconds"
@@ -4778,6 +5116,16 @@ msgstr "_Vee tydelike lêers outomaties permanent uit"
 msgid "Purge _After"
 msgstr "Vee permament uit n_a"
 
+#: ../panels/privacy/privacy.ui.h:34
+#| msgid "_Empty Trash"
+msgid "_Empty Trash…"
+msgstr "Maak _asblik leeg…"
+
+#: ../panels/privacy/privacy.ui.h:35
+#| msgid "_Purge Temporary Files"
+msgid "_Purge Temporary Files…"
+msgstr "Vee tydelike lêers _permanent uit…"
+
 #: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
@@ -4797,29 +5145,33 @@ msgstr ""
 msgid "_Send software usage statistics"
 msgstr "_Stuur statistiek oor sagtewaregebruik"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:43
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"Liggingdienste laat programme toe om jou ligging te weet. Die gebruik van Wi-"
+"Fi en mobiele breëband verhoog akkuraatheid."
+
+#: ../panels/privacy/privacy.ui.h:44
 msgid "_Location Services"
 msgstr "_Liggingdienste"
 
-#: ../panels/privacy/privacy.ui.h:43
-msgid "Used to determine your geographical location"
-msgstr "Om u geografiese ligging mee te bepaal"
-
-#: ../panels/privacy/privacy.ui.h:45
+#: ../panels/privacy/privacy.ui.h:47
 msgid "_Automatic Problem Reporting"
 msgstr "Outom_atiese probleemrapportering"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Brits"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metriek"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "Geen streke gevind nie"
 
@@ -4827,26 +5179,16 @@ msgstr "Geen streke gevind nie"
 msgid "No input sources found"
 msgstr "Geen toevoerbronne gevind nie"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Ander"
 
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1072
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "Die sessie moet herbegin word sodat veranderinge kan neerslag vind"
-
-#: ../panels/region/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1076
-msgid "Restart Now"
-msgstr "Herbegin nou"
-
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "Geen toevoerbronne gekies nie"
 
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "Aanmeld_skerm"
 
@@ -4867,38 +5209,45 @@ msgid "Times"
 msgstr "Tye"
 
 #: ../panels/region/format-chooser.ui.h:7
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "Datum en Tyd"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "Getalle"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "Mates"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "Papier"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Streek en taal"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#| msgid "Region & Language"
+msgid "Re­gion & Lan­guage"
+msgstr "Streek en Taal"
+
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr "Kies die vertoontaal, formate, sleutelborduitlegte en toevoerbronne"
 
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
-msgstr ""
-"Language;Layout;Keyboard;Input;taal;uitleg;sleutelbord;toetsbord;toevoer;"
+msgstr "taal;uitleg;sleutelbord;toevoer;"
 
 #: ../panels/region/input-chooser.ui.h:1
 msgid "Add an Input Source"
 msgstr "Voeg 'n toevoerbron by"
 
 #: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
+#| msgid "Input methods can't be used on the login screen"
+msgid "Input methods can’t be used on the login screen"
 msgstr "Toevoermetodes kan nie gebruik word op die aanmeldskerm nie"
 
 #: ../panels/region/input-options.ui.h:1
@@ -4913,10 +5262,6 @@ msgstr "Gebruik die _selfde bron vir alle vensters"
 msgid "Allow _different sources for each window"
 msgstr "_Laat verskillende uitlegte in elke venster toe"
 
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "Sleutelbordkortpaaie"
-
 #: ../panels/region/input-options.ui.h:5
 msgid "Switch to previous source"
 msgstr "Skakel na vorige bron"
@@ -4939,7 +5284,7 @@ msgstr "Verander gerus dié kortpaaie in sleutelbordinstellings"
 
 #: ../panels/region/input-options.ui.h:10
 msgid "Alternative switch to next source"
-msgstr ""
+msgstr "Alternatiewe skakelaar na volgende bron"
 
 #: ../panels/region/input-options.ui.h:11
 msgid "Left+Right Alt"
@@ -4955,94 +5300,110 @@ msgid "English (United Kingdom)"
 msgstr "Engels (Verenigde Koninkryk)"
 
 #: ../panels/region/region.ui.h:3
+#| msgid "Your session needs to be restarted for changes to take effect"
+msgid "Restart the session for changes to take effect"
+msgstr "Die sessie moet herbegin word sodat veranderinge kan neerslag vind"
+
+#: ../panels/region/region.ui.h:4
+#| msgid "Restart Now"
+msgid "Restart…"
+msgstr "Herbegin…"
+
+#: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "_Formate"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:6
 msgid "United Kingdom"
 msgstr "Verenigde Koninkryk"
 
-#: ../panels/region/region.ui.h:5
+#: ../panels/region/region.ui.h:7
 msgid "Input Sources"
 msgstr "Toevoerbronne"
 
-#: ../panels/region/region.ui.h:7
+#: ../panels/region/region.ui.h:8
+msgid "_Options"
+msgstr "_Keuses"
+
+#: ../panels/region/region.ui.h:9
 msgid "Add input source"
 msgstr "Voeg toevoerbron by"
 
-#: ../panels/region/region.ui.h:8
+#: ../panels/region/region.ui.h:10
 msgid "Remove input source"
 msgstr "Verwyder toevoerbron"
 
-#: ../panels/region/region.ui.h:9
+#: ../panels/region/region.ui.h:11
 msgid "Move input source up"
 msgstr "Skuif toevoerbron op"
 
-#: ../panels/region/region.ui.h:10
+#: ../panels/region/region.ui.h:12
 msgid "Move input source down"
 msgstr "Skuif toevoerbron af"
 
-#: ../panels/region/region.ui.h:11
+#: ../panels/region/region.ui.h:13
 msgid "Configure input source"
 msgstr "Stel toevoerbron op"
 
-#: ../panels/region/region.ui.h:12
+#: ../panels/region/region.ui.h:14
 msgid "Show input source keyboard layout"
 msgstr "Wys sleutelborduitleg van toevoerbron"
 
-#: ../panels/region/region.ui.h:13
+#: ../panels/region/region.ui.h:15
 msgid "Login settings are used by all users when logging into the system"
 msgstr ""
 "Aanmeldinstellings word deur alle gebruikers gebruik wanneer hulle by die "
 "stelsel aanmeld"
 
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Plekke"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Boekmerke"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Ander"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Kies ligging"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_OK"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "Geen toepassings gevind nie"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "Soek"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "Kies watter programme soekresultate wys in die Aktiwiteitoorsig"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
-msgstr ""
-"Search;Find;Index;Hide;Privacy;Results;soek;vind;indeks;vertseek;privaatheid;"
-"resultate;"
+msgstr "soek;vind;indeks;versteek;privaatheid;resultate;"
 
 #: ../panels/search/search-locations-dialog.ui.h:1
 msgid "Search Locations"
 msgstr "Soekliggings"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+#| msgctxt "Search Location"
+#| msgid "Places"
+msgid "Places"
+msgstr "Plekke"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+#| msgctxt "Search Location"
+#| msgid "Bookmarks"
+msgid "Bookmarks"
+msgstr "Boekmerke"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+#| msgctxt "Online Account"
+#| msgid "Other"
+msgid "Other"
+msgstr "Ander"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "Skuif op"
@@ -5055,53 +5416,101 @@ msgstr "Skuif af"
 msgid "Preferences"
 msgstr "Voorkeure"
 
-#: ../panels/sharing/cc-sharing-panel.c:263
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "Geen netwerke gekies vir deling nie"
+
+#: ../panels/sharing/cc-sharing-panel.c:273
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Aan"
 
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: ../panels/sharing/cc-sharing-panel.c:275
+#: ../panels/sharing/cc-sharing-panel.c:302
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Af"
 
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:305
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Geaktiveer"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:308
 msgctxt "service is active"
 msgid "Active"
 msgstr "Aktief"
 
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: ../panels/sharing/cc-sharing-panel.c:379
 msgid "Choose a Folder"
 msgstr "Kies 'n gids"
 
-#: ../panels/sharing/cc-sharing-panel.c:798
+#: ../panels/sharing/cc-sharing-panel.c:690
+#, c-format
+msgid ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr ""
+"Persoonlike lêerdeling maak dit moontlik om die Publiek-gids te deel met "
+"ander op die huidige netwerk m.b.v: <a href=\"dav://%s\">dav://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:692
+#, c-format
+#| msgid ""
+#| "Allow remote users to connect using the Secure Shell command:\n"
+#| "<a href=\"ssh %s\">ssh %s</a>"
+msgid ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"Wanneer afgeleë toegang geaktiveer is kan afgeleë gebruikers koppel met die "
+"Secure Shell-opdrag:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:694
+#, c-format
+#| msgid ""
+#| "Allow remote users to view or control your screen by connecting to: <a "
+#| "href=\"vnc://%s\">vnc://%s</a>"
+msgid ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"Laat afgeleë gebruikers toe om die skerm te sien of te beheer deur te koppel "
+"aan: <a href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:806
 msgid "Copy"
 msgstr "Kopieer"
 
-#: ../panels/sharing/cc-sharing-panel.c:1124
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1233
 msgid "Sharing"
 msgstr "Deling"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+#| msgid "Sharing"
+msgid "Sha­ring"
+msgstr "Deling"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr "Kies wat om te deel met ander"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
 msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;deel;deling;gasheer;naam;afgeleë;werkskerm;oudio;klank"
-";prente;foto's;flieks;flims;bediener;"
+"deel;deling;ssh;gasheer;naam;afgeleë;werkskerm;media;klank;video;prente;"
+"fotos;flieks;bediener;"
+
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "Netwerke"
 
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
@@ -5109,27 +5518,16 @@ msgstr "Aktiveer of deaktiveer afgeleë aanmelding"
 
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
 msgid "Authentication is required to enable or disable remote login"
-msgstr ""
-
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "Geen netwerke gekies vir deling nie"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "Netwerke"
+msgstr "Verifikasie is nodig om afgeleë aanmelding aan of af te skakel"
 
 #: ../panels/sharing/sharing.ui.h:1
 msgid "_Computer Name"
 msgstr "_Rekenaarnaam"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "_Persoonlike lêerdeling"
+#| msgid "_Personal File Sharing"
+msgid "_File Sharing"
+msgstr "_Lêerdeling"
 
 #: ../panels/sharing/sharing.ui.h:3
 msgid "_Screen Sharing"
@@ -5148,82 +5546,58 @@ msgid "Some services are disabled because of no network access."
 msgstr "Sommige dienste is gedeaktiveer weens 'n gebrek aan netwerktoegang."
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "Persoonlike lêerdeling"
+#| msgid "Sharing"
+msgid "File Sharing"
+msgstr "Lêerdeling"
 
-#: ../panels/sharing/sharing.ui.h:9
-#, no-c-format
-msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"Persoonlike lêerdeling maak dit moontlik om die Publiek-gids te deel met "
-"ander op die huidige netwerk m.b.v: <a href=\"dav://%s\">dav://%s</a>"
-
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
 msgid "_Require Password"
 msgstr "Ve_reis wagwoord"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Remote Login"
 msgstr "Afgeleë aanmelding"
 
-#: ../panels/sharing/sharing.ui.h:14
-#, no-c-format
-msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"Laat afgeleë gebruikers toe om te koppel m.b.v. die Secure Shell-opdrag:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-
-#: ../panels/sharing/sharing.ui.h:16
+#: ../panels/sharing/sharing.ui.h:11
 msgid "Screen Sharing"
 msgstr "Skermdeling"
 
-#: ../panels/sharing/sharing.ui.h:18
-#, no-c-format
-msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"Laat afgeleë gebruikers toe om die skerm te sien of te beheer deur te koppel "
-"aan: <a href=\"vnc://%s\">vnc://%s</a>"
-
-#: ../panels/sharing/sharing.ui.h:19
-msgid "_Allow Remote Control"
-msgstr "L_aat eksterne beheer toe"
+#: ../panels/sharing/sharing.ui.h:12
+msgid "_Allow connections to control the screen"
+msgstr "_Laat verbindings toe om die skerm te beheer"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
 msgid "_Show Password"
 msgstr "Wy_s wagwoord"
 
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Access Options"
 msgstr "Toegangskeuses"
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
 msgid "_New connections must ask for access"
 msgstr "_Nuwe verbindings moet vra vir toegang"
 
-#: ../panels/sharing/sharing.ui.h:24
+#: ../panels/sharing/sharing.ui.h:17
 msgid "_Require a password"
 msgstr "Ve_reis 'n wagwoord"
 
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:18
 msgid "Media Sharing"
 msgstr "Mediadeling"
 
-#: ../panels/sharing/sharing.ui.h:26
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr "Deel musiek, foto's en video's oor die netwerk met mediadeling."
+#: ../panels/sharing/sharing.ui.h:19
+#| msgid ""
+#| "Media sharing allows you to share music, photos and videos over the "
+#| "network."
+msgid "Share music, photos and videos over the network."
+msgstr "Deel musiek, foto's en video's oor die netwerk."
 
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
 msgstr "Gidse"
 
@@ -5238,9 +5612,7 @@ msgstr "Verander klankvolume, toevoer, afvoer en kennisgewingklanke"
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;kaart;mikrofoon;"
-"uitdoof;balans;kopstuk;oudio;klank;"
+msgstr "kaart;mikrofoon;volume;doof;balans;bluetooth;kopstuk;klank;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
@@ -5325,7 +5697,7 @@ msgstr "_Profiel:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -5334,14 +5706,14 @@ msgstr[1] "%u afvoere"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u toevoer"
 msgstr[1] "%u toevoere"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Stelselklanke"
 
@@ -5353,61 +5725,56 @@ msgstr "_Toets luidsprekers"
 msgid "Peak detect"
 msgstr "Spitsbespeuring"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "Naam"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: ../panels/sound/gvc-mixer-dialog.c:1518
 msgid "Device"
 msgstr "Toestel"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: ../panels/sound/gvc-mixer-dialog.c:1581
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Luidsprekertoets vir %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: ../panels/sound/gvc-mixer-dialog.c:1637
 msgid "_Output volume:"
 msgstr "_Afvoervolume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: ../panels/sound/gvc-mixer-dialog.c:1651
 msgid "Output"
 msgstr "Afvoer"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "C_hoose a device for sound output:"
 msgstr "_Kies 'n toestel vir klankafvoer:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: ../panels/sound/gvc-mixer-dialog.c:1678
 msgid "Settings for the selected device:"
 msgstr "Instellings vir die gekose toestel:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: ../panels/sound/gvc-mixer-dialog.c:1689
 msgid "Input"
 msgstr "Toevoer"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: ../panels/sound/gvc-mixer-dialog.c:1696
 msgid "_Input volume:"
 msgstr "_Toevoervolume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1717
 msgid "Input level:"
 msgstr "Toevoervlak:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: ../panels/sound/gvc-mixer-dialog.c:1743
 msgid "C_hoose a device for sound input:"
 msgstr "_Kies 'n toestel vir klanktoevoer:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1767
 msgid "Sound Effects"
 msgstr "Klankeffekte"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-mixer-dialog.c:1774
 msgid "_Alert volume:"
 msgstr "W_aarskuwingvolume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "No application is currently playing or recording audio."
 msgstr "Geen toepassing wat tans oudio speel of opneem nie."
 
@@ -5428,6 +5795,7 @@ msgid "Testing event sound"
 msgstr "Toets tans gebeurtenisklank"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "Default"
 msgstr "Verstek"
 
@@ -5452,24 +5820,75 @@ msgstr "Toets"
 msgid "Subwoofer"
 msgstr "Basluidspreker"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "Doelgemaak"
 
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+#| msgid "Default"
+msgctxt "cursor size"
+msgid "Default"
+msgstr "Verstek"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+#| msgctxt "Calibration quality"
+#| msgid "Medium"
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Medium"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Groot"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+#| msgctxt "universal access, text size"
+#| msgid "Larger"
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Groter"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "Grootste"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d beeldpunt"
+msgstr[1] "%d beeldpunte"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+#| msgid "Universal Access"
+msgid "Uni­ver­sal Access"
+msgstr "Universele toegang"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "Maak sien, hoor, tik, wys en klik makliker"
 
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;sleutelbord;muis;toeganklikheid;"
-"kontras;zoem;skermleser;teks;lettertipe;grootte;kleefsleutels;stadige "
-"sleutels;bonssleutels;muissleutels;"
+"sleutelbord;muis;a11y;toeganklikheid;kontras;zoem;skerm;leser;teks;"
+"lettertipe;grootte;accessx;kleefsleutels;stadige;sleutels;bons;dubbel;klik;"
+"vertraag;help;herhaal;flikker;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5488,283 +5907,299 @@ msgid "_Large Text"
 msgstr "_Groot teks"
 
 #: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "_Wysergrootte"
+
+#: ../panels/universal-access/uap.ui.h:6
 #: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "_Zoem"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
 msgid "Screen _Reader"
 msgstr "Ske_rmleser"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
 msgid "_Sound Keys"
 msgstr "Klank_sleutels"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Hearing"
 msgstr "Hoor"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
 msgid "_Visual Alerts"
 msgstr "_Visuele waarskuwings"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Screen _Keyboard"
 msgstr "S_kermsleutelbord"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
 msgid "R_epeat Keys"
 msgstr "H_erhaalsleutels"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Cursor _Blinking"
 msgstr "Wyser _flikker"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
 msgid "_Typing Assist (AccessX)"
 msgstr "_Tik-assistent (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Pointing & Clicking"
 msgstr "Wys en klik"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Mouse Keys"
 msgstr "_Muissleutels"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
 msgid "_Click Assist"
 msgstr "_Klik-assistent"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
 msgid "_Double-Click Delay"
 msgstr "Wagtyd vir _dubbelklik"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Double-Click Delay"
 msgstr "Wagtyd vir dubbelklik"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+msgid "Cursor Size"
+msgstr "Wysergrootte"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr ""
+"Muis grootte kan gekombineer word met die zoem funksie om dit makliker te "
+"maak om te sien."
+
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Skermleser"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "Die skermleser lees die vertoonde teks soos die fokus verskuif."
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
 msgid "_Screen Reader"
 msgstr "_Skermleser"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Sound Keys"
 msgstr "Klanksleutels"
 
-#: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
-msgstr "Biep wanneer Caps- en NumLock gebruik word."
+#: ../panels/universal-access/uap.ui.h:28
+#| msgid "Beep when Num Lock or Caps Lock are turned on."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "Biep wanneer Caps- of NumLock aan of af geskakel word."
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Visual Alerts"
 msgstr "Visuele waarskuwings"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Test flash"
 msgstr "_Toets flits"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Use a visual indication when an alert sound occurs."
 msgstr ""
 "Gebruik 'n visuele aanduiding wanneer 'n waarskuwingklank gespeel word."
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Flash the _window title"
 msgstr "Flits die _venstertitel"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the entire _screen"
 msgstr "Flits die _hele skerm"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Repeat Keys"
 msgstr "Herhaalsleutels"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Key presses repeat when key is held down."
 msgstr "Sleuteldrukke herhaal wanneer sleutel ingehou word."
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
 msgid "Repeat keys delay"
 msgstr "Wagtyd vir herhaalsleutels"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Speed"
 msgstr "Spoed"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Repeat keys speed"
 msgstr "Herhaalsleutelspoed"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Cursor Blinking"
 msgstr "Wyser flikker"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Cursor blinks in text fields."
 msgstr "Wyser flikker in teksvelde."
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Cursor blinking speed"
 msgstr "Wyser se flikkerspoed"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
 msgid "Typing Assist"
 msgstr "Tik-assistent"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
 msgid "_Sticky Keys"
 msgstr "_Kleefsleutels"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Hanteer opeenvolgende wysigersleutels as 'n sleutelkombinasie"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
 msgid "_Disable if two keys are pressed together"
 msgstr "_Deaktiveer indien twee sleutels gelyktydig gedruk word"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Beep when a _modifier key is pressed"
 msgstr "Biep wanneer 'n _wysigsleutel gedruk word"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
 msgid "S_low Keys"
 msgstr "Stadige s_leutels"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr ""
 "Wag 'n rukkie tussen wanneer 'n sleutel gedruk word en wanneer dit aanvaar "
 "word"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
 msgid "A_cceptance delay:"
 msgstr "Wagtyd _voor aanvaarding:"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Kort"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Slow keys typing delay"
 msgstr "Stadige sleutels se tikwagtyd"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Lank"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is pr_essed"
 msgstr "Bi_ep as 'n sleutel gedruk word"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Beep when a key is _accepted"
 msgstr "Biep as 'n sleutel _aanvaar word"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Beep when a key is _rejected"
 msgstr "Biep as 'n sleutel ve_rwerp word"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
 msgid "_Bounce Keys"
 msgstr "_Bonssleutels"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignoreer duplikaatsleutels kort na mekaar"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Kort"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Bounce keys typing delay"
 msgstr "Bonssleutels se tikwagtyd"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Lank"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Enable by Keyboard"
 msgstr "_Aktiveer met sleutelbord"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Skakel toeganklikheidfunksies aan en af met die sleutelbord"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Click Assist"
 msgstr "Klik-assistent"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
 msgid "_Simulated Secondary Click"
 msgstr "Ge_simuleerder sekondêre klik"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Doen 'n sekondêre klik deur die primêre knoppie in te hou"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Kort"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Secondary click delay"
 msgstr "Sekondêre klikwagtyd"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Lank"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
 msgid "_Hover Click"
 msgstr "Swee_fklik"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Trigger a click when the pointer hovers"
 msgstr "Registreer 'n klik wanneer die muiswyser sweef"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
 msgid "D_elay:"
 msgstr "V_ertraging:"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Kort"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Lank"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Motion _threshold:"
 msgstr "_Bewegingsdrempel:"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Klein"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Groot"
@@ -5946,92 +6381,80 @@ msgid "Color Effects"
 msgstr "Kleureffekte"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Gewoon"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Administrateur"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Voeg gebruiker by"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
 msgid "_Full Name"
 msgstr "_Volle naam"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#| msgctxt "Account type"
+#| msgid "Standard"
+msgid "Standard"
+msgstr "Standaard"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#| msgctxt "Account type"
+#| msgid "Administrator"
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
 msgstr "Rekening_tipe"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
 msgid "Allow user to set a password when they next _login"
 msgstr "_Laat gebruiker toe om 'n wagwoord in te stel met volgende aanmelding"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
 msgid "Set a password _now"
 msgstr "Stel 'n wagwoord _nou in"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "Be_vestig"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#| msgid "_Configure..."
+msgid "_Confirm"
+msgstr "_Bevestig"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#| msgid ""
+#| "Enterprise login allows an existing centrally managed user account to be "
+#| "used on this device."
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 msgstr ""
-"Ondernemingaanmelding maak dat 'n bestaande, sentraal bestuurde "
-"gebruikerrekening op dié toestel gebruik kan word."
+"Onderneming-aanmelding maak dat 'n bestaande, sentraal bestuurde "
+"gebruikerrekening op dié toestel gebruik kan word. U kan ook die rekening "
+"gebruik om toegang tot maatskapy hulpbronne op die internet te kry."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
 msgid "_Domain"
 msgstr "_Domein"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"Gaan aanlyn om onderneming-\n"
-"aanmeldrekeninge by te voeg."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "_Onderneming-aanmelding"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "Voeg gebruiker by"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr ""
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "Aanmelding as domein se administrateur"
+#| msgctxt "printer state"
+#| msgid "Offline"
+msgid "You are Offline"
+msgstr "Jy is vanlyn af"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "Administrateur_naam"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#| msgid ""
+#| "Go online to add\n"
+#| "enterprise login accounts."
+msgid "You must be online in order to add enterprise users."
+msgstr "Jy moet aanlyn wees om onderneming-gebruikers by te voeg."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "Administrateurwagwoord"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "_Onderneming-aanmelding"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6066,7 +6489,7 @@ msgid "Right little finger"
 msgstr "Regterpinkie"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:680
 msgid "Enable Fingerprint Login"
 msgstr "Aktiveer aanmelding met vingerafdruk"
 
@@ -6101,13 +6524,35 @@ msgstr "Voeg by of skrap gebruikers en verander u wagwoord"
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
+msgstr "aanmeld;naam;vingerafdruk;embleem;gesig;wagwoord;"
+
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_Inskryf"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Aanmelding as domein se administrateur"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
 msgstr ""
-"Login;Name;Fingerprint;Avatar;Logo;Face;Password;aanmeld;naam;vingerafdruk;"
-"embleem;gesig;wagwoord;meld aan;"
+"Om die maatskappy se aanmeldstelsel te kan gebruik, moet hierdie rekenaar "
+"aan die\n"
+"domein gekoppel wees. Laat u netwerkadministrateur\n"
+"hul domeinwagwoord hier invul."
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "Aanmeldgeskiedenis"
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "Administrateur_naam"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Administrateurwagwoord"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Change Password"
@@ -6130,24 +6575,26 @@ msgid "Current _Password"
 msgstr "Huidige _wagwoord"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
+#| msgid "Allow user to set a password when they next login"
+msgid "Allow user to change their password on next login"
 msgstr "Laat gebruiker toe om 'n wagwoord in te stel met volgende aanmelding"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "Stel 'n wagwoord nou in"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "Voeg gebruikerrekening by"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#| msgid "Add User"
+msgid "_Add User…"
+msgstr "_Voeg gebruiker by…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "Verwyder gebruikerrekening"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Die sessie moet herbegin word sodat veranderinge kan neerslag vind"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "Aanmeldkeuses"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Herbegin nou"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
@@ -6165,13 +6612,18 @@ msgstr "Gebruikerikoon"
 msgid "Last Login"
 msgstr "Laas aangemeld"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#| msgid "Remove User Account"
+msgid "Remove User…"
+msgstr "Verwyder gebruiker…"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Bestuur gebruikerrekeninge"
 
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
 msgid "Authentication is required to change user data"
-msgstr ""
+msgstr "Verifikasie is nodig om gebruikersdata te verander"
 
 #: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
@@ -6258,57 +6710,43 @@ msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Bly eerder weg van patrone soos 1234 of abcd."
 
 #: ../panels/user-accounts/pw-utils.c:115
+#| msgctxt "Password hint"
+#| msgid "Try to use a mixture of letters, numbers and punctuation."
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "Probeer om meer letters, syfers en simbole by te voeg."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr ""
+"Die wagwoord moet langer wees. Probeer om 'n mengsel van letters, syfers en "
+"leestekens te gebruik."
 
 #: ../panels/user-accounts/pw-utils.c:117
+#| msgctxt "Password hint"
+#| msgid "Mix uppercase and lowercase and use a number or two."
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
+msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "Meng hoof- en kleinletters en gebruik 'n syfer of twee."
 
+# Notes:
+# Add Note
+#
+# Context:
+# Password hint
 #: ../panels/user-accounts/pw-utils.c:119
+#| msgctxt "Password hint"
+#| msgid ""
+#| "Good password! Adding more letters, numbers and punctuation will make it "
+#| "stronger."
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
+"Adding more letters, numbers and punctuation will make the password stronger."
 msgstr ""
 "Goeie wagwoord! Meer letters, syfers en leestekens sal dit selfs nog sterker "
 "maak."
 
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Sterkte: Baie swak"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Sterkte: Swak"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Sterkte: Medium"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Sterkte: Goed"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Sterkte: Baie goed"
-
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
-msgstr ""
+msgstr "Verifikasie het misluk"
 
 #: ../panels/user-accounts/run-passwd.c:502
 #, c-format
@@ -6343,7 +6781,7 @@ msgstr "Die ou en nuwe wagwoorde is die selfde"
 #: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
-msgstr ""
+msgstr "Jou wagwoord het verander sedert jy aanvanklik geverifieer is!"
 
 #: ../panels/user-accounts/run-passwd.c:532
 #, c-format
@@ -6356,70 +6794,88 @@ msgid "Unknown error"
 msgstr "Onbekende fout"
 
 #: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
+#| msgid "Should match the web address of your account provider."
+msgid "Should match the web address of your login provider."
 msgstr "Moet pas by die webadres van die rekeningverskaffer."
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: ../panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "Kon nie 'n rekening byvoeg nie"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Wagwoorde stem nie ooreen nie."
 
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "Kon nie rekening registreer nie"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
-msgstr ""
+msgstr "Geen ondersteunde manier om met hierdie domein te verifieer nie"
 
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Kon nie by domein aansluit nie"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1041
+#| msgid ""
+#| "That login name didn't work.\n"
+#| "Please try again."
 msgid ""
-"That login name didn't work.\n"
+"That login name didn’t work.\n"
 "Please try again."
 msgstr ""
 "Daardie gebruikernaam het nie gewerk nie.\n"
 "Probeer gerus weer."
 
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1048
+#| msgid ""
+#| "That login password didn't work.\n"
+#| "Please try again."
 msgid ""
-"That login password didn't work.\n"
+"That login password didn’t work.\n"
 "Please try again."
 msgstr ""
 "Daardie wagwoord het nie gewerk nie.\n"
 "Probeer gerus weer."
 
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Kon nie by domein aanmeld nie"
 
-#: ../panels/user-accounts/um-account-dialog.c:1116
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+#| msgid "Unable find the domain. Maybe you misspelled it?"
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "Kon nie die domein vind nie. Is dit reg gespel?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Gewoon"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr ""
 "U mag nie toegang kry tot die toestel nie. Kontak die stelseladministrateur."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
 msgstr "Die toestel is reeds in gebruik."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
 msgstr "'n Interne fout het voorgekom."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
 msgid "Enabled"
 msgstr "Geaktiveer"
 
@@ -6449,22 +6905,23 @@ msgstr "Klaar!"
 #: ../panels/user-accounts/um-fingerprint-dialog.c:504
 #: ../panels/user-accounts/um-fingerprint-dialog.c:546
 #, c-format
-msgid "Could not access '%s' device"
-msgstr "Kon nie toegang kry tot die toestel '%s' nie"
+#| msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
+msgstr "Kon nie toegang tot die toestel \"%s\" kry nie"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
 #: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #, c-format
-msgid "Could not start finger capture on '%s' device"
-msgstr ""
+msgid "Could not start finger capture on “%s” device"
+msgstr "Kon nie vingeropname op \"%s\" begin nie"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr "Kon nie toegang kry tot enige vingerafdruklesers nie"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:632
 msgid "Please contact your system administrator for help."
 msgstr "Kontak u stelseladministrateur vir hulp."
 
@@ -6473,122 +6930,128 @@ msgstr "Kontak u stelseladministrateur vir hulp."
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:714
 #, c-format
+#| msgid ""
+#| "To enable fingerprint login, you need to save one of your fingerprints, "
+#| "using the '%s' device."
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
 msgstr ""
 "Om aanmelding met vingerafdruk te aktiveer moet u een van u vingerafdrukke "
-"stoor met die toestel '%s'."
+"stoor met die toestel \"%s\"."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
-#, fuzzy
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 #| msgid "Select finger"
 msgid "Selecting finger"
 msgstr "Kies 'n vinger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
-#, fuzzy
+#: ../panels/user-accounts/um-fingerprint-dialog.c:722
 #| msgid ""
 #| "Enrolling fingerprints for\n"
 #| "<b><big>%s</big></b>"
 msgid "Enrolling fingerprints"
-msgstr ""
-"Inskrywing van fingerafdrukke vir\n"
-"<b><big>%s</big></b>"
+msgstr "Besig om fingerafdrukke in te skryf"
 
-#: ../panels/user-accounts/um-history-dialog.c:68
+#: ../panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "Dié week"
 
-#: ../panels/user-accounts/um-history-dialog.c:71
+#: ../panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
-msgstr "Laas week"
+msgstr "Verlede week"
 
 #. Translators: This is a date format string in the style of "Feb 18",
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:77
-#: ../panels/user-accounts/um-history-dialog.c:81
+#: ../panels/user-accounts/um-history-dialog.c:79
+#: ../panels/user-accounts/um-history-dialog.c:83
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%e %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:86
+#: ../panels/user-accounts/um-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%e %b %Y"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s - %s"
+msgid "%s — %s"
+msgstr "%s — %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:175
-#: ../panels/user-accounts/um-user-panel.c:844
+#: ../panels/user-accounts/um-history-dialog.c:177
+#: ../panels/user-accounts/um-user-panel.c:776
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:178
-#: ../panels/user-accounts/um-user-panel.c:848
+#: ../panels/user-accounts/um-history-dialog.c:180
+#: ../panels/user-accounts/um-user-panel.c:780
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:247
+#: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "Sessie is begin"
 
-#: ../panels/user-accounts/um-history-dialog.c:253
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "Sessie is beëindig"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — Rekening Aktiwiteit"
+
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Kies asseblief 'n ander wagwoord."
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Tik asseblief die huidige wagwoord weer."
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Wagwoord kon nie verander word nie"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "Die wagwoorde stem nie ooreen nie."
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Blaai vir meer beelde"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Deaktiveer beeld"
 
-#: ../panels/user-accounts/um-photo-dialog.c:466
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "Neem 'n foto…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:484
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "Blaai vir meer prente…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:708
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "Gebruik deur %s"
@@ -6600,7 +7063,7 @@ msgstr "Kan nie outomaties by 'n domein van dié soort aansluit nie"
 #: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
-msgstr ""
+msgstr "Geen domein of gebied gevind nie"
 
 #: ../panels/user-accounts/um-realm-manager.c:815
 #: ../panels/user-accounts/um-realm-manager.c:829
@@ -6610,39 +7073,40 @@ msgstr "Kan nie as %s by die %s-domein aanmeld nie"
 
 #: ../panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
-msgstr "Verkeerde wagwoord. Probeer gerus weer."
+msgstr "Verkeerde wagwoord. Probeer gerus weer"
 
 #: ../panels/user-accounts/um-realm-manager.c:834
 #, c-format
-msgid "Couldn't connect to the %s domain: %s"
+#| msgid "Couldn't connect to the %s domain: %s"
+msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Kon nie koppel aan die %s-domein nie: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:240
-msgid "Other Accounts"
-msgstr "Ander rekeninge"
+#: ../panels/user-accounts/um-user-panel.c:195
+#| msgid "My Account"
+msgid "Your account"
+msgstr "Jou rekening"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
 msgstr "Kon nie gebruiker skrap nie"
 
-#: ../panels/user-accounts/um-user-panel.c:510
-#: ../panels/user-accounts/um-user-panel.c:569
-#: ../panels/user-accounts/um-user-panel.c:621
-#, fuzzy
+#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:559
 #| msgid "Failed to delete user"
 msgid "Failed to revoke remotely managed user"
-msgstr "Kon nie gebruiker skrap nie"
+msgstr "Kon nie afstand bestuurde gebruiker skrap nie"
 
-#: ../panels/user-accounts/um-user-panel.c:677
+#: ../panels/user-accounts/um-user-panel.c:613
 msgid "You cannot delete your own account."
 msgstr "U kan nie u eie rekening skrap nie."
 
-#: ../panels/user-accounts/um-user-panel.c:686
+#: ../panels/user-accounts/um-user-panel.c:622
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is steeds aangemeld"
 
-#: ../panels/user-accounts/um-user-panel.c:690
+#: ../panels/user-accounts/um-user-panel.c:626
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6650,68 +7114,72 @@ msgstr ""
 "Om 'n gebruiker te skrap terwyl hy aangemeld is, kan die stelsel in 'n "
 "inkonsekwente toestand laat."
 
-#: ../panels/user-accounts/um-user-panel.c:699
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
-msgid "Do you want to keep %s's files?"
+#| msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
 msgstr "Wil u %s se lêers behou?"
 
-#: ../panels/user-accounts/um-user-panel.c:703
+#: ../panels/user-accounts/um-user-panel.c:639
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr ""
-"Dit is moontlik om die tuisgids, pos-spool-gids en Tydelike lêers te hou "
+"Dit is moontlik om die tuisgids, pos-spool-gids en tydelike lêers te hou "
 "wanneer 'n gebruiker se rekening geskrap word."
 
-#: ../panels/user-accounts/um-user-panel.c:706
+#: ../panels/user-accounts/um-user-panel.c:642
 msgid "_Delete Files"
 msgstr "_Skrap lêers"
 
-#: ../panels/user-accounts/um-user-panel.c:707
+#: ../panels/user-accounts/um-user-panel.c:643
 msgid "_Keep Files"
 msgstr "_Hou lêers"
 
-#: ../panels/user-accounts/um-user-panel.c:721
-#, fuzzy, c-format
+#: ../panels/user-accounts/um-user-panel.c:657
+#, c-format
 #| msgid "Are you sure you want to remove the account?"
-msgid "Are you sure you want to revoke remotely managed %s's account?"
-msgstr "Wil u definitief die rekening skrap?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "Is u seker u wil %s se afstand bestuurde rekeneing skrap?"
 
-#: ../panels/user-accounts/um-user-panel.c:725
-#, fuzzy
+#: ../panels/user-accounts/um-user-panel.c:661
 #| msgid "Delete"
 msgid "_Delete"
-msgstr "Skrap"
+msgstr "_Skrap"
 
-#: ../panels/user-accounts/um-user-panel.c:777
+#: ../panels/user-accounts/um-user-panel.c:711
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Rekening gedeaktiveer"
 
-#: ../panels/user-accounts/um-user-panel.c:785
+#: ../panels/user-accounts/um-user-panel.c:719
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Moet by volgende aanmelding gestel word"
 
-#: ../panels/user-accounts/um-user-panel.c:788
+#: ../panels/user-accounts/um-user-panel.c:722
 msgctxt "Password mode"
 msgid "None"
 msgstr "Geen"
 
-#: ../panels/user-accounts/um-user-panel.c:837
+#: ../panels/user-accounts/um-user-panel.c:769
 msgid "Logged in"
 msgstr "Aangemeld"
 
-#: ../panels/user-accounts/um-user-panel.c:1275
+#: ../panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
 msgstr "Kon nie die rekeningediens kontak nie"
 
-#: ../panels/user-accounts/um-user-panel.c:1277
+#: ../panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr ""
 "Maak asb. seker dat die AccountService korrek geïnstalleer en geaktiveer is."
 
-#: ../panels/user-accounts/um-user-panel.c:1318
+#. Translator comments:
+#. * We split the line in 2 here to "make it look good", as there's
+#. * no good way to do this in GTK+ for tooltips. See:
+#. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
+#: ../panels/user-accounts/um-user-panel.c:1155
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6719,12 +7187,12 @@ msgstr ""
 "Om veranderinge te maak,\n"
 "klik eers die *-ikoon"
 
-#: ../panels/user-accounts/um-user-panel.c:1356
+#: ../panels/user-accounts/um-user-panel.c:1195
 msgid "Create a user account"
 msgstr "Skep 'n gebruikerrekening"
 
-#: ../panels/user-accounts/um-user-panel.c:1367
-#: ../panels/user-accounts/um-user-panel.c:1679
+#: ../panels/user-accounts/um-user-panel.c:1206
+#: ../panels/user-accounts/um-user-panel.c:1385
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6732,12 +7200,12 @@ msgstr ""
 "Om 'n gebruikerrekening te skep,\n"
 "klik eers die *-ikoon"
 
-#: ../panels/user-accounts/um-user-panel.c:1377
+#: ../panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
 msgstr "Skrap die gekose gebruikerrekening"
 
-#: ../panels/user-accounts/um-user-panel.c:1389
-#: ../panels/user-accounts/um-user-panel.c:1684
+#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1390
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6745,155 +7213,154 @@ msgstr ""
 "Om die gekose gebruikerrekening te skrap,\n"
 "klik eers die *-ikoon"
 
-#: ../panels/user-accounts/um-user-panel.c:1593
-msgid "My Account"
-msgstr "My rekening"
-
-#: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "'n Gebruiker met gebruikernaam '%s' bestaan reeds."
+#: ../panels/user-accounts/um-utils.c:507
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr ""
+"Jammer maar die gebruikersnaam is nie meer beskikbaar nie. Probeer gerus 'n "
+"ander een."
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:510
 #, c-format
 msgid "The username is too long."
 msgstr "Die gebruikernaam is te lank."
 
-#: ../panels/user-accounts/um-utils.c:570
-msgid "The username cannot start with a '-'."
-msgstr "'n Gebruikernaam kan nie begin met 'n '-' nie."
+#: ../panels/user-accounts/um-utils.c:513
+#| msgid "The username cannot start with a '-'."
+msgid "The username cannot start with a “-”."
+msgstr "'n Gebruikernaam kan nie begin met 'n \"-\" nie."
 
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:516
+#| msgid ""
+#| "The username should only consist of lower and upper case letters from a-"
+#| "z, digits and any of characters '.', '-' and '_'."
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
 "Die gebruikernaam moet slegs bestaan uit hoof- en kleinletters (a-z), syfers "
-"en enige van die karakters '.', '-' en '_'."
+"en enige van die karakters '.', '-' en '_'"
 
-#: ../panels/user-accounts/um-utils.c:577
-msgid "This will be used to name your home folder and can't be changed."
+#: ../panels/user-accounts/um-utils.c:520
+#| msgid "This will be used to name your home folder and can't be changed."
+msgid "This will be used to name your home folder and can’t be changed."
 msgstr ""
 "Hierdie gaan gebruik word as tuisgidsnaam en kan nie verander word nie."
 
-#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:823
-msgid "%b %e"
-msgstr "%e %b"
-
-#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:827
-msgid "%b %e, %Y"
-msgstr "%e %b %Y"
-
 #: ../panels/wacom/button-mapping.ui.h:1
-#, fuzzy
 #| msgid "Top Button"
 msgid "Map Buttons"
-msgstr "Boonste knoppie"
+msgstr "Koppel knoppies"
+
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "_Sluit"
 
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
-msgstr ""
+msgstr "Koppel knoppies aan funksies"
 
 #: ../panels/wacom/button-mapping.ui.h:4
-#, fuzzy
 #| msgid ""
 #| "To edit a shortcut, click the row and hold down the new keys or press "
 #| "Backspace to clear."
 msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
-"Om 'n kortpad te verander, klik op die ry en tik die nuwe sleutelkombinasie, "
-"of druk Backspace om skoon te maak."
+"Om 'n kortpad te wysig, kies die \"Stuur sleutel\" -aksie, druk die "
+"sleutelbordkortpad en hou die nuwe sleutels in of druk Backspace om te vee."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr ""
+"Raak asseblief aan die teikenmerkers soos dit verskyn om die tablet te "
+"kalibreer."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr ""
+msgid "Mis-click detected, restarting…"
+msgstr "Mis-klik bespeur, herbegin…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "Op"
-
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "Af"
+#: ../panels/wacom/cc-wacom-button-row.c:266
+#, c-format
+#| msgid "Button"
+msgid "Button %d"
+msgstr "Knoppie %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: ../panels/wacom/cc-wacom-button-row.h:53
+#| msgid "Applications"
 msgctxt "Wacom action-type"
-msgid "None"
-msgstr "Geen"
+msgid "Application defined"
+msgstr "Toepassings gedefinieer"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
-msgstr ""
+msgstr "Stuur sleutel"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
-#, fuzzy
+#: ../panels/wacom/cc-wacom-button-row.h:55
 #| msgid "Monitor"
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
-msgstr "Monitor"
+msgstr "Ruil Monitor"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Wys hulp op die skerm"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
+#: ../panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "Afvoer:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+#: ../panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
-msgstr ""
+msgstr "Behou beeldverhouding (breedbeeld)"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
-#, fuzzy
+#: ../panels/wacom/cc-wacom-mapping-panel.c:283
 #| msgid "Typing Monitor"
 msgid "Map to single monitor"
-msgstr "Tikmonitor"
+msgstr "Koppel aan 'n enkele skerm"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
+#: ../panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
-msgstr ""
+msgstr "%d van %d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
-#, fuzzy
+#: ../panels/wacom/cc-wacom-page.c:544
 #| msgid "Display language:"
 msgid "Display Mapping"
-msgstr "Vertoontaal:"
+msgstr "Vertoon koppelings"
+
+#: ../panels/wacom/cc-wacom-panel.c:790
+#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#| msgid "_Style:"
+msgid "Stylus"
+msgstr "Pen"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
+#: ../panels/wacom/cc-wacom-stylus-page.c:347
 msgid "Button"
 msgstr "Knoppie"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom-tablet"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#| msgid "Wacom Tablet"
+msgid "Wa­com Tab­let"
+msgstr "Wacom-Tablet"
+
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr ""
+"Stel knoppiekoppelings en pas pengevoeligheid vir grafiese tablette aan"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
-msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;uitveër;muis;"
+msgstr "tablet;wacom;pen;uitveër;muis;"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:1
 msgid "Tablet (absolute)"
@@ -6908,7 +7375,6 @@ msgid "Tablet Preferences"
 msgstr "Tabletvoorkeure"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:4
-#| msgid "Help"
 msgid "_Help"
 msgstr "_Hulp"
 
@@ -6924,15 +7390,18 @@ msgstr "Prop die Wacom-tablet in en skakel dit aan"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-instellings"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Wacom-tablet"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
-msgstr ""
+msgstr "Koppel aan Skerm…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
-#, fuzzy
 #| msgid "Top Button"
 msgid "Map Buttons…"
-msgstr "Boonste knoppie"
+msgstr "Koppel knoppies…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
 msgid "Calibrate…"
@@ -6940,7 +7409,7 @@ msgstr "Kalibreer…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Adjust display resolution"
-msgstr ""
+msgstr "Verander die resolusie van die skerm"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:14
 msgid "Adjust mouse settings"
@@ -6948,175 +7417,89 @@ msgstr "Verstel muisinstellings"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:15
 msgid "Tracking Mode"
-msgstr ""
+msgstr "Opspoormodus"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:16
 msgid "Left-Handed Orientation"
 msgstr "Linkshandige oriëntasie"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-#, fuzzy
-#| msgid "Left ring finger"
-msgid "Left Ring"
-msgstr "Linkerringvinger"
-
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr ""
-
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-#, fuzzy
-#| msgid "Right ring finger"
-msgid "Right Ring"
-msgstr "Regterringvinger"
-
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, fuzzy, c-format
-#| msgid "Right ring finger"
-msgid "Right Ring Mode #%d"
-msgstr "Regterringvinger"
-
-#. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-msgid "Left Touchstrip"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr ""
-
-#. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1143
-msgid "Right Touchstrip"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr ""
-
-#: ../panels/wacom/gsd-wacom-device.c:1300
-#, c-format
-msgid "Left Button #%d"
-msgstr "Linkerknoppie #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1303
-#, c-format
-msgid "Right Button #%d"
-msgstr "Regterknoppie #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1306
-#, c-format
-msgid "Top Button #%d"
-msgstr "Boonste knoppie #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1309
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "Onderste knoppie #%d"
-
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "Nuwe kortpad…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "Geen aksie"
-
 #: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "Linker muisklik"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Middle Mouse Button Click"
 msgstr "Middel muisklik"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Right Mouse Button Click"
 msgstr "Regter muisklik"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "Rol op"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "Rol af"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "Rol links"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "Rol regs"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: ../panels/wacom/wacom-stylus-page.ui.h:4
 msgid "Back"
 msgstr "Terug"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: ../panels/wacom/wacom-stylus-page.ui.h:5
 msgid "Forward"
 msgstr "Vorentoe"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-#, fuzzy
-#| msgid "_Style:"
-msgid "Stylus"
-msgstr "_Style:"
+#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#| msgid "No languages found"
+msgid "No stylus found"
+msgstr "Geen pen gevind nie"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: ../panels/wacom/wacom-stylus-page.ui.h:7
+msgid "Please move your stylus to the proximity of the tablet to configure it"
+msgstr "Beweeg jou pen naby aan die tablet om dit in te stel"
+
+#: ../panels/wacom/wacom-stylus-page.ui.h:10
 msgid "Eraser Pressure Feel"
-msgstr ""
+msgstr "Uitveër druk gevoel"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: ../panels/wacom/wacom-stylus-page.ui.h:11
 msgid "Soft"
 msgstr "Sag"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:12
 msgid "Firm"
 msgstr "Ferm"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: ../panels/wacom/wacom-stylus-page.ui.h:13
 msgid "Top Button"
 msgstr "Boonste knoppie"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:14
 msgid "Lower Button"
 msgstr "Onderste knoppie"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: ../panels/wacom/wacom-stylus-page.ui.h:15
 msgid "Tip Pressure Feel"
-msgstr ""
+msgstr "Punt druk gevoel"
+
+#: ../panels/wacom/wacom-stylus-page.ui.h:17
+msgid "page 3"
+msgstr "bladsy 3"
+
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:758
+msgid "All Settings"
+msgstr "Alle instellings"
+
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Persoonlik"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Hardeware"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "Stelsel"
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
@@ -7127,8 +7510,11 @@ msgid "Utilities to configure the GNOME desktop"
 msgstr "Nutsgoed om die GNOME-werkarea op te stel"
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#| msgid ""
+#| "The control center is GNOME's main interface for configuration of various "
+#| "aspects of your desktop."
 msgid ""
-"The control center is GNOME's main interface for configuration of various "
+"The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 msgstr ""
 "Die beheersentrum is GNOME se plek vir die opstelling van verskeie aspekte "
@@ -7174,29 +7560,9 @@ msgstr "Hulp"
 msgid "Quit"
 msgstr "Sluit af"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494
-msgid "All Settings"
-msgstr "Alle instellings"
-
-#. Add categories
-#: ../shell/cc-window.c:880
-msgctxt "category"
-msgid "Personal"
-msgstr "Persoonlik"
-
-#: ../shell/cc-window.c:881
-msgctxt "category"
-msgid "Hardware"
-msgstr "Hardeware"
-
-#: ../shell/cc-window.c:882
-msgctxt "category"
-msgid "System"
-msgstr "Stelsel"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
-msgstr "Preferences;Settings;voorkeure;instelling;opstelling;"
+msgstr "voorkeure;instelling;opstelling;"
 
 #: ../shell/help-overlay.ui.h:1
 msgctxt "shortcut window"
@@ -7228,6 +7594,511 @@ msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "Kanselleer soektog"
 
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+#| msgid "_Stop Hotspot"
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Kuberkol"
+
+#: ../shell/panel-list.ui.h:3
+#| msgid "No regions found"
+msgid "No results found"
+msgstr "Geen resultate gevind nie"
+
+#~ msgid "Color"
+#~ msgstr "Kleur"
+
+#~ msgid "Lid Closed"
+#~ msgstr "Skerm toegevou"
+
+#~ msgid "Mirrored"
+#~ msgstr "Gedupliseer"
+
+#~ msgid "Primary"
+#~ msgstr "Primêr"
+
+#~ msgid "Secondary"
+#~ msgstr "Sekondêr"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Rangskik gekombineerde vertone"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "Sleep vertone om te herrangskik"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Draai 90° antikloksgewys"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "Draai 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "Draai 90° kloksgewys"
+
+#~ msgid "Size"
+#~ msgstr "Grootte"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Aspekverhouding"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "Wys die boonste balk en Aktiwiteitoorsig op dié vertoon"
+
+#~ msgid "Presentation"
+#~ msgstr "Voorlegging"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Wys slegs skyfievertonings en media"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Wys die bestaande aansig op altwee vertoone"
+
+#~ msgid "Turn Off"
+#~ msgstr "Skakel af"
+
+#~ msgid "Don't use this display"
+#~ msgstr "Moenie hierdie vertoon gebruik nie"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "R_angskik gekombineerde vertone"
+
+#~ msgid "Wayland"
+#~ msgstr "Wayland"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-bis"
+
+#~ msgid "Base system"
+#~ msgstr "Onderliggende stelsel"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;kortpad;herhaal;flikker;"
+
+#~ msgid "_Name:"
+#~ msgstr "_Naam:"
+
+#~ msgid "C_ommand:"
+#~ msgstr "_Opdrag:"
+
+#~ msgid "Add Shortcut"
+#~ msgstr "Voeg kortpad by"
+
+#~ msgid ""
+#~ "To edit a shortcut, click the row and hold down the new keys or press "
+#~ "Backspace to clear."
+#~ msgstr ""
+#~ "Om 'n kortpad te verander, klik op die ry en tik die nuwe "
+#~ "sleutelkombinasie, of druk Backspace om skoon te maak."
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<Onbekende aksie>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "Die kortpad \"%s\" kan nie gebruik word nie omdat dit dan onmoontlik sal "
+#~ "wees om met dié sleutel te tik.\n"
+#~ "Probeer eerder met 'n knoppie soos Control, Alt of Shift op die selfde "
+#~ "tyd."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "Die kortpad \"%s\" word reeds gebruik vir\n"
+#~ "\"%s\""
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~ "disabled."
+#~ msgstr ""
+#~ "As u die kortpad hertoeken aan \"%s\" sal die \"%s\"-kortpad gedeaktiveer "
+#~ "word."
+
+#~ msgid "_Reassign"
+#~ msgstr "He_rtoeken"
+
+#, fuzzy
+#~| msgid ""
+#~| "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~| "disabled."
+#~ msgid ""
+#~ "\"%s\" is currently associated with \"%s\", this shortcut will be "
+#~ "disabled if you move forward."
+#~ msgstr ""
+#~ "As u die kortpad hertoeken aan \"%s\" sal die \"%s\"-kortpad gedeaktiveer "
+#~ "word."
+
+#~ msgid "_Assign"
+#~ msgstr "_Ken toe"
+
+#~ msgid "Server"
+#~ msgstr "Bediener"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Skrap DNS-bediener"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "Maak beskikbaar aan ander gebr_uikers"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "Brandmuur_sone"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "Verstek"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "Die sone bepaal die vertrouensvlak van die verbinding"
+
+#~ msgid "Bond"
+#~ msgstr "Saambind"
+
+#~ msgid "Team"
+#~ msgstr "Span"
+
+#~ msgid "Bridge"
+#~ msgstr "Brug"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "Kon nie VPN-inproppe laai nie"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "Voeg netwerkverbinding by"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Stel die instellings, insluitend wagwoorde, vir dié netwerk terug, maar "
+#~ "onthou dit as 'n voorkeurnetwerk"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "Verwyder alle besonderhede wat met dié netwerk te doen het en moenie weer "
+#~ "outomaties probeer koppel nie"
+
+#~ msgid "Bond slaves"
+#~ msgstr "Saambindslawe"
+
+#~ msgid "(none)"
+#~ msgstr "(geen)"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "Brugslawe"
+
+#~ msgid "Team slaves"
+#~ msgstr "Spanslawe"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "As u 'n internetverbinding het buiten vir 'n draadlose een, kan u 'n "
+#~ "draadlose toegangsarea opstel om die verbinding te deel met ander."
+
+#~ msgid "History"
+#~ msgstr "Geskiedenis"
+
+#~ msgid "Proxy"
+#~ msgstr "Instaanbediener"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "_Voeg profiel by…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "Geen"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "Handmatig"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Outomaties"
+
+#~ msgid "Add Device"
+#~ msgstr "Voeg toestel by"
+
+#~ msgid "Remove Device"
+#~ msgstr "Verwyder toestel"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN-Tipe"
+
+#~ msgid "Group Name"
+#~ msgstr "Groepnaam"
+
+#~ msgid "Group Password"
+#~ msgstr "Groepwagwoord"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "Gebr_uik as toegangsarea…"
+
+#~ msgid "_History"
+#~ msgstr "_Geskiedenis"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Geen sertifikaatowerheid se sertifikaat is gekies nie"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Deur nie 'n sertifikaatowerheid (CA) se sertifikaat te gebruik nie kan "
+#~ "lei tot onveilige, skelm Wi-Fi-netwerkverbindings.  Wil u 'n sertifikaat "
+#~ "van 'n sertifikaatowerheid kies?"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignoreer"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Kies SO-sertifikaat"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "Vra tel_kens vir dié wagwoord"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Moenie my _weer waarsku nie"
+
+#~ msgid "No"
+#~ msgstr "Nee"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgctxt "notifications"
+#~ msgid "Notification _Banners"
+#~ msgstr "Kennisgewing_baniere"
+
+#~ msgid "Notification _Banners"
+#~ msgstr "Kennisgewing_baniere"
+
+#~ msgid "Add Account"
+#~ msgstr "Voeg rekening by"
+
+#~ msgid "Mail"
+#~ msgstr "Pos"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakte"
+
+#~ msgid "Chat"
+#~ msgstr "Gesels"
+
+#~ msgid "Resources"
+#~ msgstr "Hulpbronne"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "Fout met aanmeld met die rekening"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "Aanmeldinligting het verstryk."
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "Meld aan om dié rekening te aktiveer."
+
+#~ msgid "_Sign In"
+#~ msgstr "_Meld aan"
+
+#~ msgid "Error creating account"
+#~ msgstr "Kon nie rekening skep nie"
+
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "Wil u definitief die rekening skrap?"
+
+#~ msgid "This will not remove the account on the server."
+#~ msgstr "Die rekening op die bediener sal nié verwyder word nie."
+
+#~ msgid "No online accounts configured"
+#~ msgstr "Geen aanlynrekeninge opgetel nie"
+
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "Deur 'n rekening by te voeg, kan programme dit gebruik om dokumente, pos, "
+#~ "kontakte, kalender, gesels, ens. te bekom."
+
+#~ msgid "Power"
+#~ msgstr "Krag"
+
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "Word tans ingestel"
+
+#~ msgid "Toner Level"
+#~ msgstr "Poeierinkvlak"
+
+#~ msgid "Supply Level"
+#~ msgstr "Voorraadvlak"
+
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "Word tans geïnstalleer"
+
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u aktief"
+#~ msgstr[1] "%u aktief"
+
+#~ msgid "Add a New Printer"
+#~ msgstr "Voeg drukker by"
+
+#~ msgid "No printers detected."
+#~ msgstr "Geen drukkers bespeur nie."
+
+#~ msgid "Loading options…"
+#~ msgstr "Laai tans keuses…"
+
+#~ msgid "Supply"
+#~ msgstr "Voorraad"
+
+#~ msgid "_Default printer"
+#~ msgstr "_Verstekdrukker"
+
+#~ msgid "Jobs"
+#~ msgstr "Take"
+
+#~ msgid "Show _Jobs"
+#~ msgstr "Wys _take"
+
+#~ msgid "label"
+#~ msgstr "etiket"
+
+#~ msgid "Print _Test Page"
+#~ msgstr "Druk _toetsbladsy"
+
+#~ msgid "Privacy"
+#~ msgstr "Privaatheid"
+
+#~ msgid "Used to determine your geographical location"
+#~ msgstr "Om u geografiese ligging mee te bepaal"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "Ander"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "Persoonlike lêerdeling"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "L_aat eksterne beheer toe"
+
+#~ msgid "_Verify"
+#~ msgstr "Be_vestig"
+
+#~ msgid "Login History"
+#~ msgstr "Aanmeldgeskiedenis"
+
+#~ msgid "Add User Account"
+#~ msgstr "Voeg gebruikerrekening by"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Probeer om meer letters, syfers en simbole by te voeg."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Sterkte: Baie swak"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Sterkte: Swak"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Sterkte: Medium"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Sterkte: Goed"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Sterkte: Baie goed"
+
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Other Accounts"
+#~ msgstr "Ander rekeninge"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "'n Gebruiker met gebruikernaam '%s' bestaan reeds."
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "Op"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "Af"
+
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "Geen"
+
+#, fuzzy
+#~| msgid "Left ring finger"
+#~ msgid "Left Ring"
+#~ msgstr "Linkerringvinger"
+
+#, fuzzy
+#~| msgid "Right ring finger"
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "Regterringvinger"
+
+#~ msgid "Left Button #%d"
+#~ msgstr "Linkerknoppie #%d"
+
+#~ msgid "Right Button #%d"
+#~ msgstr "Regterknoppie #%d"
+
+#~ msgid "Top Button #%d"
+#~ msgstr "Boonste knoppie #%d"
+
+#~ msgid "Bottom Button #%d"
+#~ msgstr "Onderste knoppie #%d"
+
+#~ msgid "No Action"
+#~ msgstr "Geen aksie"
+
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "Linker muisklik"
+
+#~ msgid "Scroll Up"
+#~ msgstr "Rol op"
+
+#~ msgid "Scroll Down"
+#~ msgstr "Rol af"
+
+#~ msgid "Scroll Left"
+#~ msgstr "Rol links"
+
+#~ msgid "Scroll Right"
+#~ msgstr "Rol regs"
+
 #~ msgid "Bluetooth is disabled"
 #~ msgstr "Bluetooth is gedeaktiveer"
 
@@ -7277,9 +8148,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "S_peed:"
 #~ msgstr "S_poed:"
 
-#~ msgid "Shortcuts"
-#~ msgstr "Kortpaaie"
-
 #~ msgid "Test Your Settings"
 #~ msgstr "Toets instellings"
 
@@ -7321,9 +8189,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Disable while _typing"
 #~ msgstr "Deaktiveer tydens _tik"
 
-#~ msgid "Two _finger scroll"
-#~ msgstr "Rol met _twee vingers"
-
 #~ msgid "The system network services are not compatible with this version."
 #~ msgstr ""
 #~ "Die stelsel se netwerkdienste is nie versoenbaar met dié weergawe nie."
@@ -7351,18 +8216,12 @@ msgstr "Kanselleer soektog"
 #~ msgid "When battery power is _critical"
 #~ msgstr "Wanneer batterykrag _krities min is"
 
-#~ msgid "Power Off"
-#~ msgstr "Skakel af"
-
 #~ msgid "Power off"
 #~ msgstr "Skakel af"
 
 #~ msgid "No printers available"
 #~ msgstr "Geen drukkers beskikbaar nie"
 
-#~ msgid "Active Jobs"
-#~ msgstr "Aktiewe take"
-
 #~ msgid "Close"
 #~ msgstr "Sluit"
 
@@ -7372,9 +8231,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Pause Printing"
 #~ msgstr "Laat drukwerk wag"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "Kanselleer druktaak"
-
 #~ msgid "Enter address of a printer or a text to filter results"
 #~ msgstr "Tik 'n drukker se adres, of teks om resultate te verfyn"
 
@@ -7442,10 +8298,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Set Up New Device"
 #~ msgstr "Stel nuwe toestel op"
 
-#~| msgid "Connecting"
-#~ msgid "Connection"
-#~ msgstr "Verbinding"
-
 #~ msgid "Paired"
 #~ msgstr "Opgepaar"
 
@@ -7505,9 +8357,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Don't use the display"
 #~ msgstr "Moenie die vertoon gebruik nie"
 
-#~ msgid "Refresh Rate"
-#~ msgstr "Verfristempo"
-
 #~ msgid "Install Updates"
 #~ msgstr "Installeer bywerkings"
 
@@ -7619,9 +8468,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Select a language"
 #~ msgstr "Kies 'n taal"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "AM/PM"
 #~ msgstr "v.m./n.m."
 
@@ -7738,9 +8584,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Forced _Fallback Mode"
 #~ msgstr "Terugvalmodus afgedwing"
 
-#~ msgid "OS type"
-#~ msgstr "Tipe bedryfstelsel"
-
 #~ msgid "Magnifier zoom out"
 #~ msgstr "Minder vergroting"
 
@@ -7768,12 +8611,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "The type of accelerator."
 #~ msgstr "Die tipe versneller."
 
-#~ msgid "Change keyboard settings"
-#~ msgstr "Verander sleutelbordinstellings"
-
-#~ msgid "Error saving the new shortcut"
-#~ msgstr "Fout met stoor van nuwe kortpad"
-
 #~ msgid "Too many custom shortcuts"
 #~ msgstr "Te veel kortpaaie"
 
@@ -7801,9 +8638,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "_Add..."
 #~ msgstr "_Voeg by..."
 
-#~ msgid "Change printer settings"
-#~ msgstr "Verander drukkerinstellings"
-
 #~ msgid "_Search by Address"
 #~ msgstr "_Soek volgens adres"
 
@@ -7955,12 +8789,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Subnet Mask"
 #~ msgstr "Subnetmasker"
 
-#~ msgid "Unlock"
-#~ msgstr "Ontsluit"
-
-#~ msgid "_Configure..."
-#~ msgstr "_Opstelling..."
-
 #~ msgid "_Network Name"
 #~ msgstr "_Netwerknaam"
 
@@ -8260,10 +9088,6 @@ msgstr "Kanselleer soektog"
 #~ msgstr "Normaal"
 
 #~ msgctxt "universal access, seeing"
-#~ msgid "Display"
-#~ msgstr "Aansig"
-
-#~ msgctxt "universal access, seeing"
 #~ msgid "Zoom"
 #~ msgstr "Vergroting"
 
@@ -8272,10 +9096,6 @@ msgstr "Kanselleer soektog"
 #~ msgstr "Groot"
 
 #~ msgctxt "universal access, text size"
-#~ msgid "Larger"
-#~ msgstr "Groter"
-
-#~ msgctxt "universal access, text size"
 #~ msgid "Normal"
 #~ msgstr "Normaal"
 
@@ -8306,9 +9126,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Fair"
 #~ msgstr "Redelik"
 
-#~ msgid "Wrong password"
-#~ msgstr "Verkeerde wagwoord"
-
 #~ msgid "Browse for more pictures..."
 #~ msgstr "Blaai vir meer prente..."
 
@@ -9861,9 +10678,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "FONT-FILE OUTPUT-FILE"
 #~ msgstr "LETTERTIPELÊER AFVOERLÊER"
 
-#~ msgid "_Command:"
-#~ msgstr "_Opdrag:"
-
 #~ msgid "    "
 #~ msgstr "    "
 
@@ -10012,14 +10826,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "Herstel en stoor argaïese-instellings"
 
-#, fuzzy
-#~ msgid "From:"
-#~ msgstr "Van: %s"
-
-#, fuzzy
-#~ msgid "To:"
-#~ msgstr "Twee"
-
 #~ msgid "Epiphany"
 #~ msgstr "Epiphany"
 
@@ -10187,10 +10993,6 @@ msgstr "Kanselleer soektog"
 #~ msgid "<i>Small</i>"
 #~ msgstr "<i>Klein</i>"
 
-#, fuzzy
-#~ msgid "Cursor Size:"
-#~ msgstr "Wysergrootte"
-
 #~ msgid "Highlight the _pointer when you press Ctrl"
 #~ msgstr "Merk die _wyser wanneer jy Ctrl druk"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]