[gnome-control-center] Updated Esperanto translation



commit bf21e31ba127f5e864bf52feba71020269399087
Author: Kristjan SCHMIDT <kristjan schmidt googlemail com>
Date:   Fri Oct 27 19:58:09 2017 +0200

    Updated Esperanto translation

 po/eo.po | 6252 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 3708 insertions(+), 2544 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index 035a1ba..a13393b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,5 +1,5 @@
 # Esperanto translation for gnome-control-center.
-# Copyright (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-control-center package.
 # Joop EGGEN <joop_eggen yahoo de>, 2006.
 # Ed GLEZ < >, 2006.
@@ -10,16 +10,16 @@
 # Tiffany ANTOPOLSKI < >, 2012.
 # Ryan LORTIE <desrt desrt ca>, 2013.
 # Daniel PUENTES <blatberk openmailbox org>, 2015.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2010, 2011, 2012, 2013, 2015.
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2010, 2011, 2012, 2013, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\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: 2015-04-22 18:45+0000\n"
-"PO-Revision-Date: 2015-04-23 23:00+0200\n"
+"POT-Creation-Date: 2017-08-25 14:57+0000\n"
+"PO-Revision-Date: 2017-10-27 19:56+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
-"Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
+"Language-Team: Esperanto <gnome-eo-list gnome org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: ../panels/background/background.ui.h:1
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
-msgstr "Fono"
+#| msgid "Background"
+msgid "_Background"
+msgstr "_Fono"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:3
@@ -40,8 +40,9 @@ msgstr "Ŝanĝas dum la tago"
 
 #. To translators: This is a noun, not a verb
 #: ../panels/background/background.ui.h:5
-msgid "Lock Screen"
-msgstr "Ŝlosa ekrano"
+#| msgid "Lock Screen"
+msgid "_Lock Screen"
+msgstr "Ŝ_losi ekranon"
 
 #: ../panels/background/background.ui.h:6
 msgctxt "background, style"
@@ -73,77 +74,75 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Etendi"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "Ekranfonoj"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Koloroj"
 
 #. 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 "Elekti fonon"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Bildoj"
 
 #. 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 "Neniuj bildoj trovita"
 
 #. 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 "Hejmo"
 
 #. 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 "Vi povas aldoni bildojn al via %s dosierujo tiam ili montros ĉi tie"
 
-#: ../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.ui.h:29 ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1582
-#: ../panels/display/cc-display-panel.c:2020
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../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:2718
 #: ../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:1247
-#: ../panels/network/net-device-wifi.c:1440
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1318
+#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1633
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:1940
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:568
-#: ../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:491
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../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:642
+#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../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-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 "_Nuligi"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
-msgid "Select"
-msgstr "Elekti"
+#: ../panels/background/cc-background-chooser-dialog.c:574
+msgid "_Select"
+msgstr "_Elekti"
 
 #: ../panels/background/cc-background-item.c:203
 msgid "multiple sizes"
@@ -164,57 +163,110 @@ msgstr "Neniu labortabla fono"
 msgid "Current background"
 msgstr "Aktuala fono"
 
+#. 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 "Fono"
+
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
 msgstr "Ŝanĝi vian fonan bildon al ekranfono aŭ 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 "Ekranfono;Ekrano;Labortablo;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:262
-msgid "Bluetooth is disabled"
-msgstr "Bludento estas elŝaltite"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
+#| msgid "Air_plane Mode"
+msgid "Turn Off Airplane Mode"
+msgstr "Malaktivigi aviadilan reĝimon"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:263
-msgid "No Bluetooth adapters found"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#, fuzzy
+#| msgid "No Bluetooth adapters found"
+msgid "No Bluetooth Found"
 msgstr "Ne trovis Bludentan adaptilon"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "Bludento estas elŝaltite per aparatara ŝaltilo"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+msgid "Plug in a dongle to use Bluetooth."
+msgstr ""
 
-#. 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:1637
-msgid "Bluetooth"
-msgstr "Bludento"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#, fuzzy
+#| msgid "Bluetooth Sharing"
+msgid "Bluetooth Turned Off"
+msgstr "Bludenta komunigo"
 
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+msgid "Turn on to connect devices and receive file transfers."
+msgstr ""
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode is on"
+msgstr "Aviadila reĝimo estas aktiva"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#| msgid "Bluetooth is disabled by hardware switch"
+msgid "Bluetooth is disabled when airplane mode is on."
+msgstr "Bludento estas malaktivigita dum aviadila reĝimo."
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#| msgid "Air_plane Mode"
+msgid "Hardware Airplane Mode is on"
+msgstr "Peraparata aviadila reĝimo estas aktiva"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+msgid "Turn off the Airplane mode switch to enable Bluetooth."
+msgstr ""
+
+#. 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
+#, fuzzy
+#| msgid "Bluetooth"
+msgid "Blue­tooth"
+msgstr "Bludento"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Enŝalti kaj elŝalti Bludenton kaj konektitigi viajn aparatojn"
 
+#. Translators: those are keywords for the bluetooth control-center panel
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+msgid "share;sharing;bluetooth;obex;"
+msgstr ""
+
 #. 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 "Metu vian kalibro-aparaton super la kvadraton kaj premu 'Startigi'"
+#, fuzzy
+#| msgid "Place your calibration device over the square and press 'Start'"
+msgid "Place your calibration device over the square and press “Start”"
+msgstr "Metu vian kalibro-aparaton super la kvadraton kaj premu “Startigi”"
 
 #. 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
+#, fuzzy
+#| msgid ""
+#| "Move your calibration device to the calibrate position and press "
+#| "'Continue'"
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
-msgstr "Movu vian kalibro-aparaton al la kalibra pozicio kaj premu 'Daŭrigi'"
+"Move your calibration device to the calibrate position and press “Continue”"
+msgstr "Movu vian kalibro-aparaton al la kalibra pozicio kaj premu “Daŭrigi”"
 
 #. 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
+#, fuzzy
+#| msgid ""
+#| "Move your calibration device to the surface position and press 'Continue'"
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
-msgstr "Movu vian kalibro-aparaton al la supraĵa pozicio kaj premu 'Daŭrigi'"
+"Move your calibration device to the surface position and press “Continue”"
+msgstr "Movu vian kalibro-aparaton al la supraĵa pozicio kaj premu “Daŭrigi”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -360,7 +412,7 @@ msgstr "Subtenataj ICC-profiloj"
 
 #. 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 "Ĉiuj dosieroj"
 
@@ -400,7 +452,7 @@ msgid "Save Profile"
 msgstr "Konservi profilon"
 
 #: ../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 "Kon_servi"
 
@@ -508,27 +560,25 @@ msgstr "La profilo eble ne plu estas akurata"
 msgid "Display Calibration"
 msgstr "Ekran-kalibro"
 
-#: ../panels/color/color-calibrate.ui.h:2
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-msgid "Cancel"
-msgstr "Nuligi"
-
 #. This starts the calibration process
 #: ../panels/color/color-calibrate.ui.h:4
-msgid "Start"
-msgstr "Starti"
+#, fuzzy
+#| msgid "Start"
+msgid "_Start"
+msgstr "_Starti"
 
 #. This resumes the calibration process
 #: ../panels/color/color-calibrate.ui.h:6
-msgid "Resume"
-msgstr "Daŭrigi"
+#| msgid "Resume"
+msgid "_Resume"
+msgstr "Daŭ_rigi"
 
 #. This button returns the user back to the color control panel
 #: ../panels/color/color-calibrate.ui.h:8
-msgid "Done"
-msgstr "Farite"
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "_Finita"
 
 #. Timeout parameters
 #. 15000 = 15 sec
@@ -655,28 +705,34 @@ msgid ""
 "\">Microsoft Windows</a> systems useful."
 msgstr ""
 "Vi eble taksas tiujn ĉi instrukciojn utilaj pri uzado de la profilo je la "
-"sistemoj <a href=\"linux\">GNU/Linukso</a>, <a href=\"osx\">Apple OS X</a> kaj "
-"<a href=\"windows\">Microsoft Vindozo</a>."
+"sistemoj <a href=\"linux\">GNU/Linukso</a>, <a href=\"osx\">Apple OS X</a> "
+"kaj <a href=\"windows\">Microsoft Vindozo</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 "Resumo"
 
 #: ../panels/color/color.ui.h:28
-msgid "Import File…"
-msgstr "Enporti dosieron…"
+#, fuzzy
+#| msgid "Add profile"
+msgid "Add Profile"
+msgstr "Aldoni profilon"
 
-#: ../panels/color/color.ui.h:30
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:512
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/color/color.ui.h:29
+#| msgid "Import File…"
+msgid "_Import File…"
+msgstr "E_nporti dosieron…"
+
+#: ../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 "_Aldoni"
 
-#: ../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>"
@@ -684,155 +740,161 @@ msgstr ""
 "Detektis problemojn. La profilo eble ne funkcas korekte. <a href=\"\">Montri "
 "detalojn.</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 ""
 "Ĉiu aparato necesas ĝisdatigan kolorprofilon por esti kolormastrumitaj."
 
-#: ../panels/color/color.ui.h:33
+#: ../panels/color/color.ui.h:34
 msgid "Learn more"
 msgstr "Lernu pli"
 
-#: ../panels/color/color.ui.h:34
+#: ../panels/color/color.ui.h:35
 msgid "Learn more about color management"
 msgstr "Lernu pli pri kolormastrumado"
 
-#: ../panels/color/color.ui.h:35
-msgid "Set for all users"
-msgstr "Agordi por ĉiuj uzantoj"
-
 #: ../panels/color/color.ui.h:36
-msgid "Set this profile for all users on this computer"
-msgstr "Agordi tiun ĉi profilon por ĉiuj uzantoj de tiu ĉi komputilo"
+#| msgid "Set for all users"
+msgid "_Set for all users"
+msgstr "_Agordi por ĉiuj uzantoj"
 
 #: ../panels/color/color.ui.h:37
-msgid "Enable"
-msgstr "Aktivigi"
+msgid "Set this profile for all users on this computer"
+msgstr "Agordi tiun ĉi profilon por ĉiuj uzantoj de tiu ĉi komputilo"
 
 #: ../panels/color/color.ui.h:38
-msgid "Add profile"
-msgstr "Aldoni profilon"
+#| msgid "Enable"
+msgid "_Enable"
+msgstr "_Aktivigi"
 
 #: ../panels/color/color.ui.h:39
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
-msgid "Calibrate…"
-msgstr "Kalibri…"
+#| msgid "Add profile"
+msgid "_Add profile"
+msgstr "_Aldoni profilon"
 
 #: ../panels/color/color.ui.h:40
-msgid "Calibrate the device"
-msgstr "Kalibri la aparaton"
+#| msgid "Calibrate…"
+msgid "_Calibrate…"
+msgstr "_Kalibri…"
 
 #: ../panels/color/color.ui.h:41
-msgid "Remove profile"
-msgstr "Forigi profilon"
+msgid "Calibrate the device"
+msgstr "Kalibri la aparaton"
 
 #: ../panels/color/color.ui.h:42
-msgid "View details"
-msgstr "Montri detalojn"
+#| msgid "Remove profile"
+msgid "_Remove profile"
+msgstr "Fo_rigi profilon"
 
 #: ../panels/color/color.ui.h:43
+#| msgid "View details"
+msgid "_View details"
+msgstr "_Montri detalojn"
+
+#: ../panels/color/color.ui.h:44
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Oni ne povas detekti koloradministreblan aparaton"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:45
 msgid "LCD"
 msgstr "Likvakristala ekrano"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:46
 msgid "LED"
 msgstr "Lumdiodo"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:47
 msgid "CRT"
 msgstr "KRT"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:48
 msgid "Projector"
 msgstr "Projekciilo"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:49
 msgid "Plasma"
 msgstr "Plasmo"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "LCD (CCFL backlight)"
 msgstr "Likvakristala ekrano (CCFL-a fonlumo)"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgid "LCD (RGB LED backlight)"
 msgstr "Likvakristala ekrano (RVB-LED-a fonlumo)"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:52
 msgid "LCD (white LED backlight)"
 msgstr "Likvakristala ekrano (blanka LED fonlumo)"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Likvakristala ekrano de larĝa gamo (CCFL-a fonlumo)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Likvakristala ekrano de larĝa gamo (RVB-LED-a fonlumo)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:55
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Alte"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "40 minutes"
 msgstr "40 minutoj"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Meze"
 
-#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minutoj"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Malalte"
 
-#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
 msgid "15 minutes"
 msgstr "15 minutoj"
 
-#: ../panels/color/color.ui.h:60
+#: ../panels/color/color.ui.h:61
 msgid "Native to display"
 msgstr "Indiĝena al ekrano"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:62
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Presado kaj eldonado)"
 
-#: ../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 (Fotografio kaj grafiko)"
 
-#: ../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"
-msgstr "Koloro"
-
+#. 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 ""
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "Kalibri la koloron de viaj aparatoj, kiel ekranoj, fotiloj aŭ presiloj"
 
 #. 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 "Koloro;ICC;Profilo;Kalibri;Presilo;Ekrano;"
 
@@ -840,37 +902,67 @@ msgstr "Koloro;ICC;Profilo;Kalibri;Presilo;Ekrano;"
 msgid "Other…"
 msgstr "Alia…"
 
-#: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:270
-#: ../panels/region/cc-input-chooser.c:167
+#: ../panels/common/cc-language-chooser.c:124
+#: ../panels/region/cc-format-chooser.c:269
+#: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "Pli…"
 
-#: ../panels/common/cc-language-chooser.c:139
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "Neniuj lingvoj trovitaj"
 
-#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:106
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:108
+msgid "Yesterday"
+msgstr "Hieraŭ"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: ../panels/common/cc-util.c:138
+msgid "%b %e"
+msgstr "%b %e"
+
+#. 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 "%b %e, %Y"
+
+#: ../panels/common/language-chooser.ui.h:1
 msgid "Language"
 msgstr "Lingvo"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
-msgid "_Done"
-msgstr "_Finita"
+#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
+#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+msgid "Day"
+msgstr "Tago"
+
+#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
+#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+msgid "Month"
+msgstr "Monato"
+
+#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
+#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+msgid "Year"
+msgstr "Jaro"
 
 #. 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"
@@ -878,7 +970,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)"
@@ -886,23 +978,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)"
@@ -956,8 +1048,9 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Decembro"
 
+#. 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 "Dato kaj horo"
 
@@ -975,63 +1068,52 @@ msgid "Minute"
 msgstr "Minuto"
 
 #: ../panels/datetime/datetime.ui.h:18
-msgid "Day"
-msgstr "Tago"
-
-#: ../panels/datetime/datetime.ui.h:19
-msgid "Month"
-msgstr "Monato"
-
-#: ../panels/datetime/datetime.ui.h:20
-msgid "Year"
-msgstr "Jaro"
-
-#: ../panels/datetime/datetime.ui.h:21
 msgid "Time Zone"
 msgstr "Horzono"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: ../panels/datetime/datetime.ui.h:19
 msgid "Search for a city"
 msgstr "Serĉi urbon"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:20
 msgid "Automatic _Date & Time"
 msgstr "Aŭtomata _dato kaj horo"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Requires internet access"
 msgstr "Bezonas interretan atingon"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: ../panels/datetime/datetime.ui.h:22
 msgid "Automatic Time _Zone"
 msgstr "Aŭtomata hor_zono"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: ../panels/datetime/datetime.ui.h:23
 msgid "Date & _Time"
 msgstr "Dato kaj _horo"
 
-#: ../panels/datetime/datetime.ui.h:27
-msgid "Time _Zone"
-msgstr "Hor_zono"
+#: ../panels/datetime/datetime.ui.h:24
+#| msgid "Time Zone"
+msgid "Time Z_one"
+msgstr "Horz_ono"
 
-#: ../panels/datetime/datetime.ui.h:28
+#: ../panels/datetime/datetime.ui.h:25
 msgid "Time _Format"
 msgstr "Tempo-_formo"
 
-#: ../panels/datetime/datetime.ui.h:29
+#: ../panels/datetime/datetime.ui.h:26
 msgid "24-hour"
 msgstr "24-hora"
 
-#: ../panels/datetime/datetime.ui.h:30
+#: ../panels/datetime/datetime.ui.h:27
 msgid "AM / PM"
 msgstr "ATM / PTM"
 
-#: ../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 "Ŝanĝi la aktualan tempon, inkluzivante horzonon"
 
 #. 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 "Horo;Horzono;Loko;"
 
@@ -1043,193 +1125,328 @@ msgstr "Ŝanĝi sistemajn agordoj pri horo kaj dato"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Por ŝanĝi tempajn aŭ datajn agordojn, vi devas aŭtentigi."
 
-#: ../panels/display/cc-display-panel.c:567
-msgid "Lid Closed"
-msgstr "Kovrilo ferma"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:570
-msgid "Mirrored"
-msgstr "Spegulata"
+#: ../panels/display/cc-display-panel.c:738
+#, fuzzy
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Pejzaĝo"
 
-#: ../panels/display/cc-display-panel.c:572
-#: ../panels/display/cc-display-panel.c:2195
-msgid "Primary"
-msgstr "Ĉefa"
+#: ../panels/display/cc-display-panel.c:741
+#, fuzzy
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portreto"
 
-#: ../panels/display/cc-display-panel.c:574
-#: ../panels/notifications/cc-notifications-panel.c:247
-#: ../panels/power/cc-power-panel.c:1713 ../panels/power/cc-power-panel.c:1724
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../panels/universal-access/cc-ua-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:572
-#: ../panels/universal-access/cc-ua-panel.c:695
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "Neaktiva"
+#: ../panels/display/cc-display-panel.c:744
+#, fuzzy
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portreto"
 
-#: ../panels/display/cc-display-panel.c:577
-msgid "Secondary"
-msgstr "Kroma"
+#: ../panels/display/cc-display-panel.c:747
+#, fuzzy
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Pejzaĝo"
 
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1579
-msgid "Arrange Combined Displays"
-msgstr "Aranĝi kombinitajn ekranojn"
+#. 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 "Orientiĝo"
 
-#: ../panels/display/cc-display-panel.c:1583
-#: ../panels/display/cc-display-panel.c:2021
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "_Apliki"
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1772
+#: ../panels/display/cc-display-panel.c:1818
+#: ../panels/printers/pp-options-dialog.c:87
+msgid "Resolution"
+msgstr "Distingivo"
 
-#: ../panels/display/cc-display-panel.c:1607
-msgid "Drag displays to rearrange them"
-msgstr "Ŝovu ekranojn por rearanĝi"
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
+msgid "Refresh Rate"
+msgstr "Aktualiga ofteco"
 
-#: ../panels/display/cc-display-panel.c:2073
+#: ../panels/display/cc-display-panel.c:1207
 #, fuzzy
-#| msgctxt "display panel, rotation"
-#| msgid "Counterclockwise"
-msgid "Rotate counterclockwise by 90°"
-msgstr "Turni maldekstrumen laŭ 90°"
+#| msgctxt "background, style"
+#| msgid "Scale"
+msgid "Scale"
+msgstr "Skali"
 
-#: ../panels/display/cc-display-panel.c:2091
-msgid "Rotate by 180°"
+#: ../panels/display/cc-display-panel.c:1260
+msgid "Adjust for TV"
 msgstr ""
 
-#: ../panels/display/cc-display-panel.c:2109
-msgid "Rotate clockwise by 90°"
-msgstr ""
+#: ../panels/display/cc-display-panel.c:1472
+#: ../panels/display/cc-display-panel.c:1518
+#, fuzzy
+#| msgid "Secondary Display"
+msgid "Primary Display"
+msgstr "Kroma ekrano"
 
-#: ../panels/display/cc-display-panel.c:2130
-msgid "Size"
-msgstr "Grando"
+#: ../panels/display/cc-display-panel.c:1567
+#| msgid "Display language:"
+msgid "Display Arrangement"
+msgstr ""
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2143
-msgid "Aspect Ratio"
-msgstr "Aspekta rilatumo"
+#: ../panels/display/cc-display-panel.c:1568
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr ""
 
-#: ../panels/display/cc-display-panel.c:2165
-#: ../panels/printers/pp-options-dialog.c:85
-msgid "Resolution"
-msgstr "Distingivo"
+#: ../panels/display/cc-display-panel.c:2006
+#, fuzzy
+#| msgid "Display Type"
+msgid "Display Mode"
+msgstr "Ekrantipo"
 
-#: ../panels/display/cc-display-panel.c:2196
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "Montri la supran breton kaj Aktivecoj-Superrigardon ĉi ekrane"
+#: ../panels/display/cc-display-panel.c:2022
+#, fuzzy
+#| msgid "Displays"
+msgid "Join Displays"
+msgstr "Ekranoj"
 
-#: ../panels/display/cc-display-panel.c:2202
-msgid "Secondary Display"
-msgstr "Kroma ekrano"
+#: ../panels/display/cc-display-panel.c:2025
+msgid "Mirror"
+msgstr "Speguli"
 
-#: ../panels/display/cc-display-panel.c:2203
-msgid "Join this display with another to create an extra workspace"
-msgstr "Kunmeti ĉi ekranon kun alia por krei ekstran laborspacon"
+#: ../panels/display/cc-display-panel.c:2028
+#, fuzzy
+#| msgctxt "universal access, seeing"
+#| msgid "Display"
+msgid "Single Display"
+msgstr "Ekrano"
 
-#: ../panels/display/cc-display-panel.c:2210
-msgid "Presentation"
-msgstr "Prezento"
+#: ../panels/display/cc-display-panel.c:2714
+msgid "Apply Changes?"
+msgstr ""
 
-#: ../panels/display/cc-display-panel.c:2211
-msgid "Show slideshows and media only"
-msgstr "Montri nur lumbildojn kaj aŭdvidaĵon"
+#: ../panels/display/cc-display-panel.c:2728
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "_Apliki"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2216
-msgid "Mirror"
-msgstr "Speguli"
+#: ../panels/display/cc-display-panel.c:3104
+#, c-format
+msgid "%.2lf Hz"
+msgstr ""
 
-#: ../panels/display/cc-display-panel.c:2217
-msgid "Show your existing view on both displays"
-msgstr "Montri vian ekzistantan vidon per ambaŭ ekranoj"
+#. TRANSLATORS: the state of the night light setting
+#: ../panels/display/cc-display-panel.c:3320
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../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 "Aktiva"
 
-#: ../panels/display/cc-display-panel.c:2223
-msgid "Turn Off"
-msgstr "Elŝalti"
+#: ../panels/display/cc-display-panel.c:3320 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../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 "Neaktiva"
 
-#: ../panels/display/cc-display-panel.c:2224
-msgid "Don't use this display"
-msgstr "Ne uzi ĉi ekranon"
+#: ../panels/display/cc-display-panel.c:3341
+#| msgid "Right Ring"
+msgid "_Night Light"
+msgstr "_Nokta lumo"
 
-#: ../panels/display/cc-display-panel.c:2449
+#: ../panels/display/cc-display-panel.c:3406
 msgid "Could not get screen information"
 msgstr "Ne eblas akiri informojn pri ekranoj"
 
-#: ../panels/display/cc-display-panel.c:2480
-msgid "_Arrange Combined Displays"
-msgstr "_Aranĝi kombinitajn ekranojn"
+#. This cancels the redshift inhibit.
+#: ../panels/display/display.ui.h:2
+#, fuzzy
+#| msgid "Restart Now"
+msgid "Restart Filter"
+msgstr "Restarti nun"
+
+#. Inhibit the redshift functionality until the next day starts
+#: ../panels/display/display.ui.h:4
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr ""
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
-msgstr "Ekranoj"
+#: ../panels/display/display.ui.h:5
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr ""
 
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: ../panels/display/display.ui.h:7
+#, fuzzy
+#| msgid "Right Ring"
+msgid "Night Light"
+msgstr "Dekstra ringo"
+
+#: ../panels/display/display.ui.h:8
+msgid "Schedule"
+msgstr ""
+
+#: ../panels/display/display.ui.h:9
+msgid "Sunset to Sunrise"
+msgstr ""
+
+#: ../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 "Permane"
+
+#: ../panels/display/display.ui.h:11
+#, fuzzy
+#| msgid "From URI"
+msgid "From"
+msgstr "De URI-o"
+
+#: ../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 ""
+
+#. This is the short form for the time period in the afternoon
+#: ../panels/display/display.ui.h:16
+msgid "PM"
+msgstr ""
+
+#: ../panels/display/display.ui.h:17
+msgid "To"
+msgstr ""
+
+#. 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
+#, fuzzy
+#| msgid "Displays"
+msgid "Dis­plays"
+msgstr "Ekranoj"
+
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Elekti kiel uzi konektitajn ekranojn kaj projekciilojn"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
 #, fuzzy
 #| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
 msgstr "Panelo;Projekciilo;xrandr;Ekrano;Distingivo;Aktualigi;"
 
-#: ../panels/info/cc-info-panel.c:385
-msgid "Wayland"
-msgstr "Vejlando"
-
 #. 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 "Nekonata"
 
-#: ../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; Build ID: %s"
+msgstr ""
+
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
+#, c-format
+#| msgid "%d-bit"
+msgid "64-bit"
+msgstr "64-bita"
+
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-bita"
+#| msgid "%d-bit"
+msgid "32-bit"
+msgstr "32-bita"
 
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-overview-panel.c:800
 #, c-format
-msgid "%d-bit"
-msgstr "%d-bita"
+msgid "Version %s"
+msgstr "Versio %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Sekcio"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Superrigardo"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Defaŭltaj aplikaĵoj"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Demetebla datumportilo"
 
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "Demandi kion fari"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "Fari nenion"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "Malfermi dosierujon"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "Aliaj datumportiloj"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "Elekti aplikaĵon por son-KDj"
 
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "Elekti aplikaĵon por video-DVDj"
 
-#: ../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 "Elektu rulendan aplikaĵon kiam muzikludilon estas konektita"
 
-#: ../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 "Elektu rulendan aplikaĵon kiam kamerao estas konektita"
 
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "Elekti aplikaĵon por programar-KDj"
 
@@ -1238,194 +1455,228 @@ msgstr "Elekti aplikaĵon por programar-KDj"
 #. * 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 "son-DVD"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "malplena Blu-radia disko"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "malplena KD-disko"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "malplena DVD-disko"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "malplena HD-DVD-disko"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "Blu-radia videodisko"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "retlibrolegilo"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videodisko"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "Bild-KD"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "Super-Video-KD"
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "Video-KD"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Windows-programaro"
 
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1947
-msgid "Section"
-msgstr "Sekcio"
-
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Superrigardo"
-
-#: ../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
+#, fuzzy
+#| msgid "Default Applications"
+msgid "Defa­ult Applications"
 msgstr "Defaŭltaj aplikaĵoj"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Demetebla datumportilo"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Default Applications"
+msgid "Configure Default Applications"
+msgstr "Defaŭltaj aplikaĵoj"
 
-#: ../panels/info/cc-info-panel.c:1480
-#, c-format
-msgid "Version %s"
-msgstr "Versio %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 ""
 
-#: ../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 "Detaloj"
+#. 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 ""
 
-#: ../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 "Montri informon pri via sistemo"
 
 #. 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 "aparato;sistemo;informo;memoro;procesoro;versio;defaŭlta;preferita;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Elektu kiel aliaj datumportiloj estu traktitaj"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Ago:"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "Aparatnomo"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "Memoro"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "Procesoro"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Baza sistemo"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "Disko"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "Kalkulanta…"
+#. 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
+#, fuzzy
+#| msgid "Details"
+msgid "De­tails"
+msgstr "Detaloj"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "Grafikoj"
+#. 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
+#, fuzzy
+#| msgid "Removable Media"
+msgid "Remo­vable Media"
+msgstr "Demetebla datumportilo"
 
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Virtualigado"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Configure Bluetooth settings"
+msgid "Configure Removable Media settings"
+msgstr "Ŝanĝi la Bludentajn agordojn"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "Kontroli pri ĝisdatigoj"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#, fuzzy
+#| 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 "aparato;sistemo;informo;memoro;procesoro;versio;defaŭlta;preferita;"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "_TTT"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
 msgid "_Mail"
 msgstr "_Retpoŝto"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
 msgid "_Calendar"
 msgstr "_Kalendaro"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
 msgid "M_usic"
 msgstr "M_uziko"
 
-#: ../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 "_Fotaĵoj"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "Aparatnomo"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "Memoro"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "Procesoro"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Grafikoj"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr ""
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "Tipo de operaciumo"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Virtualigado"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "Disko"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "Kalkulanta…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "Kontroli pri ĝisdatigoj"
+
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "Elektu kiel datumportiloj estu traktitaj"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "_Son-KD"
 
-#: ../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 "_Muzikludilo"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "_Programaro"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "_Aliaj datumportiloj…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Neniam lanĉi programarojn dum enmeto de datumportilo"
 
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Elektu kiel aliaj datumportiloj estu traktitaj"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Ago:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Tipo:"
+
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Sono kaj aŭdvidaĵoj"
@@ -1471,8 +1722,7 @@ msgid "Eject"
 msgstr "Elĵeti"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Typing"
 msgstr "Tajpado"
 
@@ -1493,8 +1743,9 @@ msgstr "Lanĉiloj"
 msgid "Launch help browser"
 msgstr "Lanĉi helpfoliumilon"
 
-#: ../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:794
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Agordoj"
 
@@ -1567,7 +1818,6 @@ msgid "Lock screen"
 msgstr "Ŝlosi ekranon"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "Alirebleco"
 
@@ -1603,14 +1853,25 @@ msgstr "Malpligrandigi la tekston"
 msgid "High contrast on or off"
 msgstr "En- aŭ elŝalti altan kontraston"
 
+#: ../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 "Propraj klavkombinoj"
+
+#. 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:1219
+#: ../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 "Elŝaltite"
 
@@ -1634,199 +1895,181 @@ msgstr "Krea klavo"
 msgid "Modifiers-only switch to next source"
 msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "Klavaro"
-
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr "Montri kaj ŝanĝi fulmoklavoj kaj agordi viajn tajpadajn opciojn"
-
-#. 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 "Klavkombino;Ripeto;Pulso;"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Personigita klavkombino"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "_Nomo:"
+#: ../panels/keyboard/cc-keyboard-panel.c:181
+#| msgid "Remove Shortcut"
+msgid "Reset All Shortcuts?"
+msgstr "Reagordi ĉiujn klavkombinojn?"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "K_omando:"
+#: ../panels/keyboard/cc-keyboard-panel.c:184
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Repeat Keys"
-msgstr "Ripetaj klavoj"
+#: ../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 "Nuligi"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Key presses _repeat when key is held down"
-msgstr "Klavpremoj _ripetas kiam klavo estas tenata malsupre"
+#: ../panels/keyboard/cc-keyboard-panel.c:189
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset All"
+msgstr "Reagordi"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid "_Delay:"
-msgstr "_Prokrasto:"
+#: ../panels/keyboard/cc-keyboard-panel.c:281
+msgid "Reset the shortcut to its default value"
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-msgid "_Speed:"
-msgstr "_Rapido:"
+#: ../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 ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-msgctxt "keyboard, delay"
-msgid "Short"
-msgstr "Mallonge"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#, fuzzy
+#| msgid "Custom Shortcut"
+msgid "Set Custom Shortcut"
+msgstr "Personigita klavkombino"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
-msgctxt "keyboard, speed"
-msgid "Slow"
-msgstr "Malrapide"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#, fuzzy
+#| msgid "Shortcut"
+msgid "Set Shortcut"
+msgstr "Klavkombino"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-msgid "Repeat keys speed"
-msgstr "Ripetklava rapido"
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-msgctxt "keyboard, delay"
-msgid "Long"
-msgstr "Longe"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#, fuzzy
+#| msgid "Custom Shortcut"
+msgid "Add Custom Shortcut"
+msgstr "Personigita klavkombino"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-msgctxt "keyboard, speed"
-msgid "Fast"
-msgstr "Rapide"
+#. 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
+#, fuzzy
+#| msgid "Keyboard"
+msgid "Key­board"
+msgstr "Klavaro"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
-msgid "Cursor Blinking"
-msgstr "Pulsanta kursoro"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "Montri kaj ŝanĝi fulmoklavoj kaj agordi viajn tajpadajn opciojn"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-msgid "Cursor _blinks in text fields"
-msgstr "Kursoraj _pulsoj en tekstkampo"
+#. Translators: those are keywords for the keyboard control-center panel
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid "S_peed:"
-msgstr "Ra_pido:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+msgid "Keyboard Shortcuts"
+msgstr "Fulmoklavoj"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Cursor blink speed"
-msgstr "Rapido de kursora pulsado"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Reset All…"
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/region/region.ui.h:5
-msgid "Input Sources"
-msgstr "Enigaj fontoj"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+msgid "Reset all shortcuts to their default keybindings"
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-msgid "Add Shortcut"
-msgstr "Aldoni klavkombinon"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#, fuzzy
+#| msgid "Keyboard Shortcuts"
+msgid "No keyboard shortcut found"
+msgstr "Fulmoklavoj"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
-msgid "Remove Shortcut"
-msgstr "Forigi klavkombinon"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
+msgid "Try a different search"
+msgstr ""
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-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 ""
-"Por redakti klavkombinon, alklaku la vicon kaj premu la novajn klavojn aŭ "
-"premu la retropaŝan klavon por vakigi."
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:24
-msgid "Shortcuts"
-msgstr "Klavkombinoj"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/printers/details-dialog.ui.h:1
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Nomo"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:636
-#: ../panels/keyboard/keyboard-shortcuts.c:644
-msgid "Custom Shortcuts"
-msgstr "Propraj klavkombinoj"
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+#| msgid "C_ommand:"
+msgid "Command"
+msgstr "Komando"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:861
-msgid "<Unknown Action>"
-msgstr "<Nekonata ago>"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "Klavkombino"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1358
-#, 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 ""
-"La klavkombino \"%s\" ne povas esti uzata ĉar ĝi ne ebloj tajpi per ĉi tiu "
-"klavo.\n"
-"Bonvou reprovi per klavo kiel stirklavo, alt-klavo aŭ majuskliga klavo "
-"samtempe."
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+#, fuzzy
+#| msgid "New shortcut…"
+msgid "Set Shortcut…"
+msgstr "Nova klavkombino…"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1388
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"La klavkombino \"%s\" estas jam uzata por\n"
-"\"%s\""
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "Neniu"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1393
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr ""
-"Se vi reatribuas la klavkombinon al \"%s\", la klavkombino \"%s\" estos "
-"elŝaltita."
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#, fuzzy
+#| msgid "Error saving the new shortcut"
+msgid "Enter the new shortcut"
+msgstr "Eraro dum konservo de la nova klavkombino"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1399
-msgid "_Reassign"
-msgstr "_Reatribui"
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Forigi"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1440
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr ""
-"La \"%s\"-fulmoklavo jam havas asocigitan \"%s\"-fulmoklavon. Ĉu vi volas "
-"aŭtomate difini ĝin al \"%s\"?"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+msgid "Add"
+msgstr "Aldoni"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1450
-#, 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 ""
-"Se vi reatribuas la klavkombinon al \"%s\", la klavkombino \"%s\" estos "
-"elŝaltita."
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "Anstataŭigi"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1457
-msgid "_Assign"
-msgstr "_Atribui"
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+#, fuzzy
+#| msgid "Select"
+msgid "Set"
+msgstr "Elekti"
 
-#: ../panels/mouse/cc-mouse-panel.c:94
+#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "Testi viajn _agordojn"
 
-#: ../panels/mouse/cc-mouse-panel.c:107
-msgid "Test Your Settings"
-msgstr "Testi viajn agordojn"
-
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
+#. 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
+#, fuzzy
+#| msgid "Mouse & Touchpad"
+msgid "Mouse & Touch­pad"
 msgstr "Muso kaj tuŝplato"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr ""
 "Ŝanĝi vian musan aŭ tuŝplatan sentemon kaj elekti dekstra- aŭ maldekstramana"
 
 #. 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 "Tuŝplato;Musmontrilo;Alklako;Frapeto;Butono;Stirglobo;Rulumi;"
 
@@ -1835,81 +2078,78 @@ msgid "General"
 msgstr "Ĝenerale"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-msgctxt "double click, speed"
-msgid "Slow"
-msgstr "Malrapide"
+#| msgid "Primary _button"
+msgid "Primary Button"
+msgstr "Ĉefa butono"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "Double-click timeout"
-msgstr "Tempolimo de duobla klako"
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr ""
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:4
-msgctxt "double click, speed"
-msgid "Fast"
-msgstr "Rapide"
+#, fuzzy
+#| msgctxt "balance"
+#| msgid "Left"
+msgid "Left"
+msgstr "Maldekstre"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgid "_Double-click"
-msgstr "_Duobla klako"
+#, fuzzy
+#| msgctxt "balance"
+#| msgid "Right"
+msgid "Right"
+msgstr "Dekstre"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "Primary _button"
-msgstr "Ĉefa _butono"
+msgid "Mouse"
+msgstr "Muso"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:7
-msgctxt "mouse, left button as primary"
-msgid "_Left"
-msgstr "Ma_ldekstre"
+#| msgid "_Mouse Keys"
+msgid "Mouse Speed"
+msgstr "Musa rapideco"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgctxt "mouse, right button as primary"
-msgid "_Right"
-msgstr "Dekst_re"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
-msgid "Mouse"
-msgstr "Muso"
+msgid "Double-click timeout"
+msgstr "Tempolimo de duobla klako"
 
+#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
 #: ../panels/mouse/gnome-mouse-properties.ui.h:10
-msgid "_Pointer speed"
-msgstr "_Indikilrapido"
+#| msgid "_Natural scrolling"
+msgid "Natural Scrolling"
+msgstr "Natura rulumado"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:11
-msgctxt "mouse pointer, speed"
-msgid "Slow"
-msgstr "Malrapide"
+#, fuzzy
+#| msgid "This will not remove the account on the server."
+msgid "Scrolling moves the content, not the view."
+msgstr "Tio ne forigos la konton ĉe la servilo."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:12
-msgctxt "mouse pointer, speed"
-msgid "Fast"
-msgstr "Rapide"
+msgid "Touchpad"
+msgstr "Tuŝplato"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgid "Touchpad"
+#, fuzzy
+#| msgid "Touchpad"
+msgid "Touchpad Speed"
 msgstr "Tuŝplato"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgctxt "touchpad pointer, speed"
-msgid "Slow"
-msgstr "Malrapide"
+#| msgid "Tap to _click"
+msgid "Tap to Click"
+msgstr "Frapeti por alklaki"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-msgctxt "touchpad pointer, speed"
-msgid "Fast"
-msgstr "Rapide"
+#| msgid "Two _finger scroll"
+msgid "Two-finger Scrolling"
+msgstr "Dufingra rulumado"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "Tap to _click"
-msgstr "Frapeti por _alklaki"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
-msgid "Two _finger scroll"
-msgstr "Du_fingra rulumado"
-
-#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-msgid "_Natural scrolling"
-msgstr "_Natura rulumado"
+#, fuzzy
+#| msgid "Scrolling"
+msgid "Edge Scrolling"
+msgstr "Rulumado"
 
 #: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
@@ -1948,13 +2188,8 @@ msgstr "Duobla klako, duaranga butono"
 msgid "Single click, secondary button"
 msgstr "Unufoja alklako, sekundara butono"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:358
-msgid "Air_plane Mode"
-msgstr "_Aviadila reĝimo"
-
-#: ../panels/network/cc-network-panel.c:967
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:581
 msgid "Network proxy"
 msgstr "Retprokurilo"
 
@@ -1962,35 +2197,42 @@ msgstr "Retprokurilo"
 #. * 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:431
+#: ../panels/network/cc-network-panel.c:717 ../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:781 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr ""
 
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:787
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager devas esti rulanta."
 
+#. 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 _sekureco"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
 #: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "paĝo 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../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/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 "_Sennoma idento"
 
@@ -2001,73 +2243,68 @@ msgstr "Ena _aŭtentigo"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
 #: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "paĝo 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../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 "Sekureco"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "aŭtomata"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "Profilo %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:382
+#: ../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:222
-#: ../panels/network/net-device-wifi.c:387
+#: ../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:226
+#: ../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:231
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Enterpreno"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:236
-#: ../panels/network/net-device-wifi.c:372
+#: ../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 "Neniu"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:19
+#: ../panels/network/connection-editor/ce-page-details.c:95
+#: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Neniam"
 
-#: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:815
-msgid "Today"
-msgstr "Hodiaŭ"
-
-#: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:818
-msgid "Yesterday"
-msgstr "Hieraŭ"
-
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/connection-editor/ce-page-details.c:110
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:505
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2075,179 +2312,120 @@ msgstr[0] "Antaŭ %i tago"
 msgstr[1] "Antaŭ %i tagoj"
 
 #. 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:533
+#: ../panels/network/connection-editor/ce-page-details.c:176
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:561
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:562
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:590
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Nenia"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:564
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:592
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Malforta"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:566
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:594
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Sufiĉa"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:568
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:596
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Bona"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:570
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:598
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Bonega"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:204
-#: ../panels/network/connection-editor/ce-page-wifi.c:270
-#: ../panels/network/network-wifi.ui.h:47
-msgid "Identity"
-msgstr "Idento"
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#, fuzzy
+#| msgid "Connection"
+msgid "Forget Connection"
+msgstr "Konekto"
 
-#: ../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 "Adreso"
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "Konekto malsukcesis"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
-msgid "Netmask"
-msgstr "Retmasko"
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#| msgid "_Remove"
+msgid "Remove VPN"
+msgstr "Forigi na 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 "Kluzo"
+#: ../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 "Detaloj"
+
+#: ../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 "Idento"
 
-#: ../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 "Forigi adreson"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "Aldoni"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
-msgid "Server"
-msgstr "Servilo"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
-msgid "Delete DNS Server"
-msgstr "Forigi nomservilon"
-
-#. 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 "Metriko"
-
-#: ../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 "Forigi kurson"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Aŭtomata (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 "Permane"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
-msgid "Link-Local Only"
-msgstr "Nur \"Ligi-Loke\""
-
-#: ../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 "Prefikso"
-
-#: ../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 "Aŭtomate"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
-msgid "Automatic, DHCP only"
-msgstr "Aŭtomate, nur 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 "Reagordi"
-
-#: ../panels/network/connection-editor/ce-page-security.c:250
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../panels/network/connection-editor/ce-page-security.c:273
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bita ŝlosilo (Deksesuma aŭ ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:283
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
-#: ../panels/network/connection-editor/ce-page-security.c:296
-#: ../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:309
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamika WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:323
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
-#: ../panels/network/connection-editor/ce-page-security.c:337
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA kaj WPA2 por enterprenoj"
 
@@ -2262,42 +2440,37 @@ msgid "Link speed"
 msgstr "Ligita rapido"
 
 #: ../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:693
+#: ../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-adreso"
 
 #: ../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:694
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6-adreso"
 
 #: ../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 "Aparatara adreso"
 
 #: ../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 "Defaŭlta kurso"
 
 #: ../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"
@@ -2306,6 +2479,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Laste uzita"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Konekti _aŭtomate"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Disponebligi por _aliaj uzantoj"
+
+#: ../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 "Aŭtomate"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "Tordita Paro (TP)"
@@ -2362,203 +2552,198 @@ msgstr "_Klonita adreso"
 msgid "bytes"
 msgstr "bajtoj"
 
-#: ../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 "Disponebligi kun aliaj _uzantoj"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#, fuzzy
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "IPv_4-_metodo"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Konekti _aŭtomate"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Aŭtomata (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-#: ../panels/network/connection-editor/wifi-page.ui.h:8
-msgid "Firewall _Zone"
-msgstr "Fajroŝirmila _zono"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Nur \"Ligi-Loke\""
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "Defaŭlta"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#, fuzzy
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "Elŝaltite"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgid "_Addresses"
+msgid "Addresses"
+msgstr "Adresoj"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-msgid "The zone defines the trust level of the connection"
-msgstr "La zono definas la fidindecan nivelon de la konekto"
+#: ../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 "Adreso"
 
-#: ../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:8
+msgid "Netmask"
+msgstr "Retmasko"
 
-#: ../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 "_Adresoj"
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Kluzo"
 
-#: ../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:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "Aŭtomata 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 ""
+
+#: ../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 "Kursoj"
 
-#: ../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 "Aŭtomataj kursoj"
 
-#: ../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
+#, fuzzy
+#| msgctxt "network parameters"
+#| msgid "Metric"
+msgid "Metric"
+msgstr "Metriko"
+
+#: ../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 "Uzi ĉi konekton _nur por risurcoj rekte sur la sama reto"
 
 #: ../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-metodo"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:269
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Aŭtomate, nur DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Prefikso"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Ne eblas malfermi konekta redaktilo"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:287
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Nova profilo"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:577
+#: ../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:578
-msgid "Bond"
-msgstr "Bindo"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:580
-msgid "Team"
-msgstr "Teamo"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:582
-msgid "Bridge"
-msgstr "Ponto"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:583
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:734
-msgid "Could not load VPN plugins"
-msgstr "Ne eblas ŝargi VPN-an etendojn"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:803
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Importi de dosiero…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:874
-msgid "Add Network Connection"
-msgstr "Aldoni retan konekton"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "_Vakigi agordojn"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1441
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Forgesi"
-
-#: ../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 ""
-"Vakigi la agordojn por ĉi reto, inkludante pasvortojn, sed memori ĝin kiel "
-"preferita reto"
-
-#: ../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 "Forigi ĉiujn detalojn de ĉi reto kaj ne klopodi aŭtomate konekti"
+#: ../panels/network/connection-editor/net-connection-editor.c:785
+#| msgid "%s VPN"
+msgid "Add VPN"
+msgstr "Aldoni na VPN"
 
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
 msgstr "S_ekureco"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Ne eblas enporti VPN-konekton"
 
-#: ../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 ""
-"La dosiero '%s' ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn "
+"La dosiero “%s” ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn "
 "informojn\n"
 "\n"
 "Eraro: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Elekti enportendan dosieron"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1941
-#: ../panels/sharing/cc-sharing-panel.c:492
-#: ../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:376
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Malfermi"
 
-#: ../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."
-msgstr "Dosiero nomita \"%s\" jam ekzistas."
+#| msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
+msgstr "Dosiero nomita “%s” jam ekzistas."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: ../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 "Ĉu vi volas anstataŭigi %s per la VPN-konekto vi estas konservanta?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Ne eblas elporti VPN-konekton"
 
-#: ../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 ""
-"La VPN-konekto '%s' ne povas esti elportita al %s.\n"
+"La VPN-konekto “%s” ne povas esti elportita al %s.\n"
 "\n"
 "Eraro: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
-#| msgid "Export VPN connection..."
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Elporti VPN-konekton"
 
-#: ../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 "(Eraro: ne eblas ŝargi VPN-an konekton redaktilo)"
 
@@ -2577,67 +2762,65 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "Mia hejma reto"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Disponebligi por _aliaj uzantoj"
-
-#: ../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
+#, fuzzy
+#| msgid "Network"
+msgid "Net­work"
 msgstr "Reto"
 
-#: ../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 "Regi kiel vi konektas al la interreto"
 
 #. 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
 #, fuzzy
 #| msgid ""
 #| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
 #| "vpn;vlan;bridge;bond;"
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
 msgstr "Reto;Sendrata;Wi-Fi;ŬiFi;Wifi;Prokurilo;Modemo;Bludento;VPR;"
 
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Bindaj sklavoj"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(neniu)"
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Control how you connect to the Internet"
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Regi kiel vi konektas al la interreto"
 
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Pontaj sklavoj"
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;vlan;bridge;bond;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr "Reto;Sendrata;Wi-Fi;ŬiFi;Wifi;Prokurilo;Modemo;Bludento;VPR;"
 
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:491
 msgid "never"
 msgstr "neniam"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:501
 msgid "today"
 msgstr "hodiaŭ"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:503
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
-#: ../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-Adreso"
 
-#: ../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 "Laste uzita"
@@ -2647,50 +2830,30 @@ msgstr "Laste uzita"
 #. * 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 "Drate"
 
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1597
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1792
+#: ../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 "Agordoj…"
 
-#: ../panels/network/net-device-ethernet.c:472
-#, c-format
-msgid "Profile %d"
-msgstr "Profilo %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Aldoni novan konekton"
 
-#: ../panels/network/net-device-team.c:77
-#, fuzzy
-#| msgid "Bridge slaves"
-msgid "Team slaves"
-msgstr "Pontaj sklavoj"
-
-#: ../panels/network/net-device-wifi.c:1154
-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 ""
-"Se vi havas konekton al la interreto krom sendrata, vi povas agordi "
-"sendratan retkaptejon por kunhavi la konekton kun aliaj."
-
-#: ../panels/network/net-device-wifi.c:1158
+#: ../panels/network/net-device-wifi.c:1275
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Se vi aktivigi la sendratan retkaptejon, vi malkonektos de <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1162
+#: ../panels/network/net-device-wifi.c:1279
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2698,23 +2861,38 @@ msgstr ""
 "Ne eblas atingi interreton tra via sendrata aparato dum la retkaptejo "
 "aktivigas."
 
-#: ../panels/network/net-device-wifi.c:1245
+#: ../panels/network/net-device-wifi.c:1286
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Ĉu aktivgi retkaptejon?"
+
+#: ../panels/network/net-device-wifi.c:1308
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+
+#: ../panels/network/net-device-wifi.c:1319
+msgid "_Turn On"
+msgstr "_Enŝalti"
+
+#: ../panels/network/net-device-wifi.c:1396
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Haltigi retkaptejon kaj malkonektiĝi ĉiujn uzantojn?"
 
-#: ../panels/network/net-device-wifi.c:1248
+#: ../panels/network/net-device-wifi.c:1399
 msgid "_Stop Hotspot"
 msgstr "Halti_gi retkaptejon"
 
-#: ../panels/network/net-device-wifi.c:1305
+#: ../panels/network/net-device-wifi.c:1496
 msgid "System policy prohibits use as a Hotspot"
 msgstr "Sistema politiko malebligas uzon kiel retkaptejo"
 
-#: ../panels/network/net-device-wifi.c:1308
+#: ../panels/network/net-device-wifi.c:1499
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Sendrata aparato ne subtenas retkapteja reĝimo"
 
-#: ../panels/network/net-device-wifi.c:1437
+#: ../panels/network/net-device-wifi.c:1630
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2722,26 +2900,24 @@ msgstr ""
 "Retaj detaloj por la elektitaj retoj, inkludante pasvortojn kaj iuj ajn "
 "propraj agordoj perdiĝos."
 
-#: ../panels/network/net-device-wifi.c:1750
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-msgid "History"
-msgstr "Historio"
+#: ../panels/network/net-device-wifi.c:1634
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Forgesi"
 
-#: ../panels/network/net-device-wifi.c:1754
-#: ../panels/region/input-options.ui.h:2 ../panels/wacom/button-mapping.ui.h:2
-#: ../panels/wacom/cc-wacom-page.c:533
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "_Fermi"
+#: ../panels/network/net-device-wifi.c:1943
+#: ../panels/network/net-device-wifi.c:1950
+msgid "Known Wi-Fi Networks"
+msgstr ""
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1762
+#: ../panels/network/net-device-wifi.c:1983
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forgesi"
 
 #. 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 ""
@@ -2752,18 +2928,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 "Tio ne estas rekomendita por nefidindaj publikaj retoj."
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Prokurilo"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Aldoni profilon…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2772,95 +2940,71 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Provizanto"
 
-#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Neniu"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Permane"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Aŭtomate"
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Reto"
 
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Metodo"
+#: ../panels/network/network-proxy.ui.h:1
+#, fuzzy
+#| msgid "Network proxy"
+msgid "Network Proxy"
+msgstr "Retprokurilo"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Agordaradreso"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "_FTP-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "_SOCKS-Gastigilo"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "_Ne uzi por"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "Pordo de HTTP-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "Pordo de HTTPS-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "Pordo de FTP-prokurilo"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Pordo de SOCKS-prokurilo"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "_Agordaradreso"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Elŝalti aparaton"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Aldoni aparaton"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bludento"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Forigi aparaton"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr ""
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN-tipo"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Grupnomo"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Gruppasvorto"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "Uzantonomo"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Malaktivigi VPN-an konekton"
 
@@ -2877,15 +3021,12 @@ msgstr "detaloj"
 #: ../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/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 "_Pasvorto"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "Neniu"
-
 #: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "_Montri pasvorton"
@@ -2898,6 +3039,14 @@ msgstr "Disponebligi por aliaj uzantoj"
 msgid "identity"
 msgstr "idento"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "_Adresoj"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Nur aŭtomataj adresoj (DHCP)"
@@ -2918,6 +3067,10 @@ msgstr "_Malatenti aŭtomate ricevitajn kursojn"
 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"
@@ -2930,6 +3083,10 @@ msgstr "_Klonita MAC-adreso"
 msgid "hardware"
 msgstr "aparataro"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "_Vakigi agordojn"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -2953,496 +3110,580 @@ msgstr "reagordi"
 msgid "Hardware"
 msgstr "Aparataro"
 
+#: ../panels/network/network-wifi.ui.h:51
+#, fuzzy
+#| msgid "Reset"
+msgctxt "tab"
+msgid "Reset"
+msgstr "Reagordi"
+
 #: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi Hotspot"
 msgstr "Retkaptejo"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Enŝalti"
+msgid "Switch off to connect to a Wi-Fi network"
+msgstr "Malaktivigi por konekti al sendrata reto"
 
 #: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgid "Network Name"
+msgstr "Retnomo"
 
 #: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Elŝalti na Wi-Fi"
+msgid "Connected Devices"
+msgstr "Konektitaj aparatoj"
 
 #: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "_Uzi kiel retkaptejo…"
+msgid "Security type"
+msgstr "Sekureca speco"
 
 #: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Konekti al kaŝita reto…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "_Historio"
+#: ../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 "Pasvorto"
 
 #: ../panels/network/network-wifi.ui.h:59
-msgid "Switch off to connect to a Wi-Fi network"
-msgstr "Malaktivigi por konekti al sendrata reto"
+msgid "Turn Wi-Fi off"
+msgstr "Elŝalti na Wi-Fi"
 
 #: ../panels/network/network-wifi.ui.h:60
-msgid "Network Name"
-msgstr "Retnomo"
+msgid "_Connect to Hidden Network…"
+msgstr "_Konekti al kaŝita reto…"
 
 #: ../panels/network/network-wifi.ui.h:61
-msgid "Connected Devices"
-msgstr "Konektitaj aparatoj"
+#| msgid "Wi-Fi Hotspot"
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "_Aktivgi retkaptejon…"
 
 #: ../panels/network/network-wifi.ui.h:62
-msgid "Security type"
-msgstr "Sekureca speco"
+msgid "_Known Wi-Fi Networks"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:63
-msgid "Security key"
-msgstr "Sekureca ŝlosilo"
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr ""
+
+#: ../panels/network/wifi.ui.h:2
+#, fuzzy
+#| msgid "No Pictures Found"
+msgid "No Wi-Fi Adapter Found"
+msgstr "Neniuj bildoj trovita"
+
+#: ../panels/network/wifi.ui.h:3
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode"
+msgstr "Aviadila reĝimo"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr ""
+
+#: ../panels/network/wifi.ui.h:5
+#, fuzzy
+#| msgid "Networks"
+msgid "Visible Networks"
+msgstr "Retoj"
+
+#: ../panels/network/wifi.ui.h:6
+#| msgid "NetworkManager needs to be running."
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager devas esti rulanta"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Provizore"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Infrastrukturo"
 
 #. 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 "Nekonata stato"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Nemastrumite"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Nedisponeble"
 
 #. 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 "Konektante"
 
 #. 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 "Aŭtentokontrolo estas bezonata"
 
 #. 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 "Konektite"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Malkontaktante"
 
 #. 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 "Konekto malsukcesis"
 
 #. 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 "Nekonata stato (mankanta)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Ne konekite"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Agordo malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "Adresa agordo malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "Adresa agordo senvalidiĝis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "Sekretoj estis bezonitaj, sed ne provizitaj"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x provizanto malkonektitas"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "Agordo de 802.1x provizanto malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x provizanto malsukcesis"
 
 #. 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 "802.1x provizanto estis tro malrapida por aŭtentigi"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "la PPP-servo malsukcesis starti"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "la PPP-servo malkonektis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "la DHCP-servo malsukcesis starti"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "Eraro de la DHCP-kliento"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP-kliento malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "Kunhavita koneta servo malsukcesis starti"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "Kunhavita koneta servo malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "la AutoIP-servo malsukcesis starti"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP-serva eraro"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "la AutoIP-servo malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Lineo okupita"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "Neniu voktono"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "Datumportilo ne povis starigiti"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "Numeruma peto eltempiĝis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Numeruma peto malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Modema pravalorizo malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "Malsukcesis elekti specifitan APN-on"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "Ne serĉanta por retoj"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Reta registriĝo neis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "Reta registriĝo eltempiĝis"
 
 #. 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 "Registriĝo por la petita reto malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN-kontrolo malsukcesis"
 
 #. 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 "Firma programaro por la aparato eble mankas"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Konekto malaperis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "Ekzistanta konekto supozintis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "Modemo ne trovita"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bludenta konekto malsukcesis"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIM-karto ne enmetita"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIM-karto PIN bezonita"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIM-karto PUK bezonita"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM-karto malĝusta"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand aparato ne subtenas konektitan reĝimon"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Konekta dependeco malsukcesis"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "Mikroprogramaro mankas"
 
 #. 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 "Kablo ne konektita"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Neniu atestilo de Atestilaŭtoritato elektita"
-
-#: ../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?"
+#: ../panels/network/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
-"Se vi ne uzas atestilaŭtoritatan (CA) atestilon tiam vi povas konekti al "
-"nesekuraj, friponaj sendrataj retoj.  Ĉu vi volas elekti atestilaŭtoritatan "
-"atestilon?"
 
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "Ignori"
+#: ../panels/network/wireless-security/eap-method.c:233
+#| msgid "No input source selected"
+msgid "no file selected"
+msgstr "neniu elektita dosiero"
 
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Elekti CA-atestilon"
+#: ../panels/network/wireless-security/eap-method.c:264
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:439
+#, fuzzy
+#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Privataj ŝlosiloj de specoj DER, PEM aŭ PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../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- aŭ PEM-atestiloj (*.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 ""
+
+#: ../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 "Elekti PAC-dosieron"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC-dosieroj (*.pac)"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+msgid "Anonymous"
+msgstr "Sennoma"
+
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+msgid "Authenticated"
+msgstr "Aŭtentokontrolata"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+msgid "Both"
+msgstr "Ambaŭ"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "PAC-_dosiero"
 
-#: ../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
 msgid "_Inner authentication"
 msgstr "_Ena aŭtentigo"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#, fuzzy
+#| msgid "PAC pro_visioning"
+msgid "Allow automatic PAC pro_visioning"
 msgstr "PAC-_inicado"
 
-#: ../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 "Sennoma"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-msgid "Authenticated"
-msgstr "Aŭtentokontrolata"
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
-msgid "Both"
-msgstr "Ambaŭ"
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr ""
 
 #: ../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 "_Uzantonomo"
 
 #: ../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 "_Montri pasvorton"
 
-#: ../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 ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr ""
+
+#: ../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
-#| msgid "Choose a Certificate Authority certificate..."
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Elekti atestilon de Atestilaŭtoritato"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Versio 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 "Versio 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 "C_A-atestilo"
 
+#: ../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
+#, fuzzy
+#| msgid "Authentication required"
+msgid "No CA certificate is _required"
+msgstr "Neniu aŭtentokontrolo estas _bezonata"
+
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "PEAP-_versiono"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Ĉiam _postuli la pasvorton"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+#, fuzzy
+#| msgid "Wrong password"
+msgid "missing EAP password"
+msgstr "Falsa pasvorto"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Neĉifritaj privataj ŝlosiloj estas nesekuraj"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
+#, fuzzy
+#| 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 ""
-"Ŝajne la elektita privata ŝlosilo ne estas protektata per pasvorto.  Tio "
-"povas kaŭzi la forlikon de viaj sekurecinformoj.  Bonvolu elekti pasvort-"
+"Ŝajne la elektita privata ŝlosilo ne estas protektata per pasvorto. Tio "
+"povas kaŭzi la forlikon de viaj sekurecinformoj. Bonvolu elekti pasvort-"
 "protektitan privatan ŝlosilon.\n"
 "\n"
 "(Vi povas pasvort-protekti vian privatan ŝlosilon per openssl)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
 msgstr "Elekti vian personan atestilon"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
 msgid "Choose your private key"
 msgstr "Elekti vian privatan ŝlosilon"
 
@@ -3454,256 +3695,274 @@ msgstr "I_dento"
 msgid "_User certificate"
 msgstr "_Uzantula atestilo"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "Privata ŝ_losilo"
 
-#: ../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 "_Privata ŝlosila pasvorto"
 
-#: ../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 ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../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
+#, fuzzy
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2"
+
+#: ../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 "Ne _averti min denove"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ne"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Jes"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#: ../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 ""
+
+#: ../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 "Tunelita TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Protektita 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
+#: ../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 "Au_thentication"
 msgstr "_Aŭtentigo"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+#, fuzzy
+#| msgid "Wrong password"
+msgid "missing leap-password"
+msgstr "Falsa pasvorto"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr ""
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (defaŭlte)"
 
 #: ../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 "Malferma sistemo"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Kunhavigita ŝlosilo"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "Ŝ_losilo"
 
-#: ../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 "_Montri ŝlosilon"
 
-#: ../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-a inde_kso"
 
+#: ../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 ""
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "_Speco"
 
-#: ../panels/notifications/cc-notifications-panel.c:247
-#: ../panels/power/cc-power-panel.c:1719 ../panels/power/cc-power-panel.c:1726
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../panels/universal-access/cc-ua-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:572
-#: ../panels/universal-access/cc-ua-panel.c:695
-msgid "On"
-msgstr "Malaktiva"
-
 #. This is the per application switch for message tray usage.
 #: ../panels/notifications/edit-dialog.ui.h:2
+#| msgctxt "notifications"
+#| msgid "Notifications"
 msgctxt "notifications"
-msgid "Notifications"
-msgstr "Sciigoj"
+msgid "_Notifications"
+msgstr "_Sciigoj"
 
 #. This is the setting to configure sounds associated with notifications.
 #: ../panels/notifications/edit-dialog.ui.h:4
+#| msgctxt "notifications"
+#| msgid "Sound Alerts"
 msgctxt "notifications"
-msgid "Sound Alerts"
-msgstr "Sona averto"
+msgid "Sound _Alerts"
+msgstr "Sonaj _avertoj"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
 #, fuzzy
 #| msgctxt "notifications"
 #| msgid "Notifications"
 msgctxt "notifications"
-msgid "Notification Banners"
+msgid "Notification _Popups"
 msgstr "Sciigoj"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
-#, fuzzy
+#: ../panels/notifications/edit-dialog.ui.h:6
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr ""
+
+#. Popups here refers to message tray notifications in the middle of the screen.
+#: ../panels/notifications/edit-dialog.ui.h:8
 #| msgctxt "notifications"
 #| msgid "Show Details in Banners"
 msgctxt "notifications"
-msgid "Show Message Content in Banners"
-msgstr "Montri detalojn en sciigoj"
+msgid "Show Message _Content in Popups"
+msgstr "Montri mesaĝan _enhavon en sciigoj"
 
-#: ../panels/notifications/edit-dialog.ui.h:8
-#, fuzzy
+#: ../panels/notifications/edit-dialog.ui.h:9
 #| msgctxt "notifications"
 #| msgid "Notifications"
 msgctxt "notifications"
-msgid "Lock Screen Notifications"
-msgstr "Sciigoj"
+msgid "_Lock Screen Notifications"
+msgstr ""
 
-#: ../panels/notifications/edit-dialog.ui.h:9
-#, fuzzy
+#: ../panels/notifications/edit-dialog.ui.h:10
 #| msgctxt "notifications"
 #| msgid "Show Details in Lock Screen"
 msgctxt "notifications"
-msgid "Show Message Content on Lock Screen"
-msgstr "Montri detalojn en ŝlosa ekrano"
+msgid "Show Message C_ontent on Lock Screen"
+msgstr "Motri mesaĝan t_ekston en ŝlosa ekrano"
 
-#: ../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
+#, fuzzy
+#| msgid "Notifications"
+msgid "No­ti­fi­ca­tions"
 msgstr "Sciigoj"
 
-#: ../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 "Regi kiuj sciigoj montritos kaj kio ili montros"
 
 #. 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 "Sciigoj;Mesaĝo;Pleto;Ŝprucfenestra;"
 
 #: ../panels/notifications/notifications.ui.h:1
-msgid "Notification Banners"
-msgstr ""
+#, fuzzy
+#| msgid "Notifications"
+msgid "Notification _Popups"
+msgstr "Sciigoj"
 
 #: ../panels/notifications/notifications.ui.h:2
-msgid "Lock Screen Notifications"
-msgstr ""
+#, fuzzy
+#| msgctxt "notifications"
+#| msgid "Notifications"
+msgid "_Lock Screen Notifications"
+msgstr "Sciigoj"
 
 #. 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:1781
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
+#: ../panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Alia"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:290
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "Aldoni konton"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:329
-msgid "Mail"
-msgstr "Retpoŝto"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:335
-msgid "Contacts"
-msgstr "Kontaktaro"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:341
-msgid "Chat"
-msgstr "Retbabilado"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:347
-msgid "Resources"
-msgstr "Risurcoj"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "Eraro dum ensalutado"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "Ensalutiloj senvalidiĝis."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-#, fuzzy
-msgid "Sign in to enable this account."
-msgstr "Aliĝi por enŝalti tiun konton."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "En_saluti"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
-msgid "Error creating account"
-msgstr "Eraro dum kreado de konto"
+#. 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 konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "Eraro dum forigado de konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "Are you sure you want to remove the account?"
-msgstr "Ĉu vi certe volas forigi la konton?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
-msgid "This will not remove the account on the server."
-msgstr "Tio ne forigos la konton ĉe la servilo."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
-msgid "_Remove"
-msgstr "Fo_rigi"
+#. 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 ""
 
-#: ../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 "Interretaj kontoj"
 
-#: ../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 "Konekti al viajn interretajn kontojn kaj elekti kiel uzi ilin"
 
 #. 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
 #, fuzzy
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
@@ -3712,38 +3971,41 @@ msgstr ""
 "Guglo;Vizaĵlibro;Tvitero;Jahuo;Reto;Konektite;Retbabilejo;Kalendaro;Retpoŝto;"
 "Kontaktoj;ownCloud;Kerberos;IMAP;SMTP;"
 
+#. 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 "Neniuj retkontoj estas agorditaj"
+#: ../panels/printers/printers.ui.h:4
+msgid "Undo"
+msgstr ""
+
+#: ../panels/online-accounts/online-accounts.ui.h:2
+msgid "Connect to your data in the cloud"
+msgstr ""
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
-msgid "Remove Account"
-msgstr "Forigi konton"
+msgid "No internet connection — connect to set up new online accounts"
+msgstr ""
 
 #: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "Aldoni retkonton"
+#| msgid "Add an online account"
+msgid "Add an account"
+msgstr "Aldoni konton"
 
 #: ../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 ""
-"Aldoninte konton, permesas al viaj aplikaĵoj atingi dokumentojn, retpoŝton, "
-"kontaktojn, kalendaro, retbabiladon kaj plu."
+msgid "Remove Account"
+msgstr "Forigi konton"
 
-#: ../panels/power/cc-power-panel.c:192
+#: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "Nekonata tempo"
 
-#: ../panels/power/cc-power-panel.c:198
+#: ../panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutoj"
 
-#: ../panels/power/cc-power-panel.c:210
+#: ../panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3752,611 +4014,537 @@ msgstr[1] "%i horoj"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:218
+#: ../panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:219
+#: ../panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horo"
 msgstr[1] "horoj"
 
-#: ../panels/power/cc-power-panel.c:220
+#: ../panels/power/cc-power-panel.c:281
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutoj"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:239
+#: ../panels/power/cc-power-panel.c:300
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s ĝis tute ŝarĝita"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:246
+#: ../panels/power/cc-power-panel.c:307
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "Singardo: %s restanta"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:251
+#: ../panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "%s restanta"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:256 ../panels/power/cc-power-panel.c:284
+#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "Plene ŝargita"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:260 ../panels/power/cc-power-panel.c:288
+#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
 msgid "Empty"
 msgstr "Malplene"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275
+#: ../panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "Ŝargante"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:280
+#: ../panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "Malŝargante"
 
-#: ../panels/power/cc-power-panel.c:405
+#: ../panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Ĉefa"
 
-#: ../panels/power/cc-power-panel.c:407
+#: ../panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:479
+#: ../panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "Sendrata muso"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:482
+#: ../panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "Sendrata klavaro"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:485
+#: ../panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "Daŭra kurentprovizo"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "Persona cifereca asistanto"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:491
+#: ../panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "Poŝtelefono"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:494
+#: ../panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "Plurmedioludilo"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "Tabulkomputilo"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:500
+#: ../panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "Komputilo"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:503 ../panels/power/cc-power-panel.c:734
-#: ../panels/power/cc-power-panel.c:2055
+#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "Akumulatoro"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:557
+#: ../panels/power/cc-power-panel.c:615
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Ŝargante"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:622
 #, fuzzy
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Averto"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:569
+#: ../panels/power/cc-power-panel.c:627
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Malalte"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:574
+#: ../panels/power/cc-power-panel.c:632
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Bone"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:637
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Plene ŝargita"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:583
+#: ../panels/power/cc-power-panel.c:641
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Malplene"
 
-#: ../panels/power/cc-power-panel.c:732
+#: ../panels/power/cc-power-panel.c:799
 msgid "Batteries"
 msgstr "Baterioj"
 
-#: ../panels/power/cc-power-panel.c:1134
+#: ../panels/power/cc-power-panel.c:1227
 msgid "When _idle"
 msgstr "Dum _senokupo"
 
-#: ../panels/power/cc-power-panel.c:1463
+#: ../panels/power/cc-power-panel.c:1681
 msgid "Power Saving"
 msgstr "Energŝparo"
 
-#: ../panels/power/cc-power-panel.c:1498
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "_Ekrana brileco"
 
-#: ../panels/power/cc-power-panel.c:1504
+#: ../panels/power/cc-power-panel.c:1731
+#, fuzzy
+#| msgid "Automatic Routes"
+msgid "Automatic brightness"
+msgstr "Aŭtomataj kursoj"
+
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "_Klavara brileco"
 
-#: ../panels/power/cc-power-panel.c:1514
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "_Malheligi ekranon kiam neaktiva"
 
-#: ../panels/power/cc-power-panel.c:1539
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "_Malplena ekrano"
 
-#: ../panels/power/cc-power-panel.c:1576
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Vifio"
 
-#: ../panels/power/cc-power-panel.c:1581
-msgid "Wireless devices require extra power"
-msgstr "Sendrataj aparatoj bezonas kroman energion"
+#: ../panels/power/cc-power-panel.c:1828
+msgid "Turn off Wi-Fi to save power."
+msgstr ""
 
-#: ../panels/power/cc-power-panel.c:1606
+#: ../panels/power/cc-power-panel.c:1853
 #, fuzzy
 msgid "_Mobile broadband"
 msgstr "_Poŝlarĝkapacita"
 
-#: ../panels/power/cc-power-panel.c:1611
+#: ../panels/power/cc-power-panel.c:1858
 #, fuzzy
 #| msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
-msgid "Mobile broadband (3G, 4G, WiMax, etc.) devices require extra power"
-msgstr "Elŝaltas porteblajn larĝkapacitajn (3G, 4G, WiMax, k.t.p) aparatojn"
+msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
+msgstr "Elŝaltas porteblajn larĝkapacitajn (3G, 4G, WiMax, k.t.p) aparatojn."
 
-#: ../panels/power/cc-power-panel.c:1661
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "_Bludento"
 
-#: ../panels/power/cc-power-panel.c:1715
+#: ../panels/power/cc-power-panel.c:1966
 #, fuzzy
 msgid "When on battery power"
 msgstr "Dum akumulatora energio"
 
-#: ../panels/power/cc-power-panel.c:1717
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "Kiam konektita"
 
-#: ../panels/power/cc-power-panel.c:1847
-msgid "Suspend & Power Off"
+#: ../panels/power/cc-power-panel.c:2063
+#, fuzzy
+#| msgid "Don't suspend"
+msgid "Suspend"
+msgstr "Ne paŭzigi"
+
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "Elŝalti"
+
+#: ../panels/power/cc-power-panel.c:2065
+msgid "Hibernate"
+msgstr "Pasivumigi"
+
+#: ../panels/power/cc-power-panel.c:2066
+#, fuzzy
+#| msgid "Do nothing"
+msgid "Nothing"
+msgstr "Nenio"
+
+#. Frame header
+#: ../panels/power/cc-power-panel.c:2180
+#, fuzzy
+#| msgid "Suspend & Power Off"
+msgid "Suspend & Power Button"
 msgstr "Prokrasti & Kurentelŝalti"
 
-#: ../panels/power/cc-power-panel.c:1887
+#: ../panels/power/cc-power-panel.c:2219
 #, fuzzy
 msgid "_Automatic suspend"
 msgstr "_Aŭtomata interrompo"
 
-#: ../panels/power/cc-power-panel.c:1911
+#: ../panels/power/cc-power-panel.c:2220
 #, fuzzy
-msgid "When battery power is _critical"
-msgstr "Kiam kurento estas _kritike malalta"
+msgid "Automatic suspend"
+msgstr "Aŭtomata interrompo"
 
-#: ../panels/power/cc-power-panel.c:1966
-msgid "Power Off"
-msgstr "Elŝalti"
+#: ../panels/power/cc-power-panel.c:2287
+msgid "_When the Power Button is pressed"
+msgstr ""
 
-#: ../panels/power/cc-power-panel.c:2109
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
+#: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Aparatoj"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
-msgstr "Energio"
-
+#. 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 ""
+
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "Montri vian baterian staton kaj elekti energiŝparajn funkciojn"
 
 #. 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 ""
 "Kurento;Dormeti;Prokrasti;Pasivumigi;Baterio;Brileco;Malheligi;Malplena;"
 "Ekrano;DPMS;Senokupo;"
 
-#: ../panels/power/power.ui.h:1
-msgid "Hibernate"
-msgstr "Pasivumigi"
-
-#: ../panels/power/power.ui.h:2
-msgid "Power off"
-msgstr "Elŝalti"
-
-#: ../panels/power/power.ui.h:5
+#: ../panels/power/power.ui.h:3
 msgid "45 minutes"
 msgstr "45 minutoj"
 
-#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
+#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 horo"
 
-#: ../panels/power/power.ui.h:7
+#: ../panels/power/power.ui.h:5
 msgid "80 minutes"
 msgstr "80 minutoj"
 
-#: ../panels/power/power.ui.h:8
+#: ../panels/power/power.ui.h:6
 msgid "90 minutes"
 msgstr "90 minutoj"
 
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:7
 msgid "100 minutes"
 msgstr "100 minutoj"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:8
 msgid "2 hours"
 msgstr "2 horoj"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 minutoj"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
 msgid "3 minutes"
 msgstr "3 minutoj"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:12
 msgid "4 minutes"
 msgstr "4 minutoj"
 
-#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
 msgid "5 minutes"
 msgstr "5 minutoj"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:14
 msgid "8 minutes"
 msgstr "8 minutoj"
 
-#: ../panels/power/power.ui.h:17
+#: ../panels/power/power.ui.h:15
 msgid "10 minutes"
 msgstr "10 minutoj"
 
-#: ../panels/power/power.ui.h:18
+#: ../panels/power/power.ui.h:16
 msgid "12 minutes"
 msgstr "12 minutoj"
 
-#: ../panels/power/power.ui.h:20
+#: ../panels/power/power.ui.h:18
 #, fuzzy
 msgid "Automatic Suspend"
 msgstr "Aŭtomate"
 
-#: ../panels/power/power.ui.h:21
+#: ../panels/power/power.ui.h:19
 msgid "_Plugged In"
 msgstr "_Konektite"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:20
 msgid "On _Battery Power"
 msgstr "Dum _akumulatora energio"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
 msgid "Delay"
 msgstr "Prokrasto"
 
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "Aŭtentigi"
 
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "Password"
-msgstr "Pasvorto"
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Uzantonomo"
 
 #: ../panels/printers/authentication-dialog.ui.h:6
+#: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "Aŭtentokontrolo estas bezonata"
 
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:588
-msgid "Low on toner"
-msgstr "Malmulte da inko"
-
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:590
-msgid "Out of toner"
-msgstr "Inko finita"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:593
-msgid "Low on developer"
-msgstr "Malmulte da fotokreilkemiaĵo"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:596
-msgid "Out of developer"
-msgstr "Fotokreilkemiaĵo finita"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:598
-msgid "Low on a marker supply"
-msgstr "Malmulta inkpulvora provizo"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:600
-msgid "Out of a marker supply"
-msgstr "Inkpulvora provizo finita"
-
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:602
-msgid "Open cover"
-msgstr "Malfermi kovrilon"
-
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:604
-msgid "Open door"
-msgstr "Malfermita pordo"
-
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:606
-msgid "Low on paper"
-msgstr "Malmulte da papero"
-
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:608
-msgid "Out of paper"
-msgstr "Papero finita"
-
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:610
-msgctxt "printer state"
-msgid "Offline"
-msgstr "Nekonektite"
-
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:612
-#: ../panels/printers/cc-printers-panel.c:803
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Haltigite"
-
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:614
-msgid "Waste receptacle almost full"
-msgstr "Forĵetaĵulo preskaŭ plena"
-
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:616
-msgid "Waste receptacle full"
-msgstr "Forĵetaĵujo plena"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:618
-msgid "The optical photo conductor is near end of life"
-msgstr "La optika fotokonduktilo apudas al fino de vivo"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:620
-msgid "The optical photo conductor is no longer functioning"
-msgstr "La optika fotokonduktilo ne plu funkcias"
-
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:730
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "Agordante"
-
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Ready"
-msgstr "Prete"
-
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:794
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "Ne akceptas taskojn"
-
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:799
-msgctxt "printer state"
-msgid "Processing"
-msgstr "Traktado"
-
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:919
-msgid "Toner Level"
-msgstr "Nivelo de inkopulvoro"
-
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:922
-msgid "Ink Level"
-msgstr "Nivelo de inko"
-
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:925
-msgid "Supply Level"
-msgstr "Proviza nivelo"
-
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:943
-msgctxt "printer state"
-msgid "Installing"
-msgstr "Instalante"
-
-#. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1119
-msgid "No printers available"
-msgstr "Neniu presilo disponebla"
-
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1429
+#. 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 aktiva"
-msgstr[1] "%u aktivaj"
+msgid "Printer “%s” has been deleted"
+msgstr ""
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1770
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "Aldono de nova presilo malsukcesis."
 
-#: ../panels/printers/cc-printers-panel.c:1937
-msgid "Select PPD File"
-msgstr "Elekti PPD-dosieron"
+#. 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 "Ne eblas ŝargi uzantointerfacon: %s"
 
-#: ../panels/printers/cc-printers-panel.c:1946
-msgid ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
-msgstr ""
-"PostScript presilopriskribaj dosieroj (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
-"*.PPD.GZ)"
+#: ../panels/printers/details-dialog.ui.h:2
+#: ../panels/printers/printer-entry.ui.h:8
+msgid "Location"
+msgstr "Loko"
 
-#: ../panels/printers/cc-printers-panel.c:2253
-msgid "No suitable driver found"
-msgstr "Neniu taŭga pelilon trovita"
+#. 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 "Pelilo"
 
-#: ../panels/printers/cc-printers-panel.c:2324
+#: ../panels/printers/details-dialog.ui.h:5
 msgid "Searching for preferred drivers…"
 msgstr "Serĉante por preferitaj pelilojn…"
 
-#: ../panels/printers/cc-printers-panel.c:2345
-msgid "Select from database…"
+#: ../panels/printers/details-dialog.ui.h:6
+#, fuzzy
+#| msgid "Search for a city"
+msgid "Search for Drivers"
+msgstr "Serĉi urbon"
+
+#: ../panels/printers/details-dialog.ui.h:7
+#, fuzzy
+#| msgid "Select from database…"
+msgid "Select from Database…"
 msgstr "Elekti el datumbazo…"
 
-#: ../panels/printers/cc-printers-panel.c:2354
-msgid "Provide PPD File…"
+#: ../panels/printers/details-dialog.ui.h:8
+#, fuzzy
+#| msgid "Provide PPD File…"
+msgid "Install PPD File…"
 msgstr "Provizi PPD-dosieron…"
 
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2505
-#: ../panels/printers/cc-printers-panel.c:2528
-msgid "Test page"
-msgstr "Testpaĝo"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2942
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "Ne eblas ŝargi uzantointerfacon: %s"
-
-#: ../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
+#, fuzzy
+#| msgid "Printers"
+msgid "Prin­ters"
 msgstr "Presiloj"
 
-#: ../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 "Aldoni presilojn, montri presajn taskojn kaj regi kiel vi volas presi"
 
 #. 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 "Presilo;Atendovico;Presi;Papero;Inko;Inkopulvoro;"
 
-#. Translators: This dialog contains list of active print jobs of the selected printer
+#. Translators: this action removes (purges) all the listed jobs from the list.
 #: ../panels/printers/jobs-dialog.ui.h:2
-msgid "Active Jobs"
-msgstr "Aktivaj taskoj"
-
-#: ../panels/printers/jobs-dialog.ui.h:3
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Close"
-msgstr "Fermi"
+msgid "Clear All"
+msgstr ""
 
+#. Translators: this label describes the dialog empty state, with no jobs listed.
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Resume Printing"
-msgstr "Daŭrigi preson"
+#| msgid "%s Active Jobs"
+msgid "No Active Printer Jobs"
+msgstr "Neniu aktiva presila tasko"
 
-#: ../panels/printers/jobs-dialog.ui.h:5
-msgid "Pause Printing"
-msgstr "Paŭzigi presadon"
-
-#: ../panels/printers/jobs-dialog.ui.h:6
-msgid "Cancel Print Job"
-msgstr "Nuligi prestaskon"
-
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "Aldoni novan presilon"
+#. 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 "Aldoni presilon"
 
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "_Aŭtentigi"
+#. Translators: This buttons submits the credentials for the selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:6
+#| msgid "Unlock"
+msgid "_Unlock"
+msgstr "_Malŝlosi"
 
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "Detektis neniun presilon."
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+#, fuzzy
+#| msgid "No Pictures Found"
+msgid "No Printers Found"
+msgstr "Neniuj bildoj trovita"
 
 #. 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 "Entajpu retadreson aŭ serĉi presilon"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "Ŝarĝante opciojn…"
+#: ../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 ""
+"Enigu uzantonomon kaj pasvorton por vidi presilojn je presilaj serviloj."
+
+#. 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 "Testpaĝo"
+
+#. 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 detaloj"
+
+#: ../panels/printers/pp-details-dialog.c:172
+msgid "No suitable driver found"
+msgstr "Neniu taŭga pelilon trovita"
+
+#: ../panels/printers/pp-details-dialog.c:316
+msgid "Select PPD File"
+msgstr "Elekti PPD-dosieron"
+
+#: ../panels/printers/pp-details-dialog.c:325
+msgid ""
+"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
+"PPD.GZ)"
+msgstr ""
+"PostScript presilopriskribaj dosieroj (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
+"*.PPD.GZ)"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
 msgstr "Elekti presil-pelilon"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:3
+#: ../panels/user-accounts/um-photo-dialog.c:96
+msgid "Select"
+msgstr "Elekti"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
-msgstr "Ŝarĝante pelilan datumbazon..."
+#| msgid "Loading drivers database..."
+msgid "Loading drivers database…"
+msgstr "Ŝarĝante pelilan datumbazon…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:506
+#: ../panels/printers/pp-host.c:539
 #, fuzzy
 #| msgid "Remove Printer"
 msgid "JetDirect Printer"
 msgstr "Forigi presilon"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:756
+#: ../panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD-presilo"
 
@@ -4401,184 +4589,200 @@ msgid "Reverse portrait"
 msgstr "Inversa portreto"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:142
+#: ../panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "Atendante"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:146
+#: ../panels/printers/pp-jobs-dialog.c:108
 #, fuzzy
+#| msgid "Last used"
 msgctxt "print job"
-msgid "Held"
-msgstr "Paŭzigita"
+msgid "Paused"
+msgstr "Laste uzita"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:150
+#: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "Traktado"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:154
+#: ../panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Haltigite"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:158
+#: ../panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Nuligite"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:162
+#: ../panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Rompite"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:166
+#: ../panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "Plenumite"
 
-#. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:288
-msgid "Job Title"
-msgstr "Tasktitolo"
-
-#. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:297
-msgid "Job State"
-msgstr "Taskstato"
+#. Translators: This is the printer name for which we are showing the active jobs
+#: ../panels/printers/pp-jobs-dialog.c:310
+#, fuzzy, c-format
+#| msgid "%s Active Jobs"
+msgctxt "Printer jobs dialog title"
+msgid "%s — Active Jobs"
+msgstr "%s Aktivaj taskoj"
 
-#. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:303
-msgid "Time"
-msgstr "Horo"
+#: ../panels/printers/pp-new-printer-dialog.c:402
+#, fuzzy
+#| msgid "Select Printer Driver"
+msgid "Unlock Print Server"
+msgstr "Elekti presil-pelilon"
 
-#: ../panels/printers/pp-jobs-dialog.c:451
+#. 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 "%s Active Jobs"
-msgstr "%s Aktivaj taskoj"
+#| msgid "Unlock"
+msgid "Unlock %s."
+msgstr "Malŝlosi %s."
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-new-printer-dialog.c:411
+#, fuzzy, 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 ""
+"Entajpu vian uzantonomon kaj pasvorton por vidi disponeblajn presilojn je %s."
+
+#: ../panels/printers/pp-new-printer-dialog.c:876
+#, fuzzy
+#| msgid "Not searching for networks"
+msgid "Searching for Printers"
+msgstr "Ne serĉanta por retoj"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1620
+#: ../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:1625
+#: ../panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "Seria konektejo"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1632
+#: ../panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "Paralela konektejo"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1688
+#: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "Loko: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1693
+#: ../panels/printers/pp-new-printer-dialog.c:1858
 #, c-format
 msgid "Address: %s"
 msgstr "Adreso: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1717
+#: ../panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "Servilo necesas aŭtentigon"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Duflanka"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Tipo de papero"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Papera fonto"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Eliga pleto"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript-antaŭfiltrado"
 
 #. 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 "Paĝoj po flanko"
 
 #. 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 "Duflanka"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "Orientiĝo"
-
 #. 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 "Ĝenerale"
 
 #. 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 "Paĝ-agordo"
 
 #. 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
 #, fuzzy
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Presilagordoj"
 
 #. 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 "Tasko"
 
 #. 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 "Bild-kvalito"
 
 #. 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 "Koloro"
 
 #. 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 "Finigante"
 
 #. 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 "Altnivele"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Testpaĝo"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4620,160 +4824,305 @@ msgstr "Neniu antaŭfiltrado"
 msgid "Manufacturer"
 msgstr "Produktinto"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Pelilo"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:577
+#, fuzzy
+#| msgid "Active Jobs"
+msgid "No Active Jobs"
+msgstr "Aktivaj taskoj"
 
-#. 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 ""
-"Entajpu vian uzantonomon kaj pasvorton por vidi disponeblajn presilojn je %s."
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "Aldoni presilon"
+#. Translators: The printer is low on toner
+#: ../panels/printers/pp-printer-entry.c:730
+msgid "Low on toner"
+msgstr "Malmulte da inko"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "Forigi presilon"
+#. Translators: The printer has no toner left
+#: ../panels/printers/pp-printer-entry.c:732
+msgid "Out of toner"
+msgstr "Inko finita"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "Provizo"
+#. 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 "Malmulte da fotokreilkemiaĵo"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "Loko"
+#. 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 "Fotokreilkemiaĵo finita"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "_Defaŭlta presilo"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:740
+msgid "Low on a marker supply"
+msgstr "Malmulta inkpulvora provizo"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "Taskoj"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:742
+msgid "Out of a marker supply"
+msgstr "Inkpulvora provizo finita"
 
-#. Translators: Opens a dialog containing printer's jobs
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "Montri _taskojn"
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/pp-printer-entry.c:744
+msgid "Open cover"
+msgstr "Malfermi kovrilon"
 
-#: ../panels/printers/printers.ui.h:12
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/pp-printer-entry.c:746
+msgid "Open door"
+msgstr "Malfermita pordo"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/pp-printer-entry.c:748
+msgid "Low on paper"
+msgstr "Malmulte da papero"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/pp-printer-entry.c:750
+msgid "Out of paper"
+msgstr "Papero finita"
+
+#. Translators: The printer is offline
+#: ../panels/printers/pp-printer-entry.c:752
+msgctxt "printer state"
+msgid "Offline"
+msgstr "Nekonektite"
+
+#. 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 "Haltigite"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/pp-printer-entry.c:756
+msgid "Waste receptacle almost full"
+msgstr "Forĵetaĵulo preskaŭ plena"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/pp-printer-entry.c:758
+msgid "Waste receptacle full"
+msgstr "Forĵetaĵujo plena"
+
+#. 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 "La optika fotokonduktilo apudas al fino de vivo"
+
+#. 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 "La optika fotokonduktilo ne plu funkcias"
+
+#. Translators: Printer's state (can start new job without waiting)
+#: ../panels/printers/pp-printer-entry.c:870
+msgctxt "printer state"
+msgid "Ready"
+msgstr "Prete"
+
+#. 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 "Ne akceptas taskojn"
+
+#. Translators: Printer's state (jobs are processing)
+#: ../panels/printers/pp-printer-entry.c:880
+msgctxt "printer state"
+msgid "Processing"
+msgstr "Traktado"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+#, fuzzy
+#| msgid "Change printer settings"
+msgid "Clean print heads"
+msgstr "Ŝanĝi presilagordojn"
+
+#: ../panels/printers/printer-entry.ui.h:1
+#, fuzzy
+#| msgid "Login Options"
+msgid "Printing Options"
+msgstr "Ensalutagordoj"
+
+#: ../panels/printers/printer-entry.ui.h:2
+#, fuzzy
+#| msgid "Printer Default"
+msgid "Printer Details"
+msgstr "Presila defaŭlto"
+
+#: ../panels/printers/printer-entry.ui.h:3
+#, fuzzy
+#| msgid "Printer Default"
+msgid "Use Printer by Default"
+msgstr "Presila defaŭlto"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:5
+#, fuzzy
+#| msgid "Cancel Print Job"
+msgid "Clean Print Heads"
+msgstr "Nuligi prestaskon"
+
+#: ../panels/printers/printer-entry.ui.h:6
+msgid "Remove Printer"
+msgstr "Forigi presilon"
+
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Model"
 msgstr "Modelo"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "etikedo"
+#: ../panels/printers/printer-entry.ui.h:9
+msgid "Ink Level"
+msgstr "Nivelo de inko"
 
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "Metante novan pelilon…"
+#. Translators: This is the message which follows the printer error.
+#: ../panels/printers/printer-entry.ui.h:11
+msgid "Please restart when the problem is resolved."
+msgstr ""
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "paĝo 3"
+#. Translators: This is the button which restarts the printer.
+#: ../panels/printers/printer-entry.ui.h:13
+#, fuzzy
+#| msgid "Restart Now"
+msgid "Restart"
+msgstr "Restarti nun"
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "Presi _testpaĝon"
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:2
+msgid "Add…"
+msgstr ""
 
-#. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:22
-msgid "_Options"
-msgstr "_Agordoj"
+#: ../panels/printers/printers.ui.h:5
+#, fuzzy
+#| msgid "Printers"
+msgid "No printers"
+msgstr "Presiloj"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
-msgid "Add New Printer"
-msgstr "Aldoni novan presilon"
+#: ../panels/printers/printers.ui.h:7
+#| msgid "Add Printer"
+msgid "Add a Printer…"
+msgstr "Aldoni presilon…"
 
 #. 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
+#, fuzzy
+#| 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 ""
 "Pardonu! Ŝajnas, ke la sistema\n"
 "presilservo ne disponeblas."
 
-#: ../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 "Ekrana ŝloso"
 
-#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:438
+msgid "In use"
+msgstr ""
+
+#: ../panels/privacy/cc-privacy-panel.c:443
+#, fuzzy
+#| msgid "On"
+msgctxt "Location services status"
+msgid "On"
+msgstr "Malaktiva"
+
+#: ../panels/privacy/cc-privacy-panel.c:444
+#, fuzzy
+#| msgid "Off"
+msgctxt "Location services status"
+msgid "Off"
+msgstr "Neaktiva"
+
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#| msgid "_Location name:"
+msgid "Location Services"
+msgstr "Lokado-servoj"
+
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "Uzado kaj historio"
 
-#: ../panels/privacy/cc-privacy-panel.c:587
+#: ../panels/privacy/cc-privacy-panel.c:1071
 msgid "Empty all items from Trash?"
-msgstr "Vakigi ĉiujn erojn de la rubejo?"
+msgstr "Vakigi ĉiujn erojn de la rubujo?"
 
-#: ../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 "Ĉiuj eroj en la rubejo forigitos permanente."
+msgstr "Ĉiuj eroj en la rubujo forigitos permanente."
 
-#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1073
 msgid "_Empty Trash"
-msgstr "_Malplenigi rubejon"
+msgstr "_Malplenigi rubujon"
 
-#: ../panels/privacy/cc-privacy-panel.c:612
+#: ../panels/privacy/cc-privacy-panel.c:1096
 msgid "Delete all the temporary files?"
 msgstr "Forigi ĉiujn provizorajn dosierojn?"
 
-#: ../panels/privacy/cc-privacy-panel.c:613
+#: ../panels/privacy/cc-privacy-panel.c:1097
 msgid "All the temporary files will be permanently deleted."
 msgstr "Ĉiuj provizoraj dosieroj forigitos permanente."
 
-#: ../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 "_Forigi provizorajn dosierojn"
 
-#: ../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 "Vakigi rubejon kaj provizorajn dosierojn"
+msgstr "Vakigi rubujon kaj provizorajn dosierojn"
 
-#: ../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 "Uzado de programaro"
 
-#: ../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 "Problemraportado"
 
 #. 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 "
 "anonymously and are scrubbed of personal data."
 msgstr ""
 
-#: ../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 "Privateca politiko"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
-msgstr "Privateco"
-
+#. 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 ""
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr "Protekti viajn personan informon kaj regi kion aliaj povas vidi"
 
 #. 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 "ekrano;ŝlosi;seruro;provizora;rubejo;"
+msgstr "ekrano;ŝlosi;seruro;provizora;rubujo;"
 
 #: ../panels/privacy/privacy.ui.h:1
 msgid "Screen Turns Off"
@@ -4864,12 +5213,12 @@ msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr ""
-"Aŭtomate vakigi la rubejon kaj provizorajn dosierojn por helpi forigi "
+"Aŭtomate vakigi la rubujon kaj provizorajn dosierojn por helpi forigi "
 "nebezonitan konfidencan informon de via komputilo."
 
 #: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
-msgstr "Aŭtomate malplenigi _rubejon"
+msgstr "Aŭtomate malplenigi _rubujon"
 
 #: ../panels/privacy/privacy.ui.h:32
 msgid "Automatically purge Temporary _Files"
@@ -4879,6 +5228,17 @@ msgstr "Aŭtomate forigi provizorajn _dosierojn"
 msgid "Purge _After"
 msgstr "Vakigi _post"
 
+#: ../panels/privacy/privacy.ui.h:34
+#| msgid "_Empty Trash"
+msgid "_Empty Trash…"
+msgstr "_Malplenigi rubujon…"
+
+#: ../panels/privacy/privacy.ui.h:35
+#, fuzzy
+#| msgid "_Purge Temporary Files"
+msgid "_Purge Temporary Files…"
+msgstr "_Forigi provizorajn dosierojn…"
+
 #: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
@@ -4893,62 +5253,55 @@ msgstr ""
 msgid "_Send software usage statistics"
 msgstr "_Sendi statistikojn pri uzado de programaro"
 
-#: ../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 ""
+
+#: ../panels/privacy/privacy.ui.h:44
 #, fuzzy
 #| msgid "_Location name:"
 msgid "_Location Services"
 msgstr "_Lokado-servoj"
 
-#: ../panels/privacy/privacy.ui.h:43
-msgid "Used to determine your geographical location"
-msgstr "Uzita por determini vian geografian lokon"
-
-#: ../panels/privacy/privacy.ui.h:45
+#: ../panels/privacy/privacy.ui.h:47
 msgid "_Automatic Problem Reporting"
 msgstr "_Aŭtomata problemraportado"
 
-#: ../panels/region/cc-format-chooser.c:119
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperia"
 
-#: ../panels/region/cc-format-chooser.c:121
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metra"
 
-#: ../panels/region/cc-format-chooser.c:286
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "Neniuj regionoj trovitaj"
 
-#: ../panels/region/cc-input-chooser.c:180
+#: ../panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "Neniuj enigaj fontoj trovitaj"
 
-#: ../panels/region/cc-input-chooser.c:1085
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Alia"
 
-#: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1071
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "Via seanco devas restartiti por ŝanĝoj efektiviĝi"
-
-#: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1075
-msgid "Restart Now"
-msgstr "Restarti nun"
-
-#: ../panels/region/cc-region-panel.c:876
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "Neniu eniga fonto elektita"
 
-#: ../panels/region/cc-region-panel.c:1796
-msgid "Login Screen"
-msgstr "Ensaluta ekrano"
+#: ../panels/region/cc-region-panel.c:1773
+#| msgid "Login Screen"
+msgid "Login _Screen"
+msgstr "Ensaluta _ekrano"
 
-#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+#: ../panels/region/format-chooser.ui.h:1
 msgid "Formats"
 msgstr "Formoj"
 
@@ -4965,29 +5318,38 @@ msgid "Times"
 msgstr "Horoj"
 
 #: ../panels/region/format-chooser.ui.h:7
+#, fuzzy
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "Dato kaj horo"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "Numeroj"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "Mezuro"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "Papero"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. 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
+#, fuzzy
+#| msgid "Region & Language"
+msgid "Re­gion & Lan­guage"
 msgstr "Regiono kaj lingvo"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr ""
 "Elektu vian montran lingvon, formatojn, klavarfasonojn kaj enigajn fontojn"
 
 #. 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 "lingvo;klavarfasono;klavaro;eniga;fulmoklavojn;"
 
@@ -4996,136 +5358,145 @@ msgid "Add an Input Source"
 msgstr "Aldoni enigan fonton"
 
 #: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
+#, fuzzy
+#| msgid "Input methods can't be used on the login screen"
+msgid "Input methods can’t be used on the login screen"
 msgstr "Enigaj metodoj ne uzeblas ĉe ensaluta ekrano"
 
 #: ../panels/region/input-options.ui.h:1
 msgid "Input Source Options"
 msgstr "Enigaj fontaj agordoj"
 
-#: ../panels/region/input-options.ui.h:3
+#: ../panels/region/input-options.ui.h:2
 msgid "Use the _same source for all windows"
 msgstr "Uzi la _saman fonton por ĉiuj fenestroj"
 
-#: ../panels/region/input-options.ui.h:4
+#: ../panels/region/input-options.ui.h:3
 msgid "Allow _different sources for each window"
 msgstr "Uzi _malsamajn fontojn por ĉiu fenestro"
 
 #: ../panels/region/input-options.ui.h:5
-msgid "Keyboard Shortcuts"
-msgstr "Fulmoklavoj"
-
-#: ../panels/region/input-options.ui.h:6
 msgid "Switch to previous source"
 msgstr "Ŝanĝi al lasta fonto"
 
-#: ../panels/region/input-options.ui.h:7
+#: ../panels/region/input-options.ui.h:6
 msgid "Super+Shift+Space"
 msgstr "Super+Maj+Spaceto"
 
-#: ../panels/region/input-options.ui.h:8
+#: ../panels/region/input-options.ui.h:7
 msgid "Switch to next source"
 msgstr "Ŝanĝi al sekva fonto"
 
-#: ../panels/region/input-options.ui.h:9
+#: ../panels/region/input-options.ui.h:8
 msgid "Super+Space"
 msgstr "Super+Spaceto"
 
-#: ../panels/region/input-options.ui.h:10
+#: ../panels/region/input-options.ui.h:9
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr "Vi povas ŝanĝi ĉi tiujn fulmoklavojn en la klavaraj agordoj"
 
-#: ../panels/region/input-options.ui.h:11
+#: ../panels/region/input-options.ui.h:10
 msgid "Alternative switch to next source"
 msgstr "Alternativa ŝanĝo al sekva fonto"
 
-#: ../panels/region/input-options.ui.h:12
+#: ../panels/region/input-options.ui.h:11
 msgid "Left+Right Alt"
-msgstr "Ambaŭ \"Alt\" klavoj"
+msgstr "Maldekstra+Dekstra Alt"
+
+#: ../panels/region/region.ui.h:1
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+msgid "_Language"
+msgstr "_Lingvo"
 
 #: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "Angla (Unuiĝinta Reĝlando)"
 
+#: ../panels/region/region.ui.h:3
+#, fuzzy
+#| msgid "Your session needs to be restarted for changes to take effect"
+msgid "Restart the session for changes to take effect"
+msgstr "Via seanco devas restartiti por ŝanĝoj efektiviĝi"
+
 #: ../panels/region/region.ui.h:4
-msgid "United Kingdom"
-msgstr "Unuiĝinta Reĝlando"
+#| msgid "Restart Now"
+msgid "Restart…"
+msgstr "Restarti…"
+
+#: ../panels/region/region.ui.h:5
+#| msgid "Formats"
+msgid "_Formats"
+msgstr "_Formoj"
 
 #: ../panels/region/region.ui.h:6
-msgid "Options"
-msgstr "Agordoj"
+msgid "United Kingdom"
+msgstr "Unuiĝinta Reĝlando"
 
 #: ../panels/region/region.ui.h:7
+msgid "Input Sources"
+msgstr "Enigaj fontoj"
+
+#: ../panels/region/region.ui.h:8
+msgid "_Options"
+msgstr "_Agordoj"
+
+#: ../panels/region/region.ui.h:9
 #, fuzzy
 #| msgid "Add an Input Source"
 msgid "Add input source"
 msgstr "Aldoni enigan fonton"
 
-#: ../panels/region/region.ui.h:8
+#: ../panels/region/region.ui.h:10
 #, fuzzy
 #| msgid "No input sources found"
 msgid "Remove input source"
 msgstr "Neniuj enigaj fontoj trovitaj"
 
-#: ../panels/region/region.ui.h:9
+#: ../panels/region/region.ui.h:11
 #, fuzzy
 #| msgid "No input sources found"
 msgid "Move input source up"
 msgstr "Neniuj enigaj fontoj trovitaj"
 
-#: ../panels/region/region.ui.h:10
+#: ../panels/region/region.ui.h:12
 #, fuzzy
 #| msgid "No input sources found"
 msgid "Move input source down"
 msgstr "Neniuj enigaj fontoj trovitaj"
 
-#: ../panels/region/region.ui.h:11
+#: ../panels/region/region.ui.h:13
 #, fuzzy
 msgid "Configure input source"
 msgstr "Elektu aldonendan enigfonton"
 
-#: ../panels/region/region.ui.h:12
+#: ../panels/region/region.ui.h:14
 #, fuzzy
 #| msgid "No input source selected"
 msgid "Show input source keyboard layout"
 msgstr "Neniu eniga fonto elektita"
 
-#: ../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 "Ensalutaj agordoj uzatas de ĉiuj uzantoj kiam ensalutanta sistemen"
 
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Lokoj"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Legosignoj"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Alia"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Elekti lokon"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_Bone"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "Neniuj aplikaĵoj trovitaj"
 
-#: ../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 "Serĉo"
 
-#: ../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 ""
@@ -5133,7 +5504,7 @@ msgstr ""
 "Superrigardon"
 
 #. 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 "Serĉi;Trovi;Indeksi;Kaŝi;Privateco;Rezultoj;"
 
@@ -5141,6 +5512,27 @@ msgstr "Serĉi;Trovi;Indeksi;Kaŝi;Privateco;Rezultoj;"
 msgid "Search Locations"
 msgstr "Serĉaj lokoj"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+#, fuzzy
+#| msgctxt "Search Location"
+#| msgid "Places"
+msgid "Places"
+msgstr "Lokoj"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+#, fuzzy
+#| msgctxt "Search Location"
+#| msgid "Bookmarks"
+msgid "Bookmarks"
+msgstr "Legosignoj"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+#, fuzzy
+#| msgctxt "Online Account"
+#| msgid "Other"
+msgid "Other"
+msgstr "Alia"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "Movi supren"
@@ -5153,52 +5545,106 @@ msgstr "Movi malsupren"
 msgid "Preferences"
 msgstr "Agordoj"
 
-#: ../panels/sharing/cc-sharing-panel.c:272
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+#, fuzzy
+#| msgid "List of keyboard layouts selected for usage"
+msgid "No networks selected for sharing"
+msgstr "Listo de klavaraj aranĝoj elektitaj por la uzado"
+
+#: ../panels/sharing/cc-sharing-panel.c:266
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Aktiva"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:268
+#: ../panels/sharing/cc-sharing-panel.c:295
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Malaktiva"
 
-#: ../panels/sharing/cc-sharing-panel.c:304
+#: ../panels/sharing/cc-sharing-panel.c:298
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Enŝaltite"
 
-#: ../panels/sharing/cc-sharing-panel.c:307
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is active"
 msgid "Active"
 msgstr "Aktive"
 
-#: ../panels/sharing/cc-sharing-panel.c:488
+#: ../panels/sharing/cc-sharing-panel.c:372
 msgid "Choose a Folder"
 msgstr "Elektu dosierujon"
 
-#: ../panels/sharing/cc-sharing-panel.c:917
+#: ../panels/sharing/cc-sharing-panel.c:683
+#, 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 ""
+
+#: ../panels/sharing/cc-sharing-panel.c:685
+#, fuzzy, 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 ""
+"Permesi deforajn uzantojn konekti per sekurŝela komando:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:687
+#, fuzzy, 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 ""
+"Permesi deforajn uzantojn vidi aŭ kontroli vian ekrano per konekto al: <a "
+"href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:799
 msgid "Copy"
 msgstr "Kopii"
 
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1125
 msgid "Sharing"
 msgstr "Kunhavigo"
 
+#. 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
+#, fuzzy
+#| msgid "Sharing"
+msgid "Sha­ring"
+msgstr "Kunhavigo"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr "Regi kion vi volas kunhavigi kun aliaj"
 
 #. 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
+#, fuzzy
+#| msgid ""
+#| "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;"
+#| "video;pictures;photos;movies;server;renderer;"
 msgid ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
 msgstr ""
 "komunigi;komunigo;sekurŝelo;gastigo;nomo;fora;labortablo;bludento;obex;"
 "aŭdvideaĵoj;sono;video;bildoj;fotoj;kinofilmoj;servilo;bildigilo;"
 
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "Retoj"
+
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
 msgstr "Enŝalti aŭ elŝalti deforan ensaluton"
@@ -5208,125 +5654,95 @@ msgstr "Enŝalti aŭ elŝalti deforan ensaluton"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "Aŭtentigado necesas por instali plurekranajn agordojn por ĉiuj uzantoj"
 
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-#, fuzzy
-#| msgid "List of keyboard layouts selected for usage"
-msgid "No networks selected for sharing"
-msgstr "Listo de klavaraj aranĝoj elektitaj por la uzado"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "Retoj"
-
 #: ../panels/sharing/sharing.ui.h:1
-msgid "Bluetooth Sharing"
-msgstr "Bludenta komunigo"
+#| msgid "Computer Name"
+msgid "_Computer Name"
+msgstr "_Komputila nomo"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid ""
-"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
-"devices"
-msgstr ""
-"Bludenta komunigo permesas al vi komunigi dosierojn kun aliaj aparatoj "
-"Bludento-aktivaj"
+#| msgid "Personal File Sharing"
+msgid "_File Sharing"
+msgstr "_Dosiera kunhavigo"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Only Receive From Trusted Devices"
-msgstr "Nur ricevi el fidindaj aparatoj"
+#| msgid "Screen Sharing"
+msgid "_Screen Sharing"
+msgstr "_Ekrana kunhavigo"
 
 #: ../panels/sharing/sharing.ui.h:4
-msgid "Save Received Files to Downloads Folder"
-msgstr "Konservi ricevitajn dosierojn en la dosierujo de elŝutoj"
+#, fuzzy
+msgid "_Media Sharing"
+msgstr "_Plurmedioludilo"
 
 #: ../panels/sharing/sharing.ui.h:5
-msgid "Computer Name"
-msgstr "Komputila nomo"
+#| msgid "Remote Login"
+msgid "_Remote Login"
+msgstr "_Defora ensaluto"
 
 #: ../panels/sharing/sharing.ui.h:6
-msgid "Personal File Sharing"
-msgstr "Persona dosiera kunhavigo"
+msgid "Some services are disabled because of no network access."
+msgstr ""
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Screen Sharing"
-msgstr "Ekrana komunigo"
+#, fuzzy
+#| msgid "Sharing"
+msgid "File Sharing"
+msgstr "Kunhavigo"
 
 #: ../panels/sharing/sharing.ui.h:8
-#, fuzzy
-msgid "Media Sharing"
-msgstr "Plurmedioludilo"
+#| msgid "Require Password"
+msgid "_Require Password"
+msgstr "_Bezonas pasvorton"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Remote Login"
 msgstr "Defora ensaluto"
 
-#: ../panels/sharing/sharing.ui.h:10
-msgid "Some services are disabled because of no network access."
-msgstr ""
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Screen Sharing"
+msgstr "Ekrana komunigo"
 
 #: ../panels/sharing/sharing.ui.h:12
-#, 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>"
+msgid "_Allow connections to control the screen"
 msgstr ""
 
 #: ../panels/sharing/sharing.ui.h:13
-msgid "Require Password"
-msgstr "Bezonas pasvorton"
-
-#: ../panels/sharing/sharing.ui.h:16
-#, no-c-format
-msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"Permesi deforajn uzantojn konekti per sekurŝela komando:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-
-#: ../panels/sharing/sharing.ui.h:19
-#, no-c-format
-msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"Permesi deforajn uzantojn vidi aŭ kontroli vian ekrano per konekto al: <a "
-"href=\"vnc://%s\">vnc://%s</a>"
-
-#: ../panels/sharing/sharing.ui.h:20
 #, fuzzy
-msgid "Allow Remote Control"
-msgstr "Laŭtecregilo"
-
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Password:"
-msgstr "Pasvorto:"
+#| msgid "_Password"
+msgid "_Password:"
+msgstr "_Pasvorto:"
 
-#: ../panels/sharing/sharing.ui.h:22
-msgid "Show Password"
-msgstr "Montri pasvorton"
+#: ../panels/sharing/sharing.ui.h:14
+#| msgid "Show Password"
+msgid "_Show Password"
+msgstr "_Montri pasvorton"
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Access Options"
 msgstr "Aliro-agordoj"
 
-#: ../panels/sharing/sharing.ui.h:24
-msgid "New connections must ask for access"
+#: ../panels/sharing/sharing.ui.h:16
+#, fuzzy
+#| msgid "New connections must ask for access"
+msgid "_New connections must ask for access"
 msgstr "Novaj konektoj devas peti aliron"
 
-#: ../panels/sharing/sharing.ui.h:25
-msgid "Require a password"
+#: ../panels/sharing/sharing.ui.h:17
+#, fuzzy
+#| msgid "Require a password"
+msgid "_Require a password"
 msgstr "Bezonas pasvorton"
 
-#: ../panels/sharing/sharing.ui.h:26
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
+#: ../panels/sharing/sharing.ui.h:18
+#, fuzzy
+msgid "Media Sharing"
+msgstr "Plurmedioludilo"
+
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share music, photos and videos over the network."
 msgstr ""
 
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
 msgstr "Dosierujoj"
 
@@ -5427,7 +5843,7 @@ msgstr "_Profilo:"
 
 #. 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"
@@ -5436,14 +5852,14 @@ msgstr[1] "%u eligoj"
 
 #. 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 enigo"
 msgstr[1] "%u enigoj"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Sistemsonoj"
 
@@ -5455,11 +5871,6 @@ msgstr "_Testi laŭtparolilojn"
 msgid "Peak detect"
 msgstr "Detektado de sonpintoj"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "Nomo"
-
 #: ../panels/sound/gvc-mixer-dialog.c:1512
 msgid "Device"
 msgstr "Aparato"
@@ -5530,6 +5941,7 @@ msgid "Testing event sound"
 msgstr "Testanta soneventon"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "Default"
 msgstr "Defaŭlto"
 
@@ -5541,32 +5953,84 @@ msgstr "El etoso"
 msgid "C_hoose an alert sound:"
 msgstr "_Elekti avertsonon:"
 
-#: ../panels/sound/gvc-speaker-test.c:219
+#: ../panels/sound/gvc-speaker-test.c:231
 msgid "Stop"
 msgstr "Halti"
 
-#: ../panels/sound/gvc-speaker-test.c:219
-#: ../panels/sound/gvc-speaker-test.c:331
+#: ../panels/sound/gvc-speaker-test.c:231
+#: ../panels/sound/gvc-speaker-test.c:343
 msgid "Test"
 msgstr "Testo"
 
-#: ../panels/sound/gvc-speaker-test.c:227
+#: ../panels/sound/gvc-speaker-test.c:239
 msgid "Subwoofer"
 msgstr "Bas-laŭtparolilo"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "Propre"
 
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+#| msgid "Default"
+msgctxt "cursor size"
+msgid "Default"
+msgstr "Defaŭlte"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+#| msgctxt "Calibration quality"
+#| msgid "Medium"
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Meze"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Grande"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+#| msgctxt "universal access, text size"
+#| msgid "Larger"
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Pli granda"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "Plej grande"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+#| msgid "pixel"
+#| msgid_plural "pixels"
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d bildero"
+msgstr[1] "%d bilderoj"
+
+#. 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
+#, fuzzy
+#| msgid "Universal Access"
+msgid "Uni­ver­sal Access"
+msgstr "Alirebleco"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "Fari ĝin pli facila por vidi, aŭdi, tajpi, fingromontri kaj alklaki"
 
 #. 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;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
 
 #: ../panels/universal-access/uap.ui.h:1
@@ -5586,248 +6050,328 @@ msgid "_Large Text"
 msgstr "_Granda teksto"
 
 #: ../panels/universal-access/uap.ui.h:5
+#, fuzzy
+#| msgid "Cursor blink speed"
+msgid "C_ursor Size"
+msgstr "Rapido de kursora pulsado"
+
+#: ../panels/universal-access/uap.ui.h:6
+#: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
 msgid "Screen _Reader"
 msgstr "Ek_ranlegilo"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
 msgid "_Sound Keys"
 msgstr "_Son-klavoj"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Hearing"
 msgstr "Aŭdado"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
 msgid "_Visual Alerts"
 msgstr "_Videblaj avertoj"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Screen _Keyboard"
 msgstr "Ekran_klavaro"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
+#, fuzzy
+#| msgid "Repeat Keys"
+msgid "R_epeat Keys"
+msgstr "Ripetaj klavoj"
+
+#: ../panels/universal-access/uap.ui.h:15
+#, fuzzy
+#| msgid "Cursor Blinking"
+msgid "Cursor _Blinking"
+msgstr "Pulsanta kursoro"
+
+#: ../panels/universal-access/uap.ui.h:16
 #, fuzzy
 msgid "_Typing Assist (AccessX)"
 msgstr "_Tajpada asistanto (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:17
 #, fuzzy
 #| msgid "Pointing and Clicking"
 msgid "Pointing & Clicking"
 msgstr "Indiki-kaj-alklaki"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Mouse Keys"
 msgstr "_Musklavoj"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:19
 msgid "_Click Assist"
 msgstr "_Alklaka asisto"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:20
+#, fuzzy
+#| msgid "_Double-click"
+msgid "_Double-Click Delay"
+msgstr "_Duobla klako"
+
+#: ../panels/universal-access/uap.ui.h:21
+#, fuzzy
+#| msgid "Double-Click Timeout"
+msgid "Double-Click Delay"
+msgstr "Eltempiĝo de duobla alklako"
+
+#: ../panels/universal-access/uap.ui.h:22
+#, fuzzy
+#| msgid "Cursor blink speed"
+msgid "Cursor Size"
+msgstr "Rapido de kursora pulsado"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr ""
+
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Ekranlegilo"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:25
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "La ekranlegilo legas vidigan tekston, kiun vi fokusas."
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:26
 msgid "_Screen Reader"
 msgstr "_Ekranlegilo"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Sound Keys"
 msgstr "Son-klavoj"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:28
 #, fuzzy
-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 "Pepi kiam majuskla kaj nombra baskuloj estas uzataj."
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Visual Alerts"
 msgstr "Vidaj avertoj"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Test flash"
 msgstr "_Testi fulmadon"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:31
 #, fuzzy
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Uzi vidan indikon kiam averta sono okazas."
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:32
 #, fuzzy
 msgid "Flash the _window title"
 msgstr "Intermiti la _fenestran titolon"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:33
 #, fuzzy
 msgid "Flash the entire _screen"
 msgstr "Intermiti la tutan _ekranon"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:34
+msgid "Repeat Keys"
+msgstr "Ripetaj klavoj"
+
+#: ../panels/universal-access/uap.ui.h:35
+#| msgid "Key presses _repeat when key is held down"
+msgid "Key presses repeat when key is held down."
+msgstr "Klavpremoj ripetas kiam klavo estas tenata malsupre."
+
+#: ../panels/universal-access/uap.ui.h:37
+#, fuzzy
+#| msgid "Repeat keys speed"
+msgid "Repeat keys delay"
+msgstr "Ripetklava rapido"
+
+#: ../panels/universal-access/uap.ui.h:38
+msgid "Speed"
+msgstr "Rapido"
+
+#: ../panels/universal-access/uap.ui.h:39
+msgid "Repeat keys speed"
+msgstr "Ripetklava rapido"
+
+#: ../panels/universal-access/uap.ui.h:40
+msgid "Cursor Blinking"
+msgstr "Pulsanta kursoro"
+
+#: ../panels/universal-access/uap.ui.h:41
+#| msgid "Cursor _blinks in text fields"
+msgid "Cursor blinks in text fields."
+msgstr "Kursoraj pulsas en tekstkampo."
+
+#: ../panels/universal-access/uap.ui.h:42
+#, fuzzy
+#| msgid "Cursor blink speed"
+msgid "Cursor blinking speed"
+msgstr "Rapido de kursora pulsado"
+
+#: ../panels/universal-access/uap.ui.h:43
 #, fuzzy
 msgid "Typing Assist"
 msgstr "Tajpada asistanto"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:44
 msgid "_Sticky Keys"
 msgstr "Fik_saj klavoj"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Traktas sinsekvon de modifilaj klavoj kiel klavkombino"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:46
 msgid "_Disable if two keys are pressed together"
 msgstr "_Elŝalti se du klavoj estas kune premitaj"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:47
 #, fuzzy
 #| msgid "Beep when a _modifer key is pressed"
 msgid "Beep when a _modifier key is pressed"
 msgstr "Pepi kiam _modifilklavo estas premita"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:48
 #, fuzzy
 msgid "S_low Keys"
 msgstr "_Malrapidigaj klavoj"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Enigas prokraston inter klavpremo kaj ties akcepto"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:50
 msgid "A_cceptance delay:"
 msgstr "Antaŭak_cepta prokrasto:"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:51
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Mallonge"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Slow keys typing delay"
 msgstr ""
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:53
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Longe"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:54
 #, fuzzy
 msgid "Beep when a key is pr_essed"
 msgstr "Pepi kiam baskula klavo estas premi_ta"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:55
 #, fuzzy
 msgid "Beep when a key is _accepted"
 msgstr "Pepi kiam klavo estas _akceptita"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Beep when a key is _rejected"
 msgstr "Pepi kiam klavo estas malak_ceptita"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:57
 #, fuzzy
 msgid "_Bounce Keys"
 msgstr "_Prokrastaj klavoj"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignori rapidajn duoblajn klavpremojn"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:59
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Mallonge"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Bounce keys typing delay"
 msgstr ""
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:61
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Longe"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Enable by Keyboard"
 msgstr "_Ebligi per klavaro"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:63
 #, fuzzy
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Enŝalti trajtojn por universala aliro de la klavaro"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Click Assist"
 msgstr "Alklaka asisto"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:65
 #, fuzzy
 msgid "_Simulated Secondary Click"
 msgstr "_Simulita dua alklako"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Fari duan alklakon se la ĉefa butono estas premtenata"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:67
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Mallonge"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Secondary click delay"
 msgstr "Sekundaralklako prokrasto"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:69
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Longe"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:70
 #, fuzzy
 msgid "_Hover Click"
 msgstr "_Pertuŝa klako"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Trigger a click when the pointer hovers"
 msgstr "Fari alklakon kiam la musmovo haltas"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:72
 msgid "D_elay:"
 msgstr "_Prokrasto:"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Mallonge"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Longe"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Motion _threshold:"
 msgstr "_Mov-sojlo:"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:76
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Malgrande"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:77
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Grande"
@@ -5881,36 +6425,46 @@ msgstr "Dekstra duono"
 msgid "Zoom Options"
 msgstr "Zomagordoj"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
-msgid "Zoom"
-msgstr "Zomi"
-
 #: ../panels/universal-access/zoom-options.ui.h:8
-msgid "Magnification:"
+#, fuzzy
+#| msgid "Magnification:"
+msgid "_Magnification:"
 msgstr "Pligrandigo:"
 
 #: ../panels/universal-access/zoom-options.ui.h:9
-msgid "Follow mouse cursor"
+#, fuzzy
+#| msgid "Follow mouse cursor"
+msgid "_Follow mouse cursor"
 msgstr "Sekvi musmontrilon"
 
 #: ../panels/universal-access/zoom-options.ui.h:10
-msgid "Screen part:"
+#, fuzzy
+#| msgid "Screen part:"
+msgid "_Screen part:"
 msgstr "Ekrana parto:"
 
 #: ../panels/universal-access/zoom-options.ui.h:11
-msgid "Magnifier extends outside of screen"
+#, fuzzy
+#| msgid "Magnifier extends outside of screen"
+msgid "Magnifier _extends outside of screen"
 msgstr "Pligrandigilo foretendas el ekrano"
 
 #: ../panels/universal-access/zoom-options.ui.h:12
-msgid "Keep magnifier cursor centered"
+#, fuzzy
+#| msgid "Keep magnifier cursor centered"
+msgid "_Keep magnifier cursor centered"
 msgstr "Centrigi pligrandigilan kursoron kaj teni ĝin"
 
 #: ../panels/universal-access/zoom-options.ui.h:13
-msgid "Magnifier cursor pushes contents around"
+#, fuzzy
+#| msgid "Magnifier cursor pushes contents around"
+msgid "Magnifier cursor _pushes contents around"
 msgstr "Pligrandigila kursoro movas ĉirkaŭan enhavon"
 
 #: ../panels/universal-access/zoom-options.ui.h:14
-msgid "Magnifier cursor moves with contents"
+#, fuzzy
+#| msgid "Magnifier cursor moves with contents"
+msgid "Magnifier cursor moves with _contents"
 msgstr "Pligrandigila kursoro movas kune kun enhavo"
 
 #: ../panels/universal-access/zoom-options.ui.h:15
@@ -5922,7 +6476,9 @@ msgid "Magnifier"
 msgstr "Pligrandigilo"
 
 #: ../panels/universal-access/zoom-options.ui.h:17
-msgid "Thickness:"
+#, fuzzy
+#| msgid "Thickness:"
+msgid "_Thickness:"
 msgstr "Dikeco:"
 
 #: ../panels/universal-access/zoom-options.ui.h:18
@@ -5936,20 +6492,28 @@ msgid "Thick"
 msgstr "Dika"
 
 #: ../panels/universal-access/zoom-options.ui.h:20
-msgid "Length:"
+#, fuzzy
+#| msgid "Length:"
+msgid "_Length:"
 msgstr "Longo:"
 
 #. The color of the accessibility crosshair
 #: ../panels/universal-access/zoom-options.ui.h:22
-msgid "Color:"
+#, fuzzy
+#| msgid "Color:"
+msgid "Co_lor:"
 msgstr "Koloro:"
 
 #: ../panels/universal-access/zoom-options.ui.h:23
-msgid "Crosshairs:"
+#, fuzzy
+#| msgid "Crosshairs:"
+msgid "_Crosshairs:"
 msgstr "Retikuloj:"
 
 #: ../panels/universal-access/zoom-options.ui.h:24
-msgid "Overlaps mouse cursor"
+#, fuzzy
+#| msgid "Overlaps mouse cursor"
+msgid "_Overlaps mouse cursor"
 msgstr "Partekovras musmontrilon"
 
 #: ../panels/universal-access/zoom-options.ui.h:25
@@ -5957,22 +6521,28 @@ msgid "Crosshairs"
 msgstr "Retikuloj"
 
 #: ../panels/universal-access/zoom-options.ui.h:26
-msgid "White on black:"
+#, fuzzy
+#| msgid "White on black:"
+msgid "_White on black:"
 msgstr "Blanka sur nigra:"
 
 #: ../panels/universal-access/zoom-options.ui.h:27
-msgid "Brightness:"
+#, fuzzy
+#| msgid "Brightness:"
+msgid "_Brightness:"
 msgstr "Brileco:"
 
 #: ../panels/universal-access/zoom-options.ui.h:28
-msgid "Contrast:"
+#, fuzzy
+#| msgid "Contrast:"
+msgid "_Contrast:"
 msgstr "Kontrasto:"
 
 #. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:30
 msgctxt "universal access, contrast"
-msgid "Color"
-msgstr "Koloro"
+msgid "Co_lor"
+msgstr ""
 
 #: ../panels/universal-access/zoom-options.ui.h:31
 msgctxt "universal access, color"
@@ -6013,93 +6583,78 @@ msgid "Color Effects"
 msgstr "Kolorefektoj"
 
 #: ../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"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Aldoni uzanton"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "_Tuta nomo"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#, fuzzy
+#| msgctxt "Account type"
+#| msgid "Standard"
 msgid "Standard"
 msgstr "Standarde"
 
-#: ../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"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#, fuzzy
+#| msgctxt "Account type"
+#| msgid "Administrator"
 msgid "Administrator"
 msgstr "Administranto"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "_Tuta nomo"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
 msgstr "Konto_tipo"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
 #, fuzzy
-msgid "Allow user to set a password when they next login"
+msgid "Allow user to set a password when they next _login"
 msgstr "Elekti pasvorton dum sekva ensaluto"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Set a password now"
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#, fuzzy
+#| msgid "Set a password now"
+msgid "Set a password _now"
 msgstr "Agordi pasvorton nun"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "_Kontroli"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#| msgid "_Configure..."
+msgid "_Confirm"
+msgstr ""
 
-#: ../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."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 msgstr ""
 
-#: ../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 "_Domajno"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-#, fuzzy
-msgid "_Enterprise Login"
-msgstr "_Fingroprema ensaluto"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "Aldoni uzanton"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
 #, fuzzy
-msgid "_Enroll"
-msgstr "_Alliĝi"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "Ensaluto de domajna administranto"
+#| msgctxt "printer state"
+#| msgid "Offline"
+msgid "You are Offline"
+msgstr "Nekonektite"
 
-#: ../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."
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
 msgstr ""
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "Administranto-_nomo"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "Administranto-pasvorto"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#, fuzzy
+msgid "_Enterprise Login"
+msgstr "_Fingroprema ensaluto"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6134,7 +6689,7 @@ msgid "Right little finger"
 msgstr "Deksta etfingro"
 
 #: ../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 "Elŝalti fingropreman ensaluton"
 
@@ -6171,9 +6726,30 @@ msgstr "Aldoni aŭ forigi uzantojn kaj ŝanĝi vian pasvorton"
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "Ensaluto;Nomo;Fingropremo;Avataro;Logobildo;Vizaĵo;Pasvorto;"
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "Ensaluthistorio"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#, fuzzy
+msgid "_Enroll"
+msgstr "_Alliĝi"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Ensaluto de domajna administranto"
+
+#: ../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 ""
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "Administranto-_nomo"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Administranto-pasvorto"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Change Password"
@@ -6195,17 +6771,27 @@ msgstr "_Nova pasvorto"
 msgid "Current _Password"
 msgstr "Nuna _pasvorto"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "Aldoni uzantokonton"
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#, fuzzy
+msgid "Allow user to change their password on next login"
+msgstr "Elekti pasvorton dum sekva ensaluto"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "Forigi uzantokonton"
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
+msgid "Set a password now"
+msgstr "Agordi pasvorton nun"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "Ensalutagordoj"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#| msgid "Add User"
+msgid "_Add User…"
+msgstr "_Aldoni uzanton…"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Via seanco devas restartiti por ŝanĝoj efektiviĝi"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Restarti nun"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
@@ -6219,14 +6805,15 @@ msgstr "_Fingroprema ensaluto"
 msgid "User Icon"
 msgstr "Uzanta bildsimbolo"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "_Language"
-msgstr "_Lingvo"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "Pasinta ensaluto"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#| msgid "Remove User Account"
+msgid "Remove User…"
+msgstr "Forigi uzanton…"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Mastrumi uzanto-kontojn"
@@ -6321,54 +6908,36 @@ msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Klopodu eviti sekvencojn kiel 1234 aŭ abcd."
 
 #: ../panels/user-accounts/pw-utils.c:115
+#, fuzzy
+#| 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 "Klopodu aldoni pli da leteroj, nombroj kaj simboloj."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "Klopodu uzi kunmeton de leteroj, nombroj kaj interpunkcio."
 
 #: ../panels/user-accounts/pw-utils.c:117
+#, fuzzy
+#| 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 "Kunmetu majusklojn kaj minusklojn, kaj uzu almenaŭ unu nombron."
 
 #: ../panels/user-accounts/pw-utils.c:119
+#, fuzzy
+#| 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 ""
 "Bona pasvorto! Aldonante pli da leteroj, nombroj kaj interpunkcio, ĝi "
 "fortiĝos eĉ pli."
 
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Forteco: malforte"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Forto: malalte"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Forteco: meze"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Forteco: bone"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Forteco: alte"
-
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
@@ -6419,70 +6988,89 @@ msgid "Unknown error"
 msgstr "Nekonata eraro"
 
 #: ../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 login provider."
 msgstr ""
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: ../panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "Malsukcesis aldoni konton"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "La pasvortoj ne kongruas."
 
-#: ../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 "Malsukcesis registri konton"
 
-#: ../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 "Ne valida maniero por aŭtentigi per tiu ĉi domajno"
 
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Malsukcesis aliĝi al domajno"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1041
+#, fuzzy
+#| 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 ""
 "La ensalutnomo ne funkciis.\n"
 "Bonvolu provi denove."
 
-#: ../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 ""
-"La ensalut-pasvorto ne funkciis. \n"
+"La ensalut-pasvorto ne funkciis.\n"
 "Bonvolu provi denove."
 
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Malsukcesis ensaluto en domajno"
 
-#: ../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
+#, fuzzy
+#| msgid "Unable find the domain. Maybe you misspelled it?"
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "Ne eblas trovi la domajnon. Ĉu vi eble misliterumis ĝin?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Standarde"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Administranto"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr ""
 "Vi ne havas permeson aliri la aparaton. Kontaktu vian sistemadministranton."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
 msgstr "La aparato jam estas uzata."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
 msgstr "Interna eraro okazis."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
 msgid "Enabled"
 msgstr "Elŝaltite"
 
@@ -6512,22 +7100,24 @@ msgstr "Farite!"
 #: ../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 "Ne eblis aliri la aparaton '%s'"
+#| msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
+msgstr "Ne eblis aliri la aparaton “%s”"
 
 #. 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 "Ne eblis komenci preni fingropremojn de aparato '%s'"
+#| msgid "Could not start finger capture on '%s' device"
+msgid "Could not start finger capture on “%s” device"
+msgstr "Ne eblis komenci preni fingropremojn de aparato “%s”"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr "Ne eblis aliri al iu fingropremlegilo"
 
-#: ../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 "Bonvole kontaktu vian sistemadministranton por helpo."
 
@@ -6536,28 +7126,31 @@ msgstr "Bonvole kontaktu vian sistemadministranton por helpo."
 #. * "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 ""
-"Por enŝalti fingropreman ensaluton, vi necesas konservi unu el viaj "
-"fingropremoj per la aparato '%s'."
+"Por enŝalti fingropreman ensaluton, vi konservu unu el viaj fingropremoj per "
+"la aparato “%s”."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
 msgstr "Elektante fingron"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:722
 msgid "Enrolling fingerprints"
 msgstr "Konservas fingropremojn"
 
-#: ../panels/user-accounts/um-history-dialog.c:68
+#: ../panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "Ĉi tiu semajno"
 
-#: ../panels/user-accounts/um-history-dialog.c:71
+#: ../panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "Pasinta semajno"
 
@@ -6565,85 +7158,92 @@ msgstr "Pasinta semajno"
 #. 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 "%b %e"
 
 #. 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 "%b %e, %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 "Seanco finis"
 
-#: ../panels/user-accounts/um-history-dialog.c:253
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "Seanco komencis"
 
-#: ../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 ""
+
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Bonvole elektu alian pasvorton."
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Bonvole tajpu vian aktualan pasvorton denove."
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Ne eblis ŝanĝi pasvorton"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "La pasvortoj ne kongruas."
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Foliumi por pliaj bildoj"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Elŝalti bildon"
 
-#: ../panels/user-accounts/um-photo-dialog.c:466
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "Fari fotaĵon…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:484
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "Foliumi por pliaj bildoj…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:708
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "Uzate de %s"
@@ -6669,36 +7269,39 @@ msgid "Invalid password, please try again"
 msgstr "Nevalida pasvorto, bonvolu provi denove"
 
 #: ../panels/user-accounts/um-realm-manager.c:834
-#, c-format
-msgid "Couldn't connect to the %s domain: %s"
+#, fuzzy, c-format
+#| msgid "Couldn't connect to the %s domain: %s"
+msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Ne eblis konekti al la %s-domajno: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:240
-msgid "Other Accounts"
-msgstr "Aliaj kontoj"
+#: ../panels/user-accounts/um-user-panel.c:195
+#, fuzzy
+#| msgid "User Accounts"
+msgid "Your account"
+msgstr "Uzantokontoj"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
 msgstr "Malsukcesis forigi uzanton"
 
-#: ../panels/user-accounts/um-user-panel.c:510
-#: ../panels/user-accounts/um-user-panel.c:569
-#: ../panels/user-accounts/um-user-panel.c:621
+#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:559
 #, fuzzy
 #| msgid "Failed to delete user"
 msgid "Failed to revoke remotely managed user"
 msgstr "Malsukcesis forigi uzanton"
 
-#: ../panels/user-accounts/um-user-panel.c:677
+#: ../panels/user-accounts/um-user-panel.c:613
 msgid "You cannot delete your own account."
 msgstr "Vi ne povas forigi vian propran konton."
 
-#: ../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 jam estas ensalutite"
 
-#: ../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."
@@ -6706,12 +7309,13 @@ msgstr ""
 "La forigo fe uzanto kiu estas ankoraŭ ensalutita, povas rezulti en "
 "nekonsekvencan sistemon."
 
-#: ../panels/user-accounts/um-user-panel.c:699
-#, c-format
-msgid "Do you want to keep %s's files?"
+#: ../panels/user-accounts/um-user-panel.c:635
+#, fuzzy, c-format
+#| msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
 msgstr "Ĉu vi volas konservi la dosierojn de %s?"
 
-#: ../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."
@@ -6719,52 +7323,56 @@ msgstr ""
 "Eblas manteni la hejmdosierujon, retpoŝtmandrenon kaj portempajn dosierojn "
 "ĉirkaŭe dum foriganta uzantkonton."
 
-#: ../panels/user-accounts/um-user-panel.c:706
+#: ../panels/user-accounts/um-user-panel.c:642
 msgid "_Delete Files"
 msgstr "_Forigi dosierojn"
 
-#: ../panels/user-accounts/um-user-panel.c:707
+#: ../panels/user-accounts/um-user-panel.c:643
 msgid "_Keep Files"
 msgstr "_Konservi dosierojn"
 
-#: ../panels/user-accounts/um-user-panel.c:721
+#: ../panels/user-accounts/um-user-panel.c:657
 #, fuzzy, 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?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "Ĉu vi certe volas forigi la konton de %s?"
 
-#: ../panels/user-accounts/um-user-panel.c:725
+#: ../panels/user-accounts/um-user-panel.c:661
 msgid "_Delete"
 msgstr "_Forigi"
 
-#: ../panels/user-accounts/um-user-panel.c:777
+#: ../panels/user-accounts/um-user-panel.c:711
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Konto elŝaltitis"
 
-#: ../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 "Agordota dum sekva ensalutado"
 
-#: ../panels/user-accounts/um-user-panel.c:788
+#: ../panels/user-accounts/um-user-panel.c:722
 msgctxt "Password mode"
 msgid "None"
 msgstr "Neniu"
 
-#: ../panels/user-accounts/um-user-panel.c:837
+#: ../panels/user-accounts/um-user-panel.c:769
 msgid "Logged in"
 msgstr "Ensalutita"
 
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
 msgstr "Malsukcesis konekti la kontoservon"
 
-#: ../panels/user-accounts/um-user-panel.c:1276
+#: ../panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Bonvole certigu ke la Kontoservo estas instalita kaj enŝaltita."
 
-#: ../panels/user-accounts/um-user-panel.c:1317
+#. 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"
@@ -6772,12 +7380,12 @@ msgstr ""
 "Por fari ŝanĝojn,\n"
 "klaku unue la *-piktogramon"
 
-#: ../panels/user-accounts/um-user-panel.c:1355
+#: ../panels/user-accounts/um-user-panel.c:1195
 msgid "Create a user account"
 msgstr "Krei uzantkonton"
 
-#: ../panels/user-accounts/um-user-panel.c:1366
-#: ../panels/user-accounts/um-user-panel.c:1678
+#: ../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"
@@ -6785,12 +7393,12 @@ msgstr ""
 "Por krei uzantkonton,\n"
 "klaku unue la *-piktogramon"
 
-#: ../panels/user-accounts/um-user-panel.c:1376
+#: ../panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
 msgstr "Forigi la elektitan uzantkonton"
 
-#: ../panels/user-accounts/um-user-panel.c:1388
-#: ../panels/user-accounts/um-user-panel.c:1683
+#: ../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"
@@ -6798,51 +7406,43 @@ msgstr ""
 "Por forigi la elektitan uzantkonton,\n"
 "klaku unue la *-piktogramon"
 
-#: ../panels/user-accounts/um-user-panel.c:1592
-msgid "My Account"
-msgstr "Mia konto"
-
-#: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "Uzanto kun la uzantonomo '%s' jam ekzistas."
+#: ../panels/user-accounts/um-utils.c:507
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr ""
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:510
 #, c-format
 msgid "The username is too long."
 msgstr "La uzantonomo estas tro longa."
 
-#: ../panels/user-accounts/um-utils.c:570
-msgid "The username cannot start with a '-'."
-msgstr "La uzantonomo ne povas komenci per '-'."
+#: ../panels/user-accounts/um-utils.c:513
+#| msgid "The username cannot start with a '-'."
+msgid "The username cannot start with a “-”."
+msgstr "La uzantonomo ne povas komenci per “-”."
 
-#: ../panels/user-accounts/um-utils.c:573
-#, fuzzy
+#: ../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 '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
 "La uzantonomo rajtas nur konsisti el majusklaj kaj minusklaj literoj de a-z, "
-"ciferoj kaj la signoj '.', '-' kaj '_'."
+"ciferoj kaj la jenaj signoj: . - _"
 
-#: ../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
+#, fuzzy
+#| 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 "Tiu ĉi nomos vian hejmdosierujon kaj oni ne povas ŝanĝi ĝin."
 
-#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:823
-msgid "%b %e"
-msgstr "%b %e"
-
-#. 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 "%b %e, %Y"
-
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
 msgstr "Mapobutonoj"
 
+#: ../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 "_Fermi"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "Mapobutonoj al funkcioj"
@@ -6850,7 +7450,7 @@ msgstr "Mapobutonoj al funkcioj"
 #: ../panels/wacom/button-mapping.ui.h:4
 #, fuzzy
 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 ""
 "Por redakti klavkombinon, alklaku la vicon kaj premu la novajn klavojn aŭ "
@@ -6863,78 +7463,84 @@ msgid ""
 msgstr ""
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr "Misalklako dekektita, restartante..."
-
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "Supren"
+#| msgid "Mis-click detected, restarting..."
+msgid "Mis-click detected, restarting…"
+msgstr "Misalklako dekektita, restartante…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "Suben"
+#: ../panels/wacom/cc-wacom-button-row.c:266
+#, c-format
+#| msgid "Button"
+msgid "Button %d"
+msgstr "Butono %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: ../panels/wacom/cc-wacom-button-row.h:53
+#, fuzzy
+#| msgid "Applications"
 msgctxt "Wacom action-type"
-msgid "None"
-msgstr "Neniu"
+msgid "Application defined"
+msgstr "Aplikaĵoj"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "Sendi klavofrapon"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Ŝanĝi ekranon"
 
-#: ../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 "Montri ekranhelpon"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
+#: ../panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "Eligo:"
 
 #. 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 ""
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
+#: ../panels/wacom/cc-wacom-mapping-panel.c:283
 #, fuzzy
 msgid "Map to single monitor"
 msgstr "Tajpadmonitoro"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
+#: ../panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: ../panels/wacom/cc-wacom-page.c:530
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Ekrana mapado"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
+#: ../panels/wacom/cc-wacom-panel.c:790
+#: ../panels/wacom/wacom-stylus-page.ui.h:9
+msgid "Stylus"
+msgstr "Grifelo"
+
+#: ../panels/wacom/cc-wacom-stylus-page.c:347
 msgid "Button"
 msgstr "Butono"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "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
+#, fuzzy
+#| msgid "Wacom Tablet"
+msgid "Wa­com Tab­let"
 msgstr "Tabuleto de Wacom"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr ""
 
 #. 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 "Tabuleto;Wacom;Grifelo;Gumo;Muso;"
 
@@ -6966,6 +7572,10 @@ msgstr "Bonvolu konekti aŭ enŝalti vian tabuleton de Wacom"
 msgid "Bluetooth Settings"
 msgstr "Agordoj de Bludento"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Tabuleto de Wacom"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 #, fuzzy
 msgid "Map to Monitor…"
@@ -6975,6 +7585,10 @@ msgstr "Mapi al ekrano…"
 msgid "Map Buttons…"
 msgstr "Map-butonoj…"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+msgid "Calibrate…"
+msgstr "Kalibri…"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Adjust display resolution"
 msgstr "Ĝustigi ekranan distingivon"
@@ -6991,163 +7605,85 @@ msgstr "Ĉasreĝimo"
 msgid "Left-Handed Orientation"
 msgstr "Maldekstramano orientiĝo"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-msgid "Left Ring"
-msgstr "Maldekstra ringo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "Maldekstra-ringa reĝimo #%d"
-
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-msgid "Right Ring"
-msgstr "Dekstra ringo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "Dekstra-ringa reĝimo #%d"
-
-#. 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 "Maldekstra tuŝostrio"
-
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "Maldekstra-tuŝostria reĝimo #%d"
-
-#. 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 "Dekstra tuŝostrio"
-
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "Dekstra-tuŝostrio reĝimo #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "Ŝaltilo de maldekstra-tuŝoringa reĝimo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "Ŝaltilo de dekstra-tuŝoringa reĝimo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "Ŝaltilo de maldekstra tuŝostria reĝimo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "Ŝaltilo de dekstra tuŝostria reĝimo"
-
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "Reĝima ŝaltilo #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1300
-#, c-format
-msgid "Left Button #%d"
-msgstr "Maldekstra butono #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1303
-#, c-format
-msgid "Right Button #%d"
-msgstr "Dekstra butono #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1306
-#, c-format
-msgid "Top Button #%d"
-msgstr "Supra butono #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1309
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "Malsupra butono #%d"
-
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "Nova klavkombino…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "Neniu ago"
-
 #: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "Alklako per maldekstra musklavo"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Middle Mouse Button Click"
 msgstr "Alklako per meza musklavo"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Right Mouse Button Click"
 msgstr "Alklako per dekstra musklavo"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "Rulumi supren"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "Rulumi suben"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "Rulumi maldekstren"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "Rulumi dekstren"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: ../panels/wacom/wacom-stylus-page.ui.h:4
 msgid "Back"
 msgstr "Reen"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: ../panels/wacom/wacom-stylus-page.ui.h:5
 msgid "Forward"
 msgstr "Antaŭen"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-msgid "Stylus"
-msgstr "Grifelo"
+#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#, fuzzy
+#| msgid "No languages found"
+msgid "No stylus found"
+msgstr "Neniuj stiloj trovitaj"
 
-#: ../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 ""
+
+#: ../panels/wacom/wacom-stylus-page.ui.h:10
 msgid "Eraser Pressure Feel"
 msgstr "Konduto de gumpremo"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: ../panels/wacom/wacom-stylus-page.ui.h:11
 msgid "Soft"
 msgstr "Milde"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:12
 msgid "Firm"
 msgstr "Firma"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: ../panels/wacom/wacom-stylus-page.ui.h:13
 msgid "Top Button"
 msgstr "Supra butono"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:14
 msgid "Lower Button"
 msgstr "Suba butono"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: ../panels/wacom/wacom-stylus-page.ui.h:15
 msgid "Tip Pressure Feel"
 msgstr "Konduto de pinta premo"
 
+#: ../panels/wacom/wacom-stylus-page.ui.h:17
+msgid "page 3"
+msgstr "paĝo 3"
+
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:730
+msgid "All Settings"
+msgstr "Ĉiuj agordoj"
+
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Persone"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Aparataro"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "Sistemo"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "Stircentro de GNOME"
@@ -7158,88 +7694,789 @@ msgstr ""
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
 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 ""
 
-#: ../shell/cc-application.c:69
+#: ../shell/cc-application.c:45
+#| msgid "Display Brightness"
+msgid "Display version number"
+msgstr "Ekrana versio-numero"
+
+#: ../shell/cc-application.c:46
 msgid "Enable verbose mode"
 msgstr "Enŝalti adan reĝimon"
 
-#: ../shell/cc-application.c:70
+#: ../shell/cc-application.c:47
 msgid "Show the overview"
 msgstr "Montri la superrigardon"
 
-#: ../shell/cc-application.c:71
+#: ../shell/cc-application.c:48
 msgid "Search for the string"
 msgstr "Serĉi la ĉenon"
 
-#: ../shell/cc-application.c:72
+#: ../shell/cc-application.c:49
 msgid "List possible panel names and exit"
 msgstr "Listigi eblajn panelnomojn kaj eliri"
 
-#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
-#: ../shell/cc-application.c:75
-msgid "Show help options"
-msgstr "Vidigi helpajn opciojn"
-
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "Panel to display"
 msgstr "Panelo por montri"
 
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANELO] [ARGUMENTO…]"
 
-#: ../shell/cc-application.c:145
-msgid "- Settings"
-msgstr "- Agordoj"
-
-#: ../shell/cc-application.c:163
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Rulu '%s --help' por vidi kompletan liston de disponeblaj komandliniaj "
-"opcioj.\n"
-
-#: ../shell/cc-application.c:193
+#: ../shell/cc-application.c:113
 msgid "Available panels:"
 msgstr "Disponeblaj paneloj:"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:252
 msgid "Help"
 msgstr "Helpo"
 
-#: ../shell/cc-application.c:327
+#: ../shell/cc-application.c:253
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494
-msgid "All Settings"
-msgstr "Ĉiuj agordoj"
+#: ../shell/gnome-control-center.desktop.in.in.h:2
+msgid "Preferences;Settings;"
+msgstr "agordoj;opcioj;"
 
-#. Add categories
-#: ../shell/cc-window.c:880
-msgctxt "category"
-msgid "Personal"
-msgstr "Persone"
+#: ../shell/help-overlay.ui.h:1
+#| msgid "General"
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Ĝenerale"
 
-#: ../shell/cc-window.c:881
-msgctxt "category"
-msgid "Hardware"
-msgstr "Aparataro"
+#: ../shell/help-overlay.ui.h:2
+#| msgid "Quit"
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Ĉesi"
 
-#: ../shell/cc-window.c:882
-msgctxt "category"
-msgid "System"
-msgstr "Sistemo"
+#: ../shell/help-overlay.ui.h:3
+#| msgid "Search"
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Serĉo"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
-msgid "Preferences;Settings;"
-msgstr "agordoj;opcioj;"
+#: ../shell/help-overlay.ui.h:4
+#, fuzzy
+#| msgid "Panel icon"
+msgctxt "shortcut window"
+msgid "Panels"
+msgstr "Paneloj"
+
+#: ../shell/help-overlay.ui.h:5
+#| msgid "Show the overview"
+msgctxt "shortcut window"
+msgid "Go back to the overview"
+msgstr "Iri reen al la superrigardo"
+
+#: ../shell/help-overlay.ui.h:6
+#| msgctxt "print job"
+#| msgid "Canceled"
+msgctxt "shortcut window"
+msgid "Cancel search"
+msgstr "Nuligi serĉon"
+
+#. 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 "Retkaptejo"
+
+#: ../shell/panel-list.ui.h:3
+#| msgid "No regions found"
+msgid "No results found"
+msgstr "Neniu rezulto troviĝis"
+
+#~ msgid "Bluetooth is disabled"
+#~ msgstr "Bludento estas elŝaltite"
+
+#~ msgid "Done"
+#~ msgstr "Farite"
+
+#~ msgid "Color"
+#~ msgstr "Koloro"
+
+#~ msgid "Time _Zone"
+#~ msgstr "Hor_zono"
+
+#~ msgid "Lid Closed"
+#~ msgstr "Kovrilo ferma"
+
+#~ msgid "Mirrored"
+#~ msgstr "Spegulata"
+
+#~ msgid "Primary"
+#~ msgstr "Ĉefa"
+
+#~ msgid "Secondary"
+#~ msgstr "Kroma"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Aranĝi kombinitajn ekranojn"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "Ŝovu ekranojn por rearanĝi"
+
+#, fuzzy
+#~| msgctxt "display panel, rotation"
+#~| msgid "Counterclockwise"
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Turni maldekstrumen laŭ 90°"
+
+#~ msgid "Size"
+#~ msgstr "Grando"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Aspekta rilatumo"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "Montri la supran breton kaj Aktivecoj-Superrigardon ĉi ekrane"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "Kunmeti ĉi ekranon kun alia por krei ekstran laborspacon"
+
+#~ msgid "Presentation"
+#~ msgstr "Prezento"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Montri nur lumbildojn kaj aŭdvidaĵon"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Montri vian ekzistantan vidon per ambaŭ ekranoj"
+
+#~ msgid "Turn Off"
+#~ msgstr "Elŝalti"
+
+#~ msgid "Don't use this display"
+#~ msgstr "Ne uzi ĉi ekranon"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "_Aranĝi kombinitajn ekranojn"
+
+#~ msgid "Wayland"
+#~ msgstr "Vejlando"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-bita"
+
+#~ msgid "Base system"
+#~ msgstr "Baza sistemo"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Klavkombino;Ripeto;Pulso;"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nomo:"
+
+#~ msgid "_Delay:"
+#~ msgstr "_Prokrasto:"
+
+#~ msgid "_Speed:"
+#~ msgstr "_Rapido:"
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Short"
+#~ msgstr "Mallonge"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Slow"
+#~ msgstr "Malrapide"
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Long"
+#~ msgstr "Longe"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgid "S_peed:"
+#~ msgstr "Ra_pido:"
+
+#~ msgid "Add Shortcut"
+#~ msgstr "Aldoni klavkombinon"
+
+#~ msgid ""
+#~ "To edit a shortcut, click the row and hold down the new keys or press "
+#~ "Backspace to clear."
+#~ msgstr ""
+#~ "Por redakti klavkombinon, alklaku la vicon kaj premu la novajn klavojn aŭ "
+#~ "premu la retropaŝan klavon por vakigi."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Klavkombinoj"
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<Nekonata ago>"
+
+#~ 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 ""
+#~ "La klavkombino \"%s\" ne povas esti uzata ĉar ĝi ne ebloj tajpi per ĉi "
+#~ "tiu klavo.\n"
+#~ "Bonvou reprovi per klavo kiel stirklavo, alt-klavo aŭ majuskliga klavo "
+#~ "samtempe."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "La klavkombino \"%s\" estas jam uzata por\n"
+#~ "\"%s\""
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~ "disabled."
+#~ msgstr ""
+#~ "Se vi reatribuas la klavkombinon al \"%s\", la klavkombino \"%s\" estos "
+#~ "elŝaltita."
+
+#~ msgid "_Reassign"
+#~ msgstr "_Reatribui"
+
+#~ msgid ""
+#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
+#~ "automatically set it to \"%s\"?"
+#~ msgstr ""
+#~ "La \"%s\"-fulmoklavo jam havas asocigitan \"%s\"-fulmoklavon. Ĉu vi volas "
+#~ "aŭtomate difini ĝin al \"%s\"?"
+
+#, 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 ""
+#~ "Se vi reatribuas la klavkombinon al \"%s\", la klavkombino \"%s\" estos "
+#~ "elŝaltita."
+
+#~ msgid "_Assign"
+#~ msgstr "_Atribui"
+
+#~ msgid "Test Your Settings"
+#~ msgstr "Testi viajn agordojn"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Slow"
+#~ msgstr "Malrapide"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgctxt "mouse, left button as primary"
+#~ msgid "_Left"
+#~ msgstr "Ma_ldekstre"
+
+#~ msgctxt "mouse, right button as primary"
+#~ msgid "_Right"
+#~ msgstr "Dekst_re"
+
+#~ msgid "_Pointer speed"
+#~ msgstr "_Indikilrapido"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "Malrapide"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "Malrapide"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgid "Server"
+#~ msgstr "Servilo"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Forigi nomservilon"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "Disponebligi kun aliaj _uzantoj"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "Fajroŝirmila _zono"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "Defaŭlta"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "La zono definas la fidindecan nivelon de la konekto"
+
+#~ msgid "Bond"
+#~ msgstr "Bindo"
+
+#~ msgid "Team"
+#~ msgstr "Teamo"
+
+#~ msgid "Bridge"
+#~ msgstr "Ponto"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "Ne eblas ŝargi VPN-an etendojn"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "Aldoni retan konekton"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Vakigi la agordojn por ĉi reto, inkludante pasvortojn, sed memori ĝin "
+#~ "kiel preferita reto"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr "Forigi ĉiujn detalojn de ĉi reto kaj ne klopodi aŭtomate konekti"
+
+#~ msgid "Bond slaves"
+#~ msgstr "Bindaj sklavoj"
+
+#~ msgid "(none)"
+#~ msgstr "(neniu)"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "Pontaj sklavoj"
+
+#, fuzzy
+#~| msgid "Bridge slaves"
+#~ msgid "Team slaves"
+#~ msgstr "Pontaj sklavoj"
+
+#~ 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 ""
+#~ "Se vi havas konekton al la interreto krom sendrata, vi povas agordi "
+#~ "sendratan retkaptejon por kunhavi la konekton kun aliaj."
+
+#~ msgid "History"
+#~ msgstr "Historio"
+
+#~ msgid "Proxy"
+#~ msgstr "Prokurilo"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "_Aldoni profilon…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "Neniu"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "Permane"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Aŭtomate"
+
+#~ msgid "Add Device"
+#~ msgstr "Aldoni aparaton"
+
+#~ msgid "Remove Device"
+#~ msgstr "Forigi aparaton"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN-tipo"
+
+#~ msgid "Group Name"
+#~ msgstr "Grupnomo"
+
+#~ msgid "Group Password"
+#~ msgstr "Gruppasvorto"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "_Uzi kiel retkaptejo…"
+
+#~ msgid "_History"
+#~ msgstr "_Historio"
+
+#~ msgid "Security key"
+#~ msgstr "Sekureca ŝlosilo"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "InfiniBand aparato ne subtenas konektitan reĝimon"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Neniu atestilo de Atestilaŭtoritato elektita"
+
+#~ 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 ""
+#~ "Se vi ne uzas atestilaŭtoritatan (CA) atestilon tiam vi povas konekti al "
+#~ "nesekuraj, friponaj sendrataj retoj.  Ĉu vi volas elekti "
+#~ "atestilaŭtoritatan atestilon?"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignori"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Elekti CA-atestilon"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "Ĉiam _postuli la pasvorton"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Ne _averti min denove"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Yes"
+#~ msgstr "Jes"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#, fuzzy
+#~| msgctxt "notifications"
+#~| msgid "Notifications"
+#~ msgctxt "notifications"
+#~ msgid "Notification Banners"
+#~ msgstr "Sciigoj"
+
+#~ msgid "Add Account"
+#~ msgstr "Aldoni konton"
+
+#~ msgid "Mail"
+#~ msgstr "Retpoŝto"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontaktaro"
+
+#~ msgid "Chat"
+#~ msgstr "Retbabilado"
+
+#~ msgid "Resources"
+#~ msgstr "Risurcoj"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "Eraro dum ensalutado"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "Ensalutiloj senvalidiĝis."
+
+#, fuzzy
+#~ msgid "Sign in to enable this account."
+#~ msgstr "Aliĝi por enŝalti tiun konton."
+
+#~ msgid "_Sign In"
+#~ msgstr "En_saluti"
+
+#~ msgid "Error creating account"
+#~ msgstr "Eraro dum kreado de konto"
+
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "Ĉu vi certe volas forigi la konton?"
+
+#~ msgid "No online accounts configured"
+#~ msgstr "Neniuj retkontoj estas agorditaj"
+
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "Aldoninte konton, permesas al viaj aplikaĵoj atingi dokumentojn, "
+#~ "retpoŝton, kontaktojn, kalendaro, retbabiladon kaj plu."
+
+#~ msgid "Wireless devices require extra power"
+#~ msgstr "Sendrataj aparatoj bezonas kroman energion"
+
+#, fuzzy
+#~ msgid "When battery power is _critical"
+#~ msgstr "Kiam kurento estas _kritike malalta"
+
+#~ msgid "Power"
+#~ msgstr "Energio"
+
+#~ msgid "Power off"
+#~ msgstr "Elŝalti"
+
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "Agordante"
+
+#~ msgid "Toner Level"
+#~ msgstr "Nivelo de inkopulvoro"
+
+#~ msgid "Supply Level"
+#~ msgstr "Proviza nivelo"
+
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "Instalante"
+
+#~ msgid "No printers available"
+#~ msgstr "Neniu presilo disponebla"
+
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u aktiva"
+#~ msgstr[1] "%u aktivaj"
+
+#~ msgid "Close"
+#~ msgstr "Fermi"
+
+#~ msgid "Resume Printing"
+#~ msgstr "Daŭrigi preson"
+
+#~ msgid "Pause Printing"
+#~ msgstr "Paŭzigi presadon"
+
+#~ msgid "Add a New Printer"
+#~ msgstr "Aldoni novan presilon"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "_Aŭtentigi"
+
+#~ msgid "No printers detected."
+#~ msgstr "Detektis neniun presilon."
+
+#~ msgid "Loading options…"
+#~ msgstr "Ŝarĝante opciojn…"
+
+#, fuzzy
+#~ msgctxt "print job"
+#~ msgid "Held"
+#~ msgstr "Paŭzigita"
+
+#~ msgid "Job Title"
+#~ msgstr "Tasktitolo"
+
+#~ msgid "Job State"
+#~ msgstr "Taskstato"
+
+#~ msgid "Time"
+#~ msgstr "Horo"
+
+#~ msgid "Supply"
+#~ msgstr "Provizo"
+
+#~ msgid "_Default printer"
+#~ msgstr "_Defaŭlta presilo"
+
+#~ msgid "Jobs"
+#~ msgstr "Taskoj"
+
+#~ msgid "Show _Jobs"
+#~ msgstr "Montri _taskojn"
+
+#~ msgid "label"
+#~ msgstr "etikedo"
+
+#~ msgid "Setting new driver…"
+#~ msgstr "Metante novan pelilon…"
+
+#~ msgid "Print _Test Page"
+#~ msgstr "Presi _testpaĝon"
+
+#~ msgid "Add New Printer"
+#~ msgstr "Aldoni novan presilon"
+
+#~ msgid "Privacy"
+#~ msgstr "Privateco"
+
+#~ msgid "Used to determine your geographical location"
+#~ msgstr "Uzita por determini vian geografian lokon"
+
+#~ msgid "Options"
+#~ msgstr "Agordoj"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "Alia"
+
+#~ msgid ""
+#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+#~ "devices"
+#~ msgstr ""
+#~ "Bludenta komunigo permesas al vi komunigi dosierojn kun aliaj aparatoj "
+#~ "Bludento-aktivaj"
+
+#~ msgid "Only Receive From Trusted Devices"
+#~ msgstr "Nur ricevi el fidindaj aparatoj"
+
+#~ msgid "Save Received Files to Downloads Folder"
+#~ msgstr "Konservi ricevitajn dosierojn en la dosierujo de elŝutoj"
+
+#, fuzzy
+#~ msgid "Allow Remote Control"
+#~ msgstr "Laŭtecregilo"
+
+#~ msgid "Password:"
+#~ msgstr "Pasvorto:"
+
+#~ msgid "Zoom"
+#~ msgstr "Zomi"
+
+#~ msgctxt "universal access, contrast"
+#~ msgid "Color"
+#~ msgstr "Koloro"
+
+#~ msgid "_Verify"
+#~ msgstr "_Kontroli"
+
+#~ msgid "Login History"
+#~ msgstr "Ensaluthistorio"
+
+#~ msgid "Add User Account"
+#~ msgstr "Aldoni uzantokonton"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Klopodu aldoni pli da leteroj, nombroj kaj simboloj."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Forteco: malforte"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Forto: malalte"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Forteco: meze"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Forteco: bone"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Forteco: alte"
+
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Other Accounts"
+#~ msgstr "Aliaj kontoj"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "Uzanto kun la uzantonomo '%s' jam ekzistas."
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "Supren"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "Suben"
+
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "Neniu"
+
+#~ msgid "Left Ring"
+#~ msgstr "Maldekstra ringo"
+
+#~ msgid "Left Ring Mode #%d"
+#~ msgstr "Maldekstra-ringa reĝimo #%d"
+
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "Dekstra-ringa reĝimo #%d"
+
+#~ msgid "Left Touchstrip"
+#~ msgstr "Maldekstra tuŝostrio"
+
+#~ msgid "Left Touchstrip Mode #%d"
+#~ msgstr "Maldekstra-tuŝostria reĝimo #%d"
+
+#~ msgid "Right Touchstrip"
+#~ msgstr "Dekstra tuŝostrio"
+
+#~ msgid "Right Touchstrip Mode #%d"
+#~ msgstr "Dekstra-tuŝostrio reĝimo #%d"
+
+#~ msgid "Left Touchring Mode Switch"
+#~ msgstr "Ŝaltilo de maldekstra-tuŝoringa reĝimo"
+
+#~ msgid "Right Touchring Mode Switch"
+#~ msgstr "Ŝaltilo de dekstra-tuŝoringa reĝimo"
+
+#~ msgid "Left Touchstrip Mode Switch"
+#~ msgstr "Ŝaltilo de maldekstra tuŝostria reĝimo"
+
+#~ msgid "Right Touchstrip Mode Switch"
+#~ msgstr "Ŝaltilo de dekstra tuŝostria reĝimo"
+
+#~ msgid "Mode Switch #%d"
+#~ msgstr "Reĝima ŝaltilo #%d"
+
+#~ msgid "Left Button #%d"
+#~ msgstr "Maldekstra butono #%d"
+
+#~ msgid "Right Button #%d"
+#~ msgstr "Dekstra butono #%d"
+
+#~ msgid "Top Button #%d"
+#~ msgstr "Supra butono #%d"
+
+#~ msgid "Bottom Button #%d"
+#~ msgstr "Malsupra butono #%d"
+
+#~ msgid "No Action"
+#~ msgstr "Neniu ago"
+
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "Alklako per maldekstra musklavo"
+
+#~ msgid "Scroll Up"
+#~ msgstr "Rulumi supren"
+
+#~ msgid "Scroll Down"
+#~ msgstr "Rulumi suben"
+
+#~ msgid "Scroll Left"
+#~ msgstr "Rulumi maldekstren"
+
+#~ msgid "Scroll Right"
+#~ msgstr "Rulumi dekstren"
+
+#~ msgid "Show help options"
+#~ msgstr "Vidigi helpajn opciojn"
+
+#~ msgid "- Settings"
+#~ msgstr "- Agordoj"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Rulu '%s --help' por vidi kompletan liston de disponeblaj komandliniaj "
+#~ "opcioj.\n"
 
 #~ msgid "Turns off wireless devices"
 #~ msgstr "Elŝalti sendratajn aparatojn"
@@ -7250,9 +8487,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Set Up New Device"
 #~ msgstr "Agordi novan aparaton"
 
-#~ msgid "Connection"
-#~ msgstr "Konekto"
-
 #~ msgid "Paired"
 #~ msgstr "Parigite"
 
@@ -7384,9 +8618,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Don't use the display"
 #~ msgstr "Ne uzi la ekranon"
 
-#~ msgid "Refresh Rate"
-#~ msgstr "Aktualiga ofteco"
-
 #~ msgid "Mouse Preferences"
 #~ msgstr "Musagordoj"
 
@@ -7446,9 +8677,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Change the background"
 #~ msgstr "Ŝanĝi la fonon"
 
-#~ msgid "Configure Bluetooth settings"
-#~ msgstr "Ŝanĝi la Bludentajn agordojn"
-
 #~ msgid "Browse Files..."
 #~ msgstr "Foliumi dosierojn..."
 
@@ -7548,9 +8776,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Select a language"
 #~ msgstr "Elekti lingvon"
 
-#~ msgid "_Select"
-#~ msgstr "_Elekti"
-
 #~ msgid "_Region:"
 #~ msgstr "_Regiono:"
 
@@ -7560,9 +8785,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "_Network Time"
 #~ msgstr "_Rethoro"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Set the time one hour ahead."
 #~ msgstr "Aldoni unu horon al tempo."
 
@@ -7655,9 +8877,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Acti_on:"
 #~ msgstr "Ag_o:"
 
-#~ msgid "OS type"
-#~ msgstr "Tipo de operaciumo"
-
 #~ msgid "Experience"
 #~ msgstr "Spertoj"
 
@@ -7673,9 +8892,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Action"
 #~ msgstr "Ago"
 
-#~ msgid "Shortcut"
-#~ msgstr "Klavkombino"
-
 #~ msgid "Set your mouse and touchpad preferences"
 #~ msgstr "Agordi viajn muson kaj tuŝplaton"
 
@@ -7703,9 +8919,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Drag Threshold"
 #~ msgstr "Ŝova sojlo"
 
-#~ msgid "Double-Click Timeout"
-#~ msgstr "Eltempiĝo de duobla alklako"
-
 #~ msgid "_Timeout:"
 #~ msgstr "_Tempolimo:"
 
@@ -7715,9 +8928,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Enable _mouse clicks with touchpad"
 #~ msgstr "Ebligi _musklakojn per tuŝplato"
 
-#~ msgid "Scrolling"
-#~ msgstr "Rulumado"
-
 #~ msgid "_Disabled"
 #~ msgstr "_Elŝaltite"
 
@@ -7755,9 +8965,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Disable VPN"
 #~ msgstr "Elŝalti na VPN"
 
-#~ msgid "_Configure..."
-#~ msgstr "A_gordi..."
-
 #~ msgid "HTTP Port"
 #~ msgstr "HTTP-pordo"
 
@@ -7795,12 +9002,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Power management settings"
 #~ msgstr "Kurentmastumadaj agordoj"
 
-#~ msgid "Don't suspend"
-#~ msgstr "Ne paŭzigi"
-
-#~ msgid "Change printer settings"
-#~ msgstr "Ŝanĝi presilagordojn"
-
 #~ msgid "_Search by Address"
 #~ msgstr "Ŝerĉi laŭ _adreso"
 
@@ -7931,9 +9132,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Layouts"
 #~ msgstr "Aranĝoj"
 
-#~ msgid "Display language:"
-#~ msgstr "Montrata lingvo:"
-
 #~ msgid "Format:"
 #~ msgstr "Formo:"
 
@@ -8036,10 +9234,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "150%"
 #~ msgstr "150%"
 
-#~ msgctxt "universal access, text size"
-#~ msgid "Larger"
-#~ msgstr "Pli granda"
-
 #~ msgid "Change contrast:"
 #~ msgstr "Ŝanĝi kontraston:"
 
@@ -8052,10 +9246,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Decrease size:"
 #~ msgstr "Malpligrandiga grando:"
 
-#~ msgctxt "universal access, seeing"
-#~ msgid "Display"
-#~ msgstr "Ekrano"
-
 #~ msgid "Zoom in:"
 #~ msgstr "Enzomi:"
 
@@ -8125,9 +9315,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Cr_eate"
 #~ msgstr "Kr_ei"
 
-#~ msgid "User Accounts"
-#~ msgstr "Uzantokontoj"
-
 #~ msgid "Log in without a password"
 #~ msgstr "Ensaluti sen pasvorto"
 
@@ -8187,9 +9374,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Good"
 #~ msgstr "Bone"
 
-#~ msgid "Wrong password"
-#~ msgstr "Falsa pasvorto"
-
 #~ msgid "Browse for more pictures..."
 #~ msgstr "Foliumi por pliaj bildoj..."
 
@@ -8211,9 +9395,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "System Settings"
 #~ msgstr "Sistemagordoj"
 
-#~ msgid "Unlock"
-#~ msgstr "Malŝlosi"
-
 #~ msgid "Key"
 #~ msgstr "Ŝlosilo"
 
@@ -8346,9 +9527,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "The type of accelerator."
 #~ msgstr "La tipo de la akcelilo."
 
-#~ msgid "Error saving the new shortcut"
-#~ msgstr "Eraro dum konservo de la nova klavkombino"
-
 #~ msgid "Too many custom shortcuts"
 #~ msgstr "Troaj personaj klavkombinoj"
 
@@ -8358,9 +9536,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "cd;dvd;usb;audio;video;disc;"
 #~ msgstr "kd;dvd;usb;sono;video;disko;"
 
-#~ msgid "Speed"
-#~ msgstr "Rapido"
-
 #~ msgid "Ask me"
 #~ msgstr "Demandi min"
 
@@ -8957,11 +10132,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Image"
 #~ msgstr "Bildo"
 
-#~ msgid "pixel"
-#~ msgid_plural "pixels"
-#~ msgstr[0] "bildero"
-#~ msgstr[1] "bilderoj"
-
 #~ msgid ""
 #~ "<b>%s</b>\n"
 #~ "%s, %s\n"
@@ -9087,9 +10257,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Parent window of the dialog"
 #~ msgstr "Gepatra fenestro de la dialogo"
 
-#~ msgid "From URI"
-#~ msgstr "De URI-o"
-
 #~ msgid "URI currently transferring from"
 #~ msgstr "URI el kiu aktuale transmetanta"
 
@@ -9275,9 +10442,6 @@ msgstr "agordoj;opcioj;"
 #~ msgid "Monitor Preferences"
 #~ msgstr "Ekranoagordoj"
 
-#~ msgid "Panel icon"
-#~ msgstr "Panela piktogramo"
-
 #~ msgid "Sa_me image in all monitors"
 #~ msgstr "Sa_ma bildo en ĉiuj ekranoj"
 



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