[gnome-control-center] Update Esperanto translation



commit 6724dc7c570eb0c33d17e7836298c2dc434ae585
Author: Carmen Bianca BAKKER <carmen carmenbianca eu>
Date:   Mon Jan 14 21:36:42 2019 +0000

    Update Esperanto translation

 po/eo.po | 3907 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2186 insertions(+), 1721 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index 83e7be3bc..ccf0b9041 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,26 +10,336 @@
 # 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, 2017, 2018.
-# Carmen Bianca BAKKER <carmen carmenbianca eu>, 2018.
-#
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2019.
+# Carmen Bianca BAKKER <carmen carmenbianca eu>, 2018, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2018-11-21 11:28+0000\n"
-"PO-Revision-Date: 2018-11-21 15:57+0100\n"
-"Last-Translator: Carmen Bianca Bakker <carmen carmenbianca eu>\n"
+"POT-Creation-Date: 2019-01-10 16:00+0000\n"
+"PO-Revision-Date: 2019-01-14 22:35+0200\n"
+"Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#: panels/applications/cc-applications-panel.c:558
+msgid "System Bus"
+msgstr "Sistembuso"
+
+#: panels/applications/cc-applications-panel.c:558
+#: panels/applications/cc-applications-panel.c:560
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:581
+msgid "Full access"
+msgstr "Plena aliro"
+
+#: panels/applications/cc-applications-panel.c:560
+msgid "Session Bus"
+msgstr "Seanca buso"
+
+#: panels/applications/cc-applications-panel.c:565
+#: panels/power/cc-power-panel.c:2528 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
+#: shell/cc-window.c:283
+msgid "Devices"
+msgstr "Aparatoj"
+
+#: panels/applications/cc-applications-panel.c:565
+msgid "Full access to /dev"
+msgstr "Plena aliro al /dev"
+
+#: panels/applications/cc-applications-panel.c:570
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "Reto"
+
+#: panels/applications/cc-applications-panel.c:570
+msgid "Has network access"
+msgstr "Havas retaliron"
+
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:578
+#: panels/background/cc-background-chooser-dialog.c:536
+#: panels/search/cc-search-locations-dialog.c:286
+msgid "Home"
+msgstr "Hejmo"
+
+#: panels/applications/cc-applications-panel.c:578
+#: panels/applications/cc-applications-panel.c:583
+msgid "Read-only"
+msgstr "Nurlega"
+
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:583
+msgid "File System"
+msgstr "Dosiersistemo"
+
+#: panels/applications/cc-applications-panel.c:588
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:287
+#: shell/cc-window.c:927 shell/cc-window.ui:123
+#: shell/gnome-control-center.desktop.in.in:3
+msgid "Settings"
+msgstr "Agordoj"
+
+#: panels/applications/cc-applications-panel.c:588
+msgid "Can change settings"
+msgstr "Rajtas ŝanĝi agordojn"
+
+#: panels/applications/cc-applications-panel.c:593
+#, c-format
+msgid ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.c:735
+msgid "Web Links"
+msgstr "Retligiloj"
+
+#: panels/applications/cc-applications-panel.c:745
+msgid "Git Links"
+msgstr "Gitligiloj"
+
+#: panels/applications/cc-applications-panel.c:751
+#, c-format
+msgid "%s Links"
+msgstr "%s-ligiloj"
+
+#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:795
+msgid "Unset"
+msgstr "Ne agordita"
+
+#: panels/applications/cc-applications-panel.c:850
+msgid "Links"
+msgstr "Ligiloj"
+
+#: panels/applications/cc-applications-panel.c:858
+msgid "Hypertext Files"
+msgstr "Hipertekstaj dosieroj"
+
+#: panels/applications/cc-applications-panel.c:872
+msgid "Text Files"
+msgstr "Tekstaj dosieroj"
+
+#: panels/applications/cc-applications-panel.c:886
+msgid "Image Files"
+msgstr "Bildo-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:902
+msgid "Font Files"
+msgstr "Tipar-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:963
+msgid "Archive Files"
+msgstr "Arĥiv-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:983
+msgid "Package Files"
+msgstr "Pak-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:1006
+msgid "Audio Files"
+msgstr "Son-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:1023
+msgid "Video Files"
+msgstr "Video-dosieroj"
+
+#: panels/applications/cc-applications-panel.c:1031
+msgid "Other Files"
+msgstr "Aliaj dosieroj"
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1353
+#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/gnome-applications-panel.desktop.in.in:3
+#: panels/notifications/cc-notifications-panel.ui:167
+#: panels/privacy/cc-privacy-panel.ui:1085 panels/sound/gvc-mixer-dialog.c:1796
+msgid "Applications"
+msgstr "Aplikaĵoj"
+
+#: panels/applications/cc-applications-panel.ui:45
+msgid "No applications"
+msgstr "Neniuj aplikaĵoj"
+
+#: panels/applications/cc-applications-panel.ui:59
+msgid "Install some…"
+msgstr "Instali kelkajn…"
+
+#: panels/applications/cc-applications-panel.ui:99
+msgid "Permissions & Access"
+msgstr "Permesoj & aliro"
+
+#: panels/applications/cc-applications-panel.ui:111
+msgid ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:126
+#: panels/applications/cc-applications-panel.ui:132
+#: panels/privacy/cc-privacy-panel.c:894 panels/privacy/cc-privacy-panel.ui:745
+msgid "Camera"
+msgstr "Kamerao"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:133
+#: panels/applications/cc-applications-panel.ui:145
+#: panels/applications/cc-applications-panel.ui:157
+#: panels/applications/cc-applications-panel.ui:237
+#: panels/applications/cc-applications-panel.ui:255
+#: panels/keyboard/cc-keyboard-option.c:259
+#: panels/keyboard/cc-keyboard-option.c:378
+#: panels/keyboard/keyboard-shortcuts.c:425
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1866
+msgid "Disabled"
+msgstr "Malŝaltita"
+
+#: panels/applications/cc-applications-panel.ui:138
+#: panels/applications/cc-applications-panel.ui:144
+#: panels/privacy/cc-privacy-panel.c:927 panels/privacy/cc-privacy-panel.ui:850
+msgid "Microphone"
+msgstr "Mikrofono"
+
+#: panels/applications/cc-applications-panel.ui:150
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/privacy/cc-privacy-panel.c:836 panels/privacy/cc-privacy-panel.ui:955
+msgid "Location Services"
+msgstr "Lokado-servoj"
+
+#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:422
+#, fuzzy
+#| msgid "Built-in Webcam"
+msgid "Built-in Permissions"
+msgstr "Fiksita retkamerao"
+
+#: panels/applications/cc-applications-panel.ui:163
+msgid "Cannot be changed"
+msgstr "Ne eblas ŝanĝi"
+
+#: panels/applications/cc-applications-panel.ui:180
+msgid ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:204
+msgid "Integration"
+msgstr "Integrigo"
+
+#: panels/applications/cc-applications-panel.ui:216
+msgid "System features used by this application."
+msgstr "Sistemfunkcioj, kiujn uzas ĉi tiu aplikaĵo."
+
+#: panels/applications/cc-applications-panel.ui:230
+#: panels/applications/cc-applications-panel.ui:236
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:153
+msgid "Search"
+msgstr "Serĉo"
+
+#: panels/applications/cc-applications-panel.ui:242
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "Sciigoj"
+
+#: panels/applications/cc-applications-panel.ui:248
+#: panels/applications/cc-applications-panel.ui:254
+msgid "Sounds"
+msgstr "Sonoj"
+
+#: panels/applications/cc-applications-panel.ui:287
+#, fuzzy
+#| msgid "_Default printer"
+msgid "Default Handlers"
+msgstr "Defaŭltaj traktiloj"
+
+#: panels/applications/cc-applications-panel.ui:299
+msgid "Types of files and links that this application opens."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:315
+msgid "Reset"
+msgstr "Reagordi"
+
+#: panels/applications/cc-applications-panel.ui:351
+msgid "Usage"
+msgstr "Uzado"
+
+#: panels/applications/cc-applications-panel.ui:363
+msgid "How much resources this application is using."
+msgstr "Kiom da risurcoj ĉi tiu aplikaĵo uzas."
+
+#: panels/applications/cc-applications-panel.ui:378
+#: panels/applications/cc-applications-panel.ui:458
+msgid "Storage"
+msgstr "Konservejo"
+
+#: panels/applications/cc-applications-panel.ui:413
+msgid "Open in Software"
+msgstr "Malfermi en Programaro"
+
+#: panels/applications/cc-applications-panel.ui:475
+msgid ""
+"How much disk space this application is occupying with app data and caches."
+msgstr ""
+"Kiom da diskospaco ĉi tiu aplikaĵo okpuas per apdatumoj kaj kaŝmemoroj."
+
+#: panels/applications/cc-applications-panel.ui:484
+msgid "Application"
+msgstr "Aplikaĵo"
+
+#: panels/applications/cc-applications-panel.ui:490
+msgid "Data"
+msgstr "Datumo"
+
+#: panels/applications/cc-applications-panel.ui:496
+msgid "Cache"
+msgstr "Kaŝmemoro"
+
+#: panels/applications/cc-applications-panel.ui:502
+msgid "<b>Total</b>"
+msgstr "<b>Totalo</b>"
+
+#: panels/applications/cc-applications-panel.ui:519
+msgid "Clear Cache…"
+msgstr "Vakigi kaŝmemoron…"
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+msgstr "Kontroli diversajn aplikaĵajn permesojn kaj agordojn"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/applications/gnome-applications-panel.desktop.in.in:8
+msgid "application-x-executable-symbolic"
+msgstr "application-x-executable-symbolic"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr "aplikaĵo;flatpak;permeso;agordo;"
+
 #: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Fono"
@@ -74,71 +384,64 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Etendi"
 
-#: panels/background/cc-background-chooser-dialog.c:424
+#: panels/background/cc-background-chooser-dialog.c:412
 msgid "Wallpapers"
 msgstr "Ekranfonoj"
 
-#: panels/background/cc-background-chooser-dialog.c:433
+#: panels/background/cc-background-chooser-dialog.c:423
 msgid "Colors"
 msgstr "Koloroj"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: panels/background/cc-background-chooser-dialog.c:468
+#: panels/background/cc-background-chooser-dialog.c:455
 msgid "Select Background"
 msgstr "Elekti fonon"
 
-#: panels/background/cc-background-chooser-dialog.c:496
+#: panels/background/cc-background-chooser-dialog.c:484
 msgid "Pictures"
 msgstr "Bildoj"
 
 #. translators: No pictures were found
-#: panels/background/cc-background-chooser-dialog.c:528
+#: panels/background/cc-background-chooser-dialog.c:519
 msgid "No Pictures Found"
 msgstr "Neniuj bildoj trovitaj"
 
-#. 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:545
-#: panels/search/cc-search-locations-dialog.c:286
-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:555
+#: panels/background/cc-background-chooser-dialog.c:546
 #, 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 kaj ili montriĝos ĉi tie"
 
-#: panels/background/cc-background-chooser-dialog.c:560
+#: panels/background/cc-background-chooser-dialog.c:550
 #: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
-#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/cc-language-chooser.ui:23
-#: panels/display/cc-display-panel.c:1935
+#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:2061
 #: panels/network/connection-editor/connection-editor.ui:15
 #: panels/network/connection-editor/vpn-helpers.c:181
 #: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1413 panels/network/net-device-wifi.c:1493
-#: panels/network/net-device-wifi.c:1742 panels/network/network-wifi.ui:24
+#: panels/network/net-device-wifi.c:1200 panels/network/net-device-wifi.c:1280
+#: panels/network/net-device-wifi.c:1474 panels/network/network-wifi.ui:24
 #: panels/printers/new-printer-dialog.ui:45
 #: panels/printers/pp-details-dialog.c:330
-#: panels/privacy/cc-privacy-panel.c:1050 panels/region/cc-format-chooser.ui:24
-#: panels/region/input-chooser.ui:13
-#: panels/search/cc-search-locations-dialog.c:603
+#: panels/privacy/cc-privacy-panel.c:1123 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:607
 #: panels/sharing/cc-sharing-panel.c:427
-#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/user-accounts/cc-add-user-dialog.ui:28
+#: panels/user-accounts/cc-avatar-chooser.c:144
+#: panels/user-accounts/cc-avatar-chooser.c:272
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:654
 #: panels/user-accounts/data/join-dialog.ui:20
-#: panels/user-accounts/data/password-dialog.ui:21
 #: panels/user-accounts/um-fingerprint-dialog.c:261
-#: panels/user-accounts/um-photo-dialog.c:103
-#: panels/user-accounts/um-photo-dialog.c:230
-#: panels/user-accounts/um-user-panel.c:631
-#: panels/user-accounts/um-user-panel.c:649
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: panels/background/cc-background-chooser-dialog.c:561
+#: panels/background/cc-background-chooser-dialog.c:551
+#: panels/common/cc-language-chooser.ui:12
 msgid "_Select"
 msgstr "_Elekti"
 
@@ -179,46 +482,46 @@ msgstr "preferences-desktop-wallpaper"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Ekranfono;Ekrano;Labortablo;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:266
-msgid "Turn Off Airplane Mode"
-msgstr "Malŝalti aviadilan reĝimon"
-
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "Ne trovis Bludenton"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Konektu ricevilon por uzi Bludenton."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
 msgstr "Bludento estas malŝaltita"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Ŝaltu por konekti aparatojn kaj ricevi transmetadon de dosieroj."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "Aviadila reĝimo estas ŝaltita"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bludento estas malŝaltita dum aviadila reĝimo."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "Aparata aviadila reĝimo estas ŝaltita"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Malŝaltu aviadilan reĝimon por ŝalti Bludenton."
 
+#: panels/bluetooth/cc-bluetooth-panel.c:324
+msgid "Turn Off Airplane Mode"
+msgstr "Malŝalti aviadilan reĝimon"
+
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
 #: panels/network/cc-network-panel.ui:101
-#: panels/printers/pp-new-printer-dialog.c:1831
+#: panels/printers/pp-new-printer-dialog.c:1805
 msgid "Bluetooth"
 msgstr "Bludento"
 
@@ -299,7 +602,7 @@ msgstr "Plenumita!"
 #. * the translated (or untranslated) error string after this
 #: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
-msgstr "Kalibro malsukcesis!"
+msgstr "Laŭnormigo malsukcesis!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
 #: panels/color/cc-color-calibrate.c:468
@@ -473,166 +776,65 @@ msgstr "La mezurilo ne subtenas presilprofiladon."
 msgid "The device type is not currently supported."
 msgstr "La aparatspeco ne estas aktuale subtenita."
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: panels/color/cc-color-profile.c:100
-msgid "Standard Space"
-msgstr "Norma spaco"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: panels/color/cc-color-profile.c:106
-msgid "Test Profile"
-msgstr "Testprofilo"
-
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:114
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "Aŭtomate"
-
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: panels/color/cc-color-profile.c:124
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "Malalta kvalito"
-
-#. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:129
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "Meza kvalito"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: panels/color/cc-color-profile.c:136
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "Alta kvalito"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:153
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "Implicita RVB"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:160
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "Implicita CMFN"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:167
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "Implicita grizo"
-
-# Mi supozas, ke ĝi devus diri "vendor-supplied". --Carmen
-#: panels/color/cc-color-profile.c:190
-msgid "Vendor supplied factory calibration data"
-msgstr "Fabrikajn alĝustigo-datumojn provizigita de vendisto"
-
-#: panels/color/cc-color-profile.c:199
-msgid "Full-screen display correction not possible with this profile"
-msgstr "Tutekrana ekran-ĝustigo ne eblas je ĉi tiu profilo"
-
-#: panels/color/cc-color-profile.c:221
-msgid "This profile may no longer be accurate"
-msgstr "La profilo eble ne plu estas akurata"
-
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "Ekran-alĝustigo"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "_Startigi"
-
-#. This resumes the calibration process
-#: panels/color/color-calibrate.ui:54
-msgid "_Resume"
-msgstr "Daŭ_rigi"
-
-#. This button returns the user back to the color control panel
-#: panels/color/color-calibrate.ui:67 panels/common/cc-language-chooser.ui:11
-#: panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "_Plenumita"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:47
 msgid "Screen Calibration"
 msgstr "Ekran-alĝustigo"
 
-#: panels/color/color.ui:23
+#: panels/color/cc-color-panel.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
 msgstr ""
-"Kalibro generos profilon, kiun vi povas uzi por administri koloron de via "
+"Laŭnormigo generos profilon, kiun vi povas uzi por administri koloron de via "
 "ekrano. Ju pli da alĝustigodaŭro, des pli bona kvalito de la kolorprofilo."
 
-#: panels/color/color.ui:38
+#: panels/color/cc-color-panel.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "Vi ne povos uzi vian komputilon dum alĝustigado."
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:58
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "Kvalito"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:75
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "Proksimuma tempo"
 
-#: panels/color/color.ui:121
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
-msgstr "Kalibro-kvalito"
+msgstr "Laŭnormigo-kvalito"
 
-#: panels/color/color.ui:137
+#: panels/color/cc-color-panel.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "Elektu la sentilan aparaton, kiun vi volas uzi por alĝustigo."
 
-#: panels/color/color.ui:174
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
-msgstr "Kalibro-aparato"
+msgstr "Laŭnormigo-aparato"
 
-#: panels/color/color.ui:189
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Elektu la tipon de la konektita ekrano."
 
-#: panels/color/color.ui:226
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "Ekranspeco"
 
-#: panels/color/color.ui:241
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 msgstr ""
 
-#: panels/color/color.ui:278
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "Profila blanko-punkto"
 
-#: panels/color/color.ui:293
+#: panels/color/cc-color-panel.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
@@ -640,7 +842,7 @@ msgstr ""
 "Bonvolu fiksi la helecon de la ekrano je normala nivelo por vi. "
 "Koloradministro estos tre akurata je ĉi tiun nivelon."
 
-#: panels/color/color.ui:307
+#: panels/color/cc-color-panel.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -648,11 +850,11 @@ msgstr ""
 "Alternative, vi povas uzi la heleconivelon uzita je alia profilo por tiu ĉi "
 "aparato."
 
-#: panels/color/color.ui:318
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "Heleco de ekrano"
 
-#: panels/color/color.ui:333
+#: panels/color/cc-color-panel.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -660,35 +862,35 @@ msgstr ""
 "Vi povas uzi kolorprofilon en malsamaj komputiloj, aŭ eĉ krei profilojn por "
 "malsamaj lumaj kondiĉoj."
 
-#: panels/color/color.ui:348
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "Profilnomo:"
 
-#: panels/color/color.ui:377
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "Profilnomo"
 
-#: panels/color/color.ui:392
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "Sukcese kreis profilon!"
 
-#: panels/color/color.ui:443
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "Kopii profilon"
 
-#: panels/color/color.ui:456
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
 msgstr "Necesas skribeblan datumportilon"
 
-#: panels/color/color.ui:519
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "Alŝuti profilon"
 
-#: panels/color/color.ui:532
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "Necesas interretan konekton"
 
-#: panels/color/color.ui:591
+#: panels/color/cc-color-panel.ui:591
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -698,26 +900,28 @@ msgstr ""
 "\">GNU/Linukso</a>, <a href=\"osx\">Apple OS X</a> kaj <a href=\"windows"
 "\">Microsoft Vindozo</a> vi eble taksas utilaj."
 
-#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "Resumo"
 
-#: panels/color/color.ui:621
+#: panels/color/cc-color-panel.ui:621
 msgid "Add Profile"
 msgstr "Aldoni profilon"
 
-#: panels/color/color.ui:643
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "E_nporti dosieron…"
 
-#: panels/color/color.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:519
-#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
-#: panels/user-accounts/data/account-dialog.ui:47
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:517
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "_Aldoni"
 
-#: panels/color/color.ui:732
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -725,171 +929,266 @@ msgstr ""
 "Detektis problemojn. La profilo eble ne funkcios korekte. <a href="
 "\"\">Montri detalojn.</a>"
 
-#: panels/color/color.ui:811
+#: panels/color/cc-color-panel.ui:811
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
 "Ĉiu aparato necesas ĝisdatigan kolorprofilon antaŭ ol oni povas "
 "kolormastrumi ĝin."
 
-#: panels/color/color.ui:833
+#: panels/color/cc-color-panel.ui:833
 msgid "Learn more"
 msgstr "Lernu pli"
 
-#: panels/color/color.ui:838
+#: panels/color/cc-color-panel.ui:838
 msgid "Learn more about color management"
 msgstr "Lernu pli pri kolormastrumado"
 
-#: panels/color/color.ui:886
+#: panels/color/cc-color-panel.ui:886
 msgid "_Set for all users"
 msgstr "_Agordi por ĉiuj uzantoj"
 
-#: panels/color/color.ui:890 panels/color/color.ui:905
-#: panels/color/color.ui:906
+#: panels/color/cc-color-panel.ui:890 panels/color/cc-color-panel.ui:905
+#: panels/color/cc-color-panel.ui:906
 msgid "Set this profile for all users on this computer"
 msgstr "Agordi ĉi tiun profilon por ĉiuj uzantoj de tiu ĉi komputilo"
 
-#: panels/color/color.ui:901
+#: panels/color/cc-color-panel.ui:901
 msgid "_Enable"
 msgstr "Ŝa_lti"
 
-#: panels/color/color.ui:932
+#: panels/color/cc-color-panel.ui:932
 msgid "_Add profile"
 msgstr "_Aldoni profilon"
 
-#: panels/color/color.ui:945
+#: panels/color/cc-color-panel.ui:945
 msgid "_Calibrate…"
-msgstr "_Kalibri…"
+msgstr "_Laŭnormigi…"
 
-#: panels/color/color.ui:949
+#: panels/color/cc-color-panel.ui:949
 msgid "Calibrate the device"
 msgstr "Alĝustigi la aparaton"
 
-#: panels/color/color.ui:960
+#: panels/color/cc-color-panel.ui:960
 msgid "_Remove profile"
 msgstr "Fo_rigi profilon"
 
-#: panels/color/color.ui:973
+#: panels/color/cc-color-panel.ui:973
 msgid "_View details"
 msgstr "_Montri detalojn"
 
-#: panels/color/color.ui:1009
+#: panels/color/cc-color-panel.ui:1009
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Oni ne povas detekti kolormastrumeblan aparaton"
 
-#: panels/color/color.ui:1053
+#: panels/color/cc-color-panel.ui:1053
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/color.ui:1058
+#: panels/color/cc-color-panel.ui:1058
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/color.ui:1063
+#: panels/color/cc-color-panel.ui:1063
 msgid "CRT"
 msgstr "KRT"
 
-#: panels/color/color.ui:1068
+#: panels/color/cc-color-panel.ui:1068
 msgid "Projector"
 msgstr "Projekciilo"
 
-#: panels/color/color.ui:1073
+#: panels/color/cc-color-panel.ui:1073
 msgid "Plasma"
 msgstr "Plasmo"
 
-#: panels/color/color.ui:1078
+#: panels/color/cc-color-panel.ui:1078
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL-a fonlumo)"
 
-#: panels/color/color.ui:1083
+#: panels/color/cc-color-panel.ui:1083
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RVB-LED-a fonlumo)"
 
-#: panels/color/color.ui:1088
+#: panels/color/cc-color-panel.ui:1088
 msgid "LCD (white LED backlight)"
 msgstr "LCD (blanka LED fonlumo)"
 
-#: panels/color/color.ui:1093
+#: panels/color/cc-color-panel.ui:1093
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "LCD de larĝa gamo (CCFL-a fonlumo)"
 
-#: panels/color/color.ui:1098
+#: panels/color/cc-color-panel.ui:1098
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "LCD de larĝa gamo (RVB-LED-a fonlumo)"
 
-#: panels/color/color.ui:1115
+#: panels/color/cc-color-panel.ui:1115
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Alta"
 
-#: panels/color/color.ui:1116
+#: panels/color/cc-color-panel.ui:1116
 msgid "40 minutes"
 msgstr "40 minutoj"
 
-#: panels/color/color.ui:1120
+#: panels/color/cc-color-panel.ui:1120
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Meza"
 
-#: panels/color/color.ui:1121 panels/power/power.ui:25
-#: panels/privacy/privacy.ui:38
+#: panels/color/cc-color-panel.ui:1121
 msgid "30 minutes"
 msgstr "30 minutoj"
 
-#: panels/color/color.ui:1125
+#: panels/color/cc-color-panel.ui:1125
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Malalta"
 
-#: panels/color/color.ui:1126 panels/power/power.ui:13 panels/power/power.ui:95
+#: panels/color/cc-color-panel.ui:1126
 msgid "15 minutes"
 msgstr "15 minutoj"
 
-#: panels/color/color.ui:1148
+#: panels/color/cc-color-panel.ui:1148
 msgid "Native to display"
 msgstr "Indiĝena al ekrano"
 
-#: panels/color/color.ui:1152
+#: panels/color/cc-color-panel.ui:1152
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Presado kaj eldonado)"
 
-#: panels/color/color.ui:1156
+#: panels/color/cc-color-panel.ui:1156
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/color.ui:1160
+#: panels/color/cc-color-panel.ui:1160
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Fotografio kaj grafiko)"
 
-#: panels/color/color.ui:1164
+#: panels/color/cc-color-panel.ui:1164
 msgid "D75"
 msgstr "D75"
 
-#: panels/color/gnome-color-panel.desktop.in.in:3
-msgid "Color"
-msgstr "Koloro"
-
-#: panels/color/gnome-color-panel.desktop.in.in:4
-msgid ""
-"Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr ""
-"Alĝustigi la koloron de viaj aparatoj, kiel ekranoj, fotiloj aŭ presiloj"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "Norma spaco"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/color/gnome-color-panel.desktop.in.in:7
-msgid "preferences-color"
-msgstr "preferences-color"
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: panels/color/cc-color-profile.c:106
+msgid "Test Profile"
+msgstr "Testprofilo"
 
-#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/color/gnome-color-panel.desktop.in.in:19
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr "Koloro;ICC;Profilo;Alĝustigi;Presilo;Ekrano;"
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Aŭtomate"
+
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Malalta kvalito"
+
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Meza kvalito"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:136
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "Alta kvalito"
+
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:153
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "Implicita RVB"
+
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:160
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "Implicita CMFN"
+
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "Implicita grizo"
+
+# Mi supozas, ke ĝi devus diri "vendor-supplied". --Carmen
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "Fabrikajn alĝustigo-datumojn provizigita de vendisto"
+
+#: panels/color/cc-color-profile.c:199
+msgid "Full-screen display correction not possible with this profile"
+msgstr "Tutekrana ekran-ĝustigo ne eblas je ĉi tiu profilo"
+
+#: panels/color/cc-color-profile.c:221
+msgid "This profile may no longer be accurate"
+msgstr "La profilo eble ne plu estas akurata"
+
+#: panels/color/color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "Ekran-alĝustigo"
+
+#. This starts the calibration process
+#: panels/color/color-calibrate.ui:40
+msgid "_Start"
+msgstr "_Startigi"
+
+#. This resumes the calibration process
+#: panels/color/color-calibrate.ui:54
+msgid "_Resume"
+msgstr "Daŭ_rigi"
+
+#. This button returns the user back to the color control panel
+#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
+msgid "_Done"
+msgstr "_Plenumita"
+
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "Koloro"
+
+#: panels/color/gnome-color-panel.desktop.in.in:4
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr ""
+"Alĝustigi la koloron de viaj aparatoj, kiel ekranoj, fotiloj aŭ presiloj"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr "Koloro;ICC;Profilo;Alĝustigi;Presilo;Ekrano;"
 
 #: panels/common/cc-common-language.c:300
 msgid "Other…"
 msgstr "Alia…"
 
-#: panels/common/cc-language-chooser.c:126
-#: panels/region/cc-format-chooser.c:261 panels/region/cc-input-chooser.c:168
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:268 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "Pli…"
 
@@ -898,8 +1197,8 @@ msgid "No languages found"
 msgstr "Neniuj lingvoj trovitaj"
 
 #: panels/common/cc-language-chooser.ui:5
-msgid "Language"
-msgstr "Lingvo"
+msgid "Select Language"
+msgstr "Elekti lingvon"
 
 #: panels/common/cc-util.c:127
 #: panels/network/connection-editor/ce-page-details.c:106
@@ -943,17 +1242,17 @@ msgid "Year"
 msgstr "Jaro"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:326
+#: panels/datetime/cc-datetime-panel.c:332
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%-e-a de %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:331
+#: panels/datetime/cc-datetime-panel.c:337
 msgid "%e %B %Y, %R"
 msgstr "%-e-a de %B %Y, %R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:496
+#: panels/datetime/cc-datetime-panel.c:502
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -961,7 +1260,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:529
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -969,131 +1268,139 @@ 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:530
+#: panels/datetime/cc-datetime-panel.c:536
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:535
+#: panels/datetime/cc-datetime-panel.c:541
 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:540
+#: panels/datetime/cc-datetime-panel.c:546
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:545
+#: panels/datetime/cc-datetime-panel.c:551
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/datetime.ui:22
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "Januaro"
 
-#: panels/datetime/datetime.ui:25
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "Februaro"
 
-#: panels/datetime/datetime.ui:28
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "Marto"
 
-#: panels/datetime/datetime.ui:31
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "Aprilo"
 
-#: panels/datetime/datetime.ui:34
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "Majo"
 
-#: panels/datetime/datetime.ui:37
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "Junio"
 
-#: panels/datetime/datetime.ui:40
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "Julio"
 
-#: panels/datetime/datetime.ui:43
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "Aŭgusto"
 
-#: panels/datetime/datetime.ui:46
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "Septembro"
 
-#: panels/datetime/datetime.ui:49
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "Oktobro"
 
-#: panels/datetime/datetime.ui:52
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "Novembro"
 
-#: panels/datetime/datetime.ui:55
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "Decembro"
 
-#: panels/datetime/datetime.ui:61
+#: panels/datetime/cc-datetime-panel.ui:65
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "Dato & horo"
 
-#: panels/datetime/datetime.ui:109
+#: panels/datetime/cc-datetime-panel.ui:113
+#: panels/display/cc-night-light-dialog.ui:245
+#: panels/display/cc-night-light-dialog.ui:352
 msgid "Hour"
 msgstr "Horo"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/datetime.ui:124
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
 msgstr "∶"
 
-#: panels/datetime/datetime.ui:148
+#: panels/datetime/cc-datetime-panel.ui:152
+#: panels/display/cc-night-light-dialog.ui:273
+#: panels/display/cc-night-light-dialog.ui:380
 msgid "Minute"
 msgstr "Minuto"
 
-#: panels/datetime/datetime.ui:215
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "Horzono"
 
-#: panels/datetime/datetime.ui:236
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "Serĉi urbon"
 
-#: panels/datetime/datetime.ui:318
+#: panels/datetime/cc-datetime-panel.ui:322
 msgid "Automatic _Date & Time"
 msgstr "Aŭtomata _dato & horo"
 
-#: panels/datetime/datetime.ui:333 panels/datetime/datetime.ui:411
+#: panels/datetime/cc-datetime-panel.ui:337
 msgid "Requires internet access"
 msgstr "Bezonas interretan atingon"
 
-#: panels/datetime/datetime.ui:396
+#: panels/datetime/cc-datetime-panel.ui:400
 msgid "Automatic Time _Zone"
 msgstr "Aŭtomata hor_zono"
 
-#: panels/datetime/datetime.ui:468
+#: panels/datetime/cc-datetime-panel.ui:415
+msgid "Requires location services enabled and internet access"
+msgstr "Bezonas lokado-servojn kaj interretan atingon"
+
+#: panels/datetime/cc-datetime-panel.ui:472
 msgid "Date & _Time"
 msgstr "Dato & _horo"
 
-#: panels/datetime/datetime.ui:516
+#: panels/datetime/cc-datetime-panel.ui:520
 msgid "Time Z_one"
 msgstr "Horz_ono"
 
-#: panels/datetime/datetime.ui:586
+#: panels/datetime/cc-datetime-panel.ui:590
 msgid "Time _Format"
 msgstr "Tempo-_formo"
 
-#: panels/datetime/datetime.ui:605
+#: panels/datetime/cc-datetime-panel.ui:609
 msgid "24-hour"
 msgstr "24-hora"
 
-#: panels/datetime/datetime.ui:606
+#: panels/datetime/cc-datetime-panel.ui:610
 msgid "AM / PM"
 msgstr "ATM / PTM"
 
@@ -1119,58 +1426,58 @@ 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:524
+#: panels/display/cc-display-panel.c:535
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "Pejzaĝo"
 
-#: panels/display/cc-display-panel.c:527
+#: panels/display/cc-display-panel.c:538
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "Portreto dekstra"
 
-#: panels/display/cc-display-panel.c:530
+#: panels/display/cc-display-panel.c:541
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "Portreto maldekstra"
 
-#: panels/display/cc-display-panel.c:533
+#: panels/display/cc-display-panel.c:544
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "Pejzaĝo (renversita)"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:601
-#: panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:617
+#: panels/printers/pp-options-dialog.c:560
 msgid "Orientation"
 msgstr "Orientiĝo"
 
-#: panels/display/cc-display-panel.c:690 panels/display/cc-display-panel.c:1461
+#: panels/display/cc-display-panel.c:712 panels/display/cc-display-panel.c:1545
 #: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: panels/display/cc-display-panel.c:777
+#: panels/display/cc-display-panel.c:806
 msgid "Refresh Rate"
 msgstr "Ofteco de aktualigo"
 
-#: panels/display/cc-display-panel.c:919
+#: panels/display/cc-display-panel.c:950
 msgid "Scale"
 msgstr "Skali"
 
-#: panels/display/cc-display-panel.c:970
+#: panels/display/cc-display-panel.c:1001
 msgid "Adjust for TV"
 msgstr "Ĝustigi por televizio"
 
-#: panels/display/cc-display-panel.c:1205
+#: panels/display/cc-display-panel.c:1258
 msgid "Primary Display"
 msgstr "Ĉefa ekrano"
 
-#: panels/display/cc-display-panel.c:1233
+#: panels/display/cc-display-panel.c:1292
 msgid "Display Arrangement"
 msgstr "Aranĝo de ekranoj"
 
-#: panels/display/cc-display-panel.c:1234
+#: panels/display/cc-display-panel.c:1293
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
@@ -1178,50 +1485,50 @@ msgstr ""
 "Tiru ekranoj por kongrui vian agordaĵo. La supra breto lokiĝas sur la ĉefa "
 "ekrano."
 
-#: panels/display/cc-display-panel.c:1648
+#: panels/display/cc-display-panel.c:1747
 msgid "Display Mode"
 msgstr "Reĝimo de ekrano"
 
-#: panels/display/cc-display-panel.c:1664
+#: panels/display/cc-display-panel.c:1768
 msgid "Join Displays"
 msgstr "Kunigi ekranojn"
 
-#: panels/display/cc-display-panel.c:1667
+#: panels/display/cc-display-panel.c:1771
 msgid "Mirror"
 msgstr "Speguli"
 
-#: panels/display/cc-display-panel.c:1670
+#: panels/display/cc-display-panel.c:1774
 msgid "Single Display"
 msgstr "Unuobla ekrano"
 
-#: panels/display/cc-display-panel.c:1945
+#: panels/display/cc-display-panel.c:2072
 #: panels/network/connection-editor/connection-editor.ui:24
 #: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Apliki"
 
-#: panels/display/cc-display-panel.c:1967
+#: panels/display/cc-display-panel.c:2093
 msgid "Apply Changes?"
 msgstr "Ĉu apliki ŝanĝojn?"
 
-#: panels/display/cc-display-panel.c:1972
+#: panels/display/cc-display-panel.c:2098
 msgid "Changes Cannot be Applied"
 msgstr "Ne eblas apliki ŝanĝojn"
 
-#: panels/display/cc-display-panel.c:1973
+#: panels/display/cc-display-panel.c:2099
 msgid "This could be due to hardware limitations."
 msgstr "Ĉi tiu eblus pro aparataj limigoj."
 
-#: panels/display/cc-display-panel.c:2104
+#: panels/display/cc-display-panel.c:2230
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:2276
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2047 panels/power/cc-power-panel.c:2054
-#: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+#: panels/display/cc-display-panel.c:2402
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2111 panels/power/cc-power-panel.c:2118
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:279
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
@@ -1230,27 +1537,31 @@ msgstr "%.2lf Hz"
 msgid "On"
 msgstr "Ŝaltita"
 
-#: panels/display/cc-display-panel.c:2276 panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2041 panels/power/cc-power-panel.c:2052
-#: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+#: panels/display/cc-display-panel.c:2402 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2105 panels/power/cc-power-panel.c:2116
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:279
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
 #: panels/universal-access/cc-ua-panel.c:866
 #: panels/universal-access/cc-ua-panel.c:1031
-#: panels/universal-access/uap.ui:338 panels/universal-access/uap.ui:384
-#: panels/universal-access/uap.ui:430 panels/universal-access/uap.ui:536
-#: panels/universal-access/uap.ui:689 panels/universal-access/uap.ui:735
-#: panels/universal-access/uap.ui:781 panels/universal-access/uap.ui:933
+#: panels/universal-access/cc-ua-panel.ui:338
+#: panels/universal-access/cc-ua-panel.ui:384
+#: panels/universal-access/cc-ua-panel.ui:430
+#: panels/universal-access/cc-ua-panel.ui:536
+#: panels/universal-access/cc-ua-panel.ui:689
+#: panels/universal-access/cc-ua-panel.ui:735
+#: panels/universal-access/cc-ua-panel.ui:781
+#: panels/universal-access/cc-ua-panel.ui:933
 msgid "Off"
 msgstr "Malŝaltita"
 
-#: panels/display/cc-display-panel.c:2296
+#: panels/display/cc-display-panel.c:2423
 msgid "_Night Light"
 msgstr "_Noktlumo"
 
-#: panels/display/cc-display-panel.c:2357
+#: panels/display/cc-display-panel.c:2488
 msgid "Could not get screen information"
 msgstr "Ne eblis akiri informojn pri ekrano"
 
@@ -1272,54 +1583,61 @@ msgstr ""
 "Noktlumo varmigas la koloron de la ekrano. Ĉi tiu povas antaŭmalhelpi "
 "streĉiĝon de okuloj kaj sendormecon."
 
-#. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-night-light-dialog.ui:128
-#: panels/display/cc-night-light-dialog.ui:465
-msgid "Night Light"
-msgstr "Noktlumo"
-
-#: panels/display/cc-night-light-dialog.ui:144
+#: panels/display/cc-night-light-dialog.ui:127
 msgid "Schedule"
 msgstr "Tempoplano"
 
-#: panels/display/cc-night-light-dialog.ui:173
+#: panels/display/cc-night-light-dialog.ui:148
 msgid "Sunset to Sunrise"
 msgstr "De sunsubiro ĝis sunleviĝo"
 
-#: panels/display/cc-night-light-dialog.ui:188
+#: panels/display/cc-night-light-dialog.ui:164
 #: panels/network/connection-editor/ip4-page.ui:69
 #: panels/network/connection-editor/ip6-page.ui:83
 #: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
 #: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
-#: panels/privacy/cc-privacy-panel.c:219
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Manual"
 msgstr "Permane"
 
-#: panels/display/cc-night-light-dialog.ui:223
+#: panels/display/cc-night-light-dialog.ui:180
+msgid "_Off"
+msgstr "_Malŝaltita"
+
+#: panels/display/cc-night-light-dialog.ui:216
 msgid "From"
 msgstr "De"
 
-#: panels/display/cc-night-light-dialog.ui:255
-#: panels/display/cc-night-light-dialog.ui:352
+#: panels/display/cc-night-light-dialog.ui:254
+#: panels/display/cc-night-light-dialog.ui:361
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-dialog.ui:280
-#: panels/display/cc-night-light-dialog.ui:377
+#: panels/display/cc-night-light-dialog.ui:284
+#: panels/display/cc-night-light-dialog.ui:391
 msgid "AM"
 msgstr "ATM"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-dialog.ui:296
-#: panels/display/cc-night-light-dialog.ui:393
+#: panels/display/cc-night-light-dialog.ui:300
+#: panels/display/cc-night-light-dialog.ui:407
 msgid "PM"
 msgstr "PTM"
 
-#: panels/display/cc-night-light-dialog.ui:435
+#: panels/display/cc-night-light-dialog.ui:449
 msgid "To"
 msgstr "Al"
 
+#: panels/display/cc-night-light-dialog.ui:470
+msgid "Color Temperature"
+msgstr "Kolora temperaturo"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-night-light-dialog.ui:505
+msgid "Night Light"
+msgstr "Noktlumo"
+
 #: panels/display/gnome-display-panel.desktop.in.in:3
 msgid "Displays"
 msgstr "Ekranoj"
@@ -1342,6 +1660,31 @@ msgstr ""
 "Panelo;Projekciilo;xrandr;Ekrano;Distingivo;Aktualigi;Ekrano;Nokto;Lumo;Blua;"
 "redshift;koloro;sunsubiro;sunleviĝo;"
 
+#: panels/info/cc-info-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Reto"
+
+#: panels/info/cc-info-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "Ret_poŝto"
+
+#: panels/info/cc-info-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "_Kalendaro"
+
+#: panels/info/cc-info-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "M_uziko"
+
+#: panels/info/cc-info-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "_Video"
+
+#: panels/info/cc-info-default-apps-panel.ui:162
+#: panels/info/cc-info-removable-media-panel.ui:161
+msgid "_Photos"
+msgstr "_Fotoj"
+
 #. TRANSLATORS: AP type
 #: panels/info/cc-info-overview-panel.c:374
 #: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
@@ -1374,6 +1717,48 @@ msgstr "32-bita"
 msgid "Version %s"
 msgstr "Versio %s"
 
+#: panels/info/cc-info-overview-panel.ui:58
+msgid "Device name"
+msgstr "Aparatnomo"
+
+#: panels/info/cc-info-overview-panel.ui:74
+msgid "Memory"
+msgstr "Memoro"
+
+#: panels/info/cc-info-overview-panel.ui:90
+msgid "Processor"
+msgstr "Procezoro"
+
+#: panels/info/cc-info-overview-panel.ui:106
+msgid "Graphics"
+msgstr "Grafikoj"
+
+#. To translators: this field contains the distro name and version
+#: panels/info/cc-info-overview-panel.ui:121
+msgid "OS name"
+msgstr "Nomo de operaciumo"
+
+#. To translators: this field contains the distro type
+#: panels/info/cc-info-overview-panel.ui:137
+msgid "OS type"
+msgstr "Tipo de operaciumo"
+
+#: panels/info/cc-info-overview-panel.ui:153
+msgid "Virtualization"
+msgstr "Virtualigado"
+
+#: panels/info/cc-info-overview-panel.ui:169
+msgid "Disk"
+msgstr "Disko"
+
+#: panels/info/cc-info-overview-panel.ui:274
+msgid "Calculating…"
+msgstr "Kalkulanta…"
+
+#: panels/info/cc-info-overview-panel.ui:314
+msgid "Check for updates"
+msgstr "Serĉi por ĝisdatigoj"
+
 #: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "Demandi kion fari"
@@ -1463,6 +1848,46 @@ msgstr "Video-KD"
 msgid "Windows software"
 msgstr "Windows-programaro"
 
+#: panels/info/cc-info-removable-media-panel.ui:43
+msgid "Select how media should be handled"
+msgstr "Elektu kiel datumportiloj estu traktitaj"
+
+#: panels/info/cc-info-removable-media-panel.ui:74
+msgid "CD _audio"
+msgstr "_Son-KD"
+
+#: panels/info/cc-info-removable-media-panel.ui:91
+msgid "_DVD video"
+msgstr "_DVD-video"
+
+#: panels/info/cc-info-removable-media-panel.ui:132
+msgid "_Music player"
+msgstr "_Muzikludilo"
+
+#: panels/info/cc-info-removable-media-panel.ui:190
+msgid "_Software"
+msgstr "_Programaro"
+
+#: panels/info/cc-info-removable-media-panel.ui:228
+msgid "_Other Media…"
+msgstr "_Aliaj datumportiloj…"
+
+#: panels/info/cc-info-removable-media-panel.ui:272
+msgid "_Never prompt or start programs on media insertion"
+msgstr "_Neniam lanĉi programarojn dum enmeto de datumportilo"
+
+#: panels/info/cc-info-removable-media-panel.ui:331
+msgid "Select how other media should be handled"
+msgstr "Elektu kiel aliaj datumportiloj estu traktitaj"
+
+#: panels/info/cc-info-removable-media-panel.ui:370
+msgid "_Action:"
+msgstr "_Ago:"
+
+#: panels/info/cc-info-removable-media-panel.ui:393
+msgid "_Type:"
+msgstr "_Speco:"
+
 #: panels/info/gnome-default-apps-panel.desktop.in.in:3
 msgid "Default Applications"
 msgstr "Implicitaj aplikaĵoj"
@@ -1529,159 +1954,54 @@ msgstr ""
 "aparato;sistemo;implicita;aplikaĵo;preferita;kd;dvd;usb;sono;video;disko;"
 "demetebla;datumportilo;aŭtomata;lanĉo;"
 
-#: panels/info/info-default-apps.ui:31
-msgid "_Web"
-msgstr "_Reto"
+#: panels/keyboard/00-multimedia.xml.in:2
+msgid "Sound and Media"
+msgstr "Sono kaj aŭdvidaĵoj"
 
-#: panels/info/info-default-apps.ui:43
-msgid "_Mail"
-msgstr "Ret_poŝto"
+#: panels/keyboard/00-multimedia.xml.in:4
+msgid "Volume mute"
+msgstr "Silentigi"
 
-#: panels/info/info-default-apps.ui:59
-msgid "_Calendar"
-msgstr "_Kalendaro"
+#: panels/keyboard/00-multimedia.xml.in:6
+msgid "Volume down"
+msgstr "Malplilaŭtigi"
 
-#: panels/info/info-default-apps.ui:75
-msgid "M_usic"
-msgstr "M_uziko"
+#: panels/keyboard/00-multimedia.xml.in:8
+msgid "Volume up"
+msgstr "Plilaŭtigi"
 
-#: panels/info/info-default-apps.ui:91
-msgid "_Video"
-msgstr "_Video"
+#: panels/keyboard/00-multimedia.xml.in:10
+msgid "Launch media player"
+msgstr "Lanĉi medioludilon"
 
-#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
-msgid "_Photos"
-msgstr "_Fotoj"
+#: panels/keyboard/00-multimedia.xml.in:12
+msgid "Play (or play/pause)"
+msgstr "Ludi (aŭ ludi/paŭzigi)"
 
-#: panels/info/info-overview.ui:58
-msgid "Device name"
-msgstr "Aparatnomo"
+#: panels/keyboard/00-multimedia.xml.in:14
+msgid "Pause playback"
+msgstr "Paŭzigi ludadon"
 
-#: panels/info/info-overview.ui:74
-msgid "Memory"
-msgstr "Memoro"
+#: panels/keyboard/00-multimedia.xml.in:16
+msgid "Stop playback"
+msgstr "Haltigi ludadon"
 
-#: panels/info/info-overview.ui:90
-msgid "Processor"
-msgstr "Procezoro"
+#: panels/keyboard/00-multimedia.xml.in:18
+msgid "Previous track"
+msgstr "Antaŭa trako"
 
-#: panels/info/info-overview.ui:106
-msgid "Graphics"
-msgstr "Grafikoj"
+#: panels/keyboard/00-multimedia.xml.in:20
+msgid "Next track"
+msgstr "Sekva trako"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/info-overview.ui:121
-msgid "OS name"
-msgstr "Nomo de operaciumo"
+#: panels/keyboard/00-multimedia.xml.in:22
+msgid "Eject"
+msgstr "Elĵeti"
 
-#. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
-msgid "OS type"
-msgstr "Tipo de operaciumo"
-
-#: panels/info/info-overview.ui:153
-msgid "Virtualization"
-msgstr "Virtualigado"
-
-#: panels/info/info-overview.ui:169
-msgid "Disk"
-msgstr "Disko"
-
-#: panels/info/info-overview.ui:274
-msgid "Calculating…"
-msgstr "Kalkulanta…"
-
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "Serĉi por ĝisdatigoj"
-
-#: panels/info/info-removable-media.ui:43
-msgid "Select how media should be handled"
-msgstr "Elektu kiel datumportiloj estu traktitaj"
-
-#: panels/info/info-removable-media.ui:74
-msgid "CD _audio"
-msgstr "_Son-KD"
-
-#: panels/info/info-removable-media.ui:91
-msgid "_DVD video"
-msgstr "_DVD-video"
-
-#: panels/info/info-removable-media.ui:132
-msgid "_Music player"
-msgstr "_Muzikludilo"
-
-#: panels/info/info-removable-media.ui:190
-msgid "_Software"
-msgstr "_Programaro"
-
-#: panels/info/info-removable-media.ui:228
-msgid "_Other Media…"
-msgstr "_Aliaj datumportiloj…"
-
-#: panels/info/info-removable-media.ui:272
-msgid "_Never prompt or start programs on media insertion"
-msgstr "_Neniam lanĉi programarojn dum enmeto de datumportilo"
-
-#: panels/info/info-removable-media.ui:331
-msgid "Select how other media should be handled"
-msgstr "Elektu kiel aliaj datumportiloj estu traktitaj"
-
-#: panels/info/info-removable-media.ui:370
-msgid "_Action:"
-msgstr "_Ago:"
-
-#: panels/info/info-removable-media.ui:393
-msgid "_Type:"
-msgstr "_Speco:"
-
-#: panels/keyboard/00-multimedia.xml.in:2
-msgid "Sound and Media"
-msgstr "Sono kaj aŭdvidaĵoj"
-
-#: panels/keyboard/00-multimedia.xml.in:4
-msgid "Volume mute"
-msgstr "Silentigi"
-
-#: panels/keyboard/00-multimedia.xml.in:6
-msgid "Volume down"
-msgstr "Malplilaŭtigi"
-
-#: panels/keyboard/00-multimedia.xml.in:8
-msgid "Volume up"
-msgstr "Plilaŭtigi"
-
-#: panels/keyboard/00-multimedia.xml.in:10
-msgid "Launch media player"
-msgstr "Lanĉi medioludilon"
-
-#: panels/keyboard/00-multimedia.xml.in:12
-msgid "Play (or play/pause)"
-msgstr "Ludi (aŭ ludi/paŭzigi)"
-
-#: panels/keyboard/00-multimedia.xml.in:14
-msgid "Pause playback"
-msgstr "Paŭzigi ludadon"
-
-#: panels/keyboard/00-multimedia.xml.in:16
-msgid "Stop playback"
-msgstr "Haltigi ludadon"
-
-#: panels/keyboard/00-multimedia.xml.in:18
-msgid "Previous track"
-msgstr "Antaŭa trako"
-
-#: panels/keyboard/00-multimedia.xml.in:20
-msgid "Next track"
-msgstr "Sekva trako"
-
-#: panels/keyboard/00-multimedia.xml.in:22
-msgid "Eject"
-msgstr "Elĵeti"
-
-#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:580
-msgid "Typing"
-msgstr "Tajpado"
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:580
+msgid "Typing"
+msgstr "Tajpado"
 
 #: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
@@ -1699,12 +2019,6 @@ msgstr "Lanĉiloj"
 msgid "Launch help browser"
 msgstr "Lanĉi helpfoliumilon"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:251
-#: shell/cc-window.c:888 shell/cc-window.ui:124
-#: shell/gnome-control-center.desktop.in.in:3
-msgid "Settings"
-msgstr "Agordoj"
-
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Lanĉi kalkulilon"
@@ -1721,11 +2035,6 @@ msgstr "Lanĉi retumilon"
 msgid "Home folder"
 msgstr "Hejmdosierujo"
 
-#: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:156
-msgid "Search"
-msgstr "Serĉo"
-
 #: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Ekrankopioj"
@@ -1813,21 +2122,6 @@ msgstr "Ŝalti aŭ malŝalti altan kontraston"
 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:259
-#: panels/keyboard/cc-keyboard-option.c:378
-#: panels/keyboard/keyboard-shortcuts.c:425
-#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
-#: panels/user-accounts/um-fingerprint-dialog.c:211
-#: subprojects/gvc/gvc-mixer-control.c:1866
-msgid "Disabled"
-msgstr "Malŝaltita"
-
 #. Translators: This key is also known as 'third level
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
@@ -1871,10 +2165,31 @@ msgstr "Nuligi"
 msgid "Reset All"
 msgstr "Reagordi ĉiujn"
 
-#: panels/keyboard/cc-keyboard-panel.c:279
+#: panels/keyboard/cc-keyboard-panel.c:283
 msgid "Reset the shortcut to its default value"
 msgstr "Reŝargi la klavkombinon al ĝia implicita valoro"
 
+#: panels/keyboard/cc-keyboard-panel.ui:67 panels/region/cc-region-panel.ui:581
+#: shell/cc-window.ui:255
+msgid "Keyboard Shortcuts"
+msgstr "Klavkombinoj"
+
+#: panels/keyboard/cc-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "Reagordi ĉiujn…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Reagordi ĉiujn klavkombinojn al ĝiaj implicitaj klavkombinoj"
+
+#: panels/keyboard/cc-keyboard-panel.ui:164
+msgid "No keyboard shortcut found"
+msgstr "Ne povis trovi klavkombinon"
+
+#: panels/keyboard/cc-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
+msgid "Try a different search"
+msgstr "Provu alian serĉon"
+
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
@@ -1922,27 +2237,6 @@ msgstr ""
 "Klavkombino;Laborspaco;Fenestro;Aligrandigi;Zomi;Kontrasto;Enigo;Fonto;Ŝlosi;"
 "Laŭteco;"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
-#: shell/cc-application.c:252
-msgid "Keyboard Shortcuts"
-msgstr "Klavkombinoj"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:77
-msgid "Reset All…"
-msgstr "Reagordi ĉiujn…"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:78
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "Reagordi ĉiujn klavkombinojn al ĝiaj implicitaj klavkombinoj"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:164
-msgid "No keyboard shortcut found"
-msgstr "Ne povis trovi klavkombinon"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
-msgid "Try a different search"
-msgstr "Provu alian serĉon"
-
 #: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 msgstr ""
@@ -1991,7 +2285,7 @@ msgstr "Anstataŭigi"
 msgid "Set"
 msgstr "Agordi"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:427
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:448
 msgid "Test Your _Settings"
 msgstr "Testi viajn _agordojn"
 
@@ -2074,11 +2368,11 @@ msgstr "Tuŝplata rapideco"
 msgid "Tap to Click"
 msgstr "Frapeti por alklaki"
 
-#: panels/mouse/gnome-mouse-properties.ui:639
+#: panels/mouse/gnome-mouse-properties.ui:638
 msgid "Two-finger Scrolling"
 msgstr "Dufingra rulumado"
 
-#: panels/mouse/gnome-mouse-properties.ui:693
+#: panels/mouse/gnome-mouse-properties.ui:691
 msgid "Edge Scrolling"
 msgstr "Flanka rulumado"
 
@@ -2123,13 +2417,13 @@ msgstr "Retprokurilo"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
-#: panels/network/net-vpn.c:299
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:167
+#: panels/network/net-vpn.c:296
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPR"
 
-#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:320
+#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:303
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Ups, io fiaskis. Bonvolu kontakti vian programaran vendiston."
 
@@ -2138,7 +2432,7 @@ msgid "NetworkManager needs to be running."
 msgstr "NetworkManager devas esti rulanta."
 
 #: panels/network/cc-network-panel.ui:142
-#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/connection-editor/net-connection-editor.c:601
 msgid "VPN"
 msgstr "VPR"
 
@@ -2146,41 +2440,59 @@ msgstr "VPR"
 msgid "Not set up"
 msgstr "Ne agordita"
 
+#. TRANSLATORS: This happens when the connection name does not contain the SSID.
+#: panels/network/cc-wifi-connection-row.c:189
+#, c-format
+msgctxt "Wi-Fi Connection"
+msgid "%s (SSID: %s)"
+msgstr "%s (SSID: %s)"
+
+#: panels/network/cc-wifi-connection-row.ui:36
+msgid "Connection/SSID"
+msgstr "Konekto/SSID"
+
+#: panels/network/cc-wifi-connection-row.ui:73
+#: panels/network/net-device-ethernet.c:360
+#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394
+#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79
+msgid "Options…"
+msgstr "Agordoj…"
+
 #: panels/network/cc-wifi-panel.c:281
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1746
+#: panels/network/network-wifi.ui:1738
 msgid "Wi-Fi"
 msgstr "Vifio"
 
-#: panels/network/cc-wifi-panel.ui:73
+#: panels/network/cc-wifi-panel.ui:56
 msgid "Airplane Mode"
 msgstr "Aviadila reĝimo"
 
-#: panels/network/cc-wifi-panel.ui:88
+#: panels/network/cc-wifi-panel.ui:71
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Malŝaltas vifion, Bludenton kaj porteblan larĝkapacitan konekton"
 
-#: panels/network/cc-wifi-panel.ui:157
+#: panels/network/cc-wifi-panel.ui:140
 msgid "No Wi-Fi Adapter Found"
 msgstr "Neniu vifia adaptilo estas trovita"
 
-#: panels/network/cc-wifi-panel.ui:169
+#: panels/network/cc-wifi-panel.ui:152
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "Certigu, ke vi vifia adaptilo estas konektita kaj ŝaltita"
 
-#: panels/network/cc-wifi-panel.ui:204
+#: panels/network/cc-wifi-panel.ui:187
 msgid "Airplane Mode On"
 msgstr "Aviadila reĝimo estas ŝaltita"
 
-#: panels/network/cc-wifi-panel.ui:216
+#: panels/network/cc-wifi-panel.ui:199
 msgid "Turn off to use Wi-Fi"
 msgstr "Malŝalti por uzi vifion"
 
-#: panels/network/cc-wifi-panel.ui:242
+#: panels/network/cc-wifi-panel.ui:225
 msgid "Visible Networks"
 msgstr "Videblaj retoj"
 
-#: panels/network/cc-wifi-panel.ui:309
+#: panels/network/cc-wifi-panel.ui:292
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager devas esti rulanta"
 
@@ -2229,43 +2541,42 @@ msgstr "Profilo %d"
 
 #. TRANSLATORS: this WEP WiFi security
 #: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:236 panels/network/net-device-wifi.c:470
+#: panels/network/net-device-wifi.c:123 panels/network/net-device-wifi.c:299
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:240 panels/network/net-device-wifi.c:475
+#: panels/network/net-device-wifi.c:127 panels/network/net-device-wifi.c:304
 #: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:244
+#: panels/network/net-device-wifi.c:131
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:249
+#: panels/network/net-device-wifi.c:136
 msgid "Enterprise"
 msgstr "Enterpreno"
 
 #: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:254 panels/network/net-device-wifi.c:460
+#: panels/network/net-device-wifi.c:141 panels/network/net-device-wifi.c:289
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Neniu"
 
 #: panels/network/connection-editor/ce-page-details.c:95
-#: panels/power/power.ui:99
 msgid "Never"
 msgstr "Neniam"
 
 #: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:121
-#: panels/network/net-device-wifi.c:569
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:398
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2273,57 +2584,57 @@ msgstr[0] "Antaŭ %i tago"
 msgstr[1] "Antaŭ %i tagoj"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:225
-#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:648
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:476
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:677
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:505
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Nenia"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:679
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:507
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Malforta"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:681
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:509
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Sufiĉa"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:683
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:511
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Bona"
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:685
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:513
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Bonega"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:300
 msgid "Forget Connection"
 msgstr "Forgesi konekton"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Remove Connection Profile"
 msgstr "Forigi profilon de konekto"
 
-#: panels/network/connection-editor/ce-page-details.c:306
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove VPN"
 msgstr "Forigi VPR-on"
 
-#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/connection-editor/ce-page-details.c:332
 #: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:243
+#: shell/cc-window.c:279
 msgid "Details"
 msgstr "Detaloj"
 
@@ -2395,26 +2706,26 @@ msgid "Link speed"
 msgstr "Ligita rapido"
 
 #: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
 #: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4-adreso"
 
 #: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:155
-#: panels/network/net-device-ethernet.c:159
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-ethernet.c:175
 #: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
 #: panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6-adreso"
 
 #: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Aparatara adreso"
 
 #: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-ethernet.c:182
 #: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Defaŭlta kurso"
@@ -2422,7 +2733,7 @@ msgstr "Defaŭlta kurso"
 #: panels/network/connection-editor/details-page.ui:177
 #: panels/network/connection-editor/ip4-page.ui:197
 #: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:168
+#: panels/network/net-device-ethernet.c:184
 #: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
 #: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
@@ -2457,7 +2768,7 @@ msgstr "Konvena por konektoj, kiuj havas kostpagojn aŭ limojn por datumo."
 #: panels/network/connection-editor/ip6-page.ui:291
 #: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
 #: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:219
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Automatic"
 msgstr "Aŭtomata"
 
@@ -2547,7 +2858,7 @@ msgstr "Adresoj"
 #: panels/network/connection-editor/ip4-page.ui:313
 #: panels/network/connection-editor/ip6-page.ui:143
 #: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:87
+#: panels/printers/details-dialog.ui:89
 msgid "Address"
 msgstr "Adreso"
 
@@ -2617,11 +2928,11 @@ msgstr "Ne eblas malfermi konektan redaktilon"
 msgid "New Profile"
 msgstr "Nova profilo"
 
-#: panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:749
 msgid "Import from file…"
 msgstr "Importi de dosiero…"
 
-#: panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:783
 msgid "Add VPN"
 msgstr "Aldoni VPR-on"
 
@@ -2654,7 +2965,7 @@ msgstr "Elekti enportendan dosieron"
 #: panels/network/connection-editor/vpn-helpers.c:182
 #: panels/printers/pp-details-dialog.c:331
 #: panels/sharing/cc-sharing-panel.c:428
-#: panels/user-accounts/um-photo-dialog.c:231
+#: panels/user-accounts/cc-avatar-chooser.c:273
 msgid "_Open"
 msgstr "_Malfermi"
 
@@ -2705,11 +3016,6 @@ msgstr "_SSID"
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
-msgid "Network"
-msgstr "Reto"
-
 #: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Regi kiel vi konektas al la interreto"
@@ -2742,28 +3048,28 @@ msgstr "network-wireless"
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgstr "Reto;Sendrata;Vifio;IP;LAN;Larĝkapacita;DNS;"
 
-#: panels/network/net-device-ethernet.c:107
-#: panels/network/net-device-wifi.c:555
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:384
 msgid "never"
 msgstr "neniam"
 
-#: panels/network/net-device-ethernet.c:117
-#: panels/network/net-device-wifi.c:565
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:394
 msgid "today"
 msgstr "hodiaŭ"
 
-#: panels/network/net-device-ethernet.c:119
-#: panels/network/net-device-wifi.c:567
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:396
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: panels/network/net-device-ethernet.c:157
+#: panels/network/net-device-ethernet.c:173
 #: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
 #: panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP-adreso"
 
-#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Laste uzita"
 
@@ -2772,28 +3078,21 @@ msgstr "Laste uzita"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:276
+#: panels/network/net-device-ethernet.c:292
 #: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Drata"
 
-#: panels/network/net-device-ethernet.c:344
-#: panels/network/net-device-wifi.c:1901 panels/network/network-ethernet.ui:120
-#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
-#: panels/network/network-vpn.ui:79
-msgid "Options…"
-msgstr "Agordoj…"
-
-#: panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:236
 msgid "Add new connection"
 msgstr "Aldoni novan konekton"
 
-#: panels/network/net-device-wifi.c:1370
+#: panels/network/net-device-wifi.c:1157
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Se vi ŝaltas la sendratan retkaptejon, vi malkonektos de <b>%s</b>."
 
-#: panels/network/net-device-wifi.c:1374
+#: panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2801,11 +3100,11 @@ msgstr ""
 "Ne eblas atingi la interreton tra via sendrata aparato dum la retkaptejo "
 "estas ŝaltita."
 
-#: panels/network/net-device-wifi.c:1381
+#: panels/network/net-device-wifi.c:1168
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Ĉu ŝalti vifian retkaptejon?"
 
-#: panels/network/net-device-wifi.c:1403
+#: panels/network/net-device-wifi.c:1190
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2813,27 +3112,27 @@ msgstr ""
 "Vifiaj retkaptejoj kutime estas uzata por kunhavigi ceteran interretan "
 "konekton per vifio."
 
-#: panels/network/net-device-wifi.c:1414
+#: panels/network/net-device-wifi.c:1201
 msgid "_Turn On"
 msgstr "Ŝ_alti"
 
-#: panels/network/net-device-wifi.c:1491
+#: panels/network/net-device-wifi.c:1278
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Ĉu haltigi retkaptejon kaj malkonektiĝi ĉiujn uzantojn?"
 
-#: panels/network/net-device-wifi.c:1494
+#: panels/network/net-device-wifi.c:1281
 msgid "_Stop Hotspot"
 msgstr "Halti_gi retkaptejon"
 
-#: panels/network/net-device-wifi.c:1594
+#: panels/network/net-device-wifi.c:1337
 msgid "System policy prohibits use as a Hotspot"
 msgstr "Sistema politiko malebligas uzon kiel retkaptejo"
 
-#: panels/network/net-device-wifi.c:1597
+#: panels/network/net-device-wifi.c:1340
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Sendrata aparato ne subtenas retkapteja reĝimo"
 
-#: panels/network/net-device-wifi.c:1739
+#: panels/network/net-device-wifi.c:1471
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2841,16 +3140,16 @@ msgstr ""
 "Retaj detaloj por la elektitaj retoj, inkludante pasvortojn kaj iujn ajn "
 "proprajn agordojn, perdiĝos."
 
-#: panels/network/net-device-wifi.c:1743 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:1475 panels/network/network-wifi.ui:1350
 msgid "_Forget"
 msgstr "_Forgesi"
 
-#: panels/network/net-device-wifi.c:2052 panels/network/net-device-wifi.c:2059
+#: panels/network/net-device-wifi.c:1647 panels/network/net-device-wifi.c:1654
 msgid "Known Wi-Fi Networks"
 msgstr "Konataj vifiaj retoj"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:2092
+#: panels/network/net-device-wifi.c:1691
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forgesi"
@@ -2944,10 +3243,10 @@ msgstr "detaloj"
 #: panels/network/wireless-security/eap-method-simple.ui:40
 #: panels/network/wireless-security/ws-leap.ui:40
 #: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/sharing.ui:357
-#: panels/user-accounts/data/account-dialog.ui:300
-#: panels/user-accounts/data/account-dialog.ui:525
-#: panels/user-accounts/data/user-accounts-dialog.ui:205
+#: panels/sharing/cc-sharing-panel.ui:357
+#: panels/user-accounts/cc-add-user-dialog.ui:309
+#: panels/user-accounts/cc-add-user-dialog.ui:546
+#: panels/user-accounts/cc-user-panel.ui:213
 msgid "_Password"
 msgstr "_Pasvorto"
 
@@ -3031,44 +3330,44 @@ msgctxt "tab"
 msgid "Reset"
 msgstr "Reagordi"
 
-#: panels/network/network-wifi.ui:1514
+#: panels/network/network-wifi.ui:1505
 msgid "Wi-Fi Hotspot"
 msgstr "Retkaptejo"
 
-#: panels/network/network-wifi.ui:1531
+#: panels/network/network-wifi.ui:1523
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Malŝalti por konekti al sendrata reto"
 
-#: panels/network/network-wifi.ui:1580
+#: panels/network/network-wifi.ui:1572
 msgid "Network Name"
 msgstr "Retnomo"
 
-#: panels/network/network-wifi.ui:1598
+#: panels/network/network-wifi.ui:1590
 msgid "Connected Devices"
 msgstr "Konektitaj aparatoj"
 
-#: panels/network/network-wifi.ui:1616
+#: panels/network/network-wifi.ui:1608
 msgid "Security type"
 msgstr "Speco de sekureco"
 
-#: panels/network/network-wifi.ui:1679
+#: panels/network/network-wifi.ui:1671
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Pasvorto"
 
-#: panels/network/network-wifi.ui:1776
+#: panels/network/network-wifi.ui:1768
 msgid "Turn Wi-Fi off"
 msgstr "Malŝalti vifion"
 
-#: panels/network/network-wifi.ui:1808
+#: panels/network/network-wifi.ui:1800
 msgid "_Connect to Hidden Network…"
 msgstr "_Konekti al kaŝita reto…"
 
-#: panels/network/network-wifi.ui:1818
+#: panels/network/network-wifi.ui:1810
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Ŝ_alti retkaptejon…"
 
-#: panels/network/network-wifi.ui:1828
+#: panels/network/network-wifi.ui:1820
 msgid "_Known Wi-Fi Networks"
 msgstr "_Konataj vifiaj retoj"
 
@@ -3436,8 +3735,8 @@ msgstr "mankanta EAP-LEAP pasvorto"
 #: panels/network/wireless-security/eap-method-leap.ui:26
 #: panels/network/wireless-security/eap-method-simple.ui:26
 #: panels/network/wireless-security/ws-leap.ui:26
-#: panels/user-accounts/data/account-dialog.ui:142
-#: panels/user-accounts/data/account-dialog.ui:505
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:526
 msgid "_Username"
 msgstr "_Uzantonomo"
 
@@ -3748,9 +4047,13 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Motri enhav_on de mesaĝo en ŝlosa ekrano"
 
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
-msgid "Notifications"
-msgstr "Sciigoj"
+#: panels/notifications/cc-notifications-panel.ui:70
+msgid "Notification _Popups"
+msgstr "Ŝ_prucaj sciigoj"
+
+#: panels/notifications/cc-notifications-panel.ui:121
+msgid "_Lock Screen Notifications"
+msgstr "Sciigoj sur ŝ_losa ekrano"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
@@ -3766,40 +4069,26 @@ msgstr "preferences-system-notifications"
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Sciigoj;Mesaĝo;Pleto;Ŝpruco;"
 
-#: panels/notifications/notifications.ui:84
-msgid "Notification _Popups"
-msgstr "Ŝ_prucaj sciigoj"
-
-#: panels/notifications/notifications.ui:134
-msgid "_Lock Screen Notifications"
-msgstr "Sciigoj sur ŝ_losa ekrano"
-
-#. List of applications.
-#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
-#: panels/sound/gvc-mixer-dialog.c:1768
-msgid "Applications"
-msgstr "Aplikaĵoj"
-
-#: panels/online-accounts/cc-online-accounts-panel.c:149
+#: panels/online-accounts/cc-online-accounts-panel.c:150
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Alia"
 
 #. 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:615
+#: panels/online-accounts/cc-online-accounts-panel.c:620
 #, c-format
 msgid "%s Account"
 msgstr "%s konto"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:910
+#: panels/online-accounts/cc-online-accounts-panel.c:917
 msgid "Error removing account"
 msgstr "Eraro dum forigado de konto"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:975
+#: panels/online-accounts/cc-online-accounts-panel.c:982
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> forigita"
@@ -3835,19 +4124,19 @@ msgstr ""
 msgid "Undo"
 msgstr "Malfari"
 
-#: panels/online-accounts/online-accounts.ui:125
+#: panels/online-accounts/online-accounts.ui:96
 msgid "Connect to your data in the cloud"
-msgstr "Konekti al viajn datumojn en la nubo"
+msgstr "Konekti al viaj datumoj en la nubo"
 
-#: panels/online-accounts/online-accounts.ui:137
+#: panels/online-accounts/online-accounts.ui:111
 msgid "No internet connection — connect to set up new online accounts"
 msgstr "Neniu interreta konekto — konektu por agordi novajn retajn kontojn"
 
-#: panels/online-accounts/online-accounts.ui:159
+#: panels/online-accounts/online-accounts.ui:136
 msgid "Add an account"
 msgstr "Aldoni konton"
 
-#: panels/online-accounts/online-accounts.ui:264
+#: panels/online-accounts/online-accounts.ui:243
 msgid "Remove Account"
 msgstr "Forigi konton"
 
@@ -3889,159 +4178,164 @@ msgstr[0] "minuto"
 msgstr[1] "minutoj"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:307
+#: panels/power/cc-power-panel.c:306
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s ĝis tute ŝargita"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:314
+#: panels/power/cc-power-panel.c:313
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "Averto: %s restanta"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:319
+#: panels/power/cc-power-panel.c:318
 #, c-format
 msgid "%s remaining"
 msgstr "%s restanta"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:324 panels/power/cc-power-panel.c:351
+#: panels/power/cc-power-panel.c:323 panels/power/cc-power-panel.c:353
 msgid "Fully charged"
 msgstr "Tute ŝargita"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
+msgid "Not charging"
+msgstr "Ne ŝargante"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
 msgid "Empty"
 msgstr "Malplena"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:342
+#: panels/power/cc-power-panel.c:344
 msgid "Charging"
 msgstr "Ŝargante"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:347
+#: panels/power/cc-power-panel.c:349
 msgid "Discharging"
 msgstr "Malŝargante"
 
-#: panels/power/cc-power-panel.c:465
+#: panels/power/cc-power-panel.c:479
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Ĉefa"
 
-#: panels/power/cc-power-panel.c:467
+#: panels/power/cc-power-panel.c:481
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:535
+#: panels/power/cc-power-panel.c:559
 msgid "Wireless mouse"
 msgstr "Sendrata muso"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:538
+#: panels/power/cc-power-panel.c:562
 msgid "Wireless keyboard"
 msgstr "Sendrata klavaro"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:541
+#: panels/power/cc-power-panel.c:565
 msgid "Uninterruptible power supply"
 msgstr "Vicnutrila baterio"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:544
+#: panels/power/cc-power-panel.c:568
 msgid "Personal digital assistant"
 msgstr "Persona cifereca asistanto"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:547
+#: panels/power/cc-power-panel.c:571
 msgid "Cellphone"
 msgstr "Poŝtelefono"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:550
+#: panels/power/cc-power-panel.c:574
 msgid "Media player"
 msgstr "Medioludilo"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:553 panels/wacom/cc-wacom-panel.c:807
+#: panels/power/cc-power-panel.c:577 panels/wacom/cc-wacom-panel.c:828
 msgid "Tablet"
 msgstr "Tabulkomputilo"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:556
+#: panels/power/cc-power-panel.c:580
 msgid "Computer"
 msgstr "Komputilo"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:559
+#: panels/power/cc-power-panel.c:583
 msgid "Gaming input device"
 msgstr "Luda enigaparato"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:562 panels/power/cc-power-panel.c:815
-#: panels/power/cc-power-panel.c:2409
+#: panels/power/cc-power-panel.c:586 panels/power/cc-power-panel.c:847
+#: panels/power/cc-power-panel.c:2481
 msgid "Battery"
 msgstr "Baterio"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:646
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Ŝargante"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:653
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Averto"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:634
+#: panels/power/cc-power-panel.c:658
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Malalta"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:639
+#: panels/power/cc-power-panel.c:663
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Bona"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:644
+#: panels/power/cc-power-panel.c:668
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Plene ŝargita"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:648
+#: panels/power/cc-power-panel.c:672
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Malplena"
 
-#: panels/power/cc-power-panel.c:813
+#: panels/power/cc-power-panel.c:845
 msgid "Batteries"
 msgstr "Baterioj"
 
-#: panels/power/cc-power-panel.c:1174
+#: panels/power/cc-power-panel.c:1206
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
-#: panels/power/cc-power-panel.c:1176
+#: panels/power/cc-power-panel.c:1208
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutoj"
 
-#: panels/power/cc-power-panel.c:1179
+#: panels/power/cc-power-panel.c:1211
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4049,228 +4343,277 @@ msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
 #. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1184
+#: panels/power/cc-power-panel.c:1216
 #, c-format
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1187
+#: panels/power/cc-power-panel.c:1219
 #, c-format
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
 
 #. 0 seconds
-#: panels/power/cc-power-panel.c:1193
+#: panels/power/cc-power-panel.c:1225
 msgid "0 seconds"
 msgstr "0 sekundoj"
 
-#: panels/power/cc-power-panel.c:1290
+#: panels/power/cc-power-panel.c:1322
 msgid "When _idle"
 msgstr "Dum _senokupo"
 
-#: panels/power/cc-power-panel.c:1741
+#: panels/power/cc-power-panel.c:1779
 msgid "Power Saving"
 msgstr "Elektroŝparo"
 
-#: panels/power/cc-power-panel.c:1771
+#: panels/power/cc-power-panel.c:1811
 msgid "_Screen brightness"
 msgstr "Heleco de _ekrano"
 
-#: panels/power/cc-power-panel.c:1790
+#: panels/power/cc-power-panel.c:1833
 msgid "Automatic brightness"
 msgstr "Aŭtomata heleco"
 
-#: panels/power/cc-power-panel.c:1810
+#: panels/power/cc-power-panel.c:1855
 msgid "_Keyboard brightness"
 msgstr "Heleco de _klavaro"
 
-#: panels/power/cc-power-panel.c:1820
+#: panels/power/cc-power-panel.c:1868
 msgid "_Dim screen when inactive"
 msgstr "_Malheligi ekranon kiam neaktiva"
 
-#: panels/power/cc-power-panel.c:1845
+#: panels/power/cc-power-panel.c:1897
 msgid "_Blank screen"
 msgstr "M_alplena ekrano"
 
-#: panels/power/cc-power-panel.c:1882
+#: panels/power/cc-power-panel.c:1939
 msgid "_Wi-Fi"
 msgstr "_Vifio"
 
-#: panels/power/cc-power-panel.c:1887
+#: panels/power/cc-power-panel.c:1945
 msgid "Wi-Fi can be turned off to save power."
 msgstr "Vifio malŝalteblas por ŝpari elektron."
 
-#: panels/power/cc-power-panel.c:1914
+#: panels/power/cc-power-panel.c:1975
 msgid "_Mobile broadband"
 msgstr "_Portebla larĝkapacita reto"
 
-#: panels/power/cc-power-panel.c:1919
+#: panels/power/cc-power-panel.c:1981
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr ""
 "Portebla larĝkapacita reto (LTE, 4G, 3G, ktp.) malŝalteblas por ŝpari "
 "elektron."
 
-#: panels/power/cc-power-panel.c:1980
+#: panels/power/cc-power-panel.c:2045
 msgid "_Bluetooth"
 msgstr "_Bludento"
 
-#: panels/power/cc-power-panel.c:1985
+#: panels/power/cc-power-panel.c:2051
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bludento malŝalteblas por ŝpari elektron."
 
-#: panels/power/cc-power-panel.c:2043
+#: panels/power/cc-power-panel.c:2107
 msgid "When on battery power"
 msgstr "Dum bateria elektro"
 
-#: panels/power/cc-power-panel.c:2045
+#: panels/power/cc-power-panel.c:2109
 msgid "When plugged in"
 msgstr "Kiam konektita"
 
-#: panels/power/cc-power-panel.c:2139
+#: panels/power/cc-power-panel.c:2203
 msgid "Suspend"
 msgstr "Halteti"
 
-#: panels/power/cc-power-panel.c:2140
+#: panels/power/cc-power-panel.c:2204
 msgid "Power Off"
 msgstr "Malŝalti"
 
-#: panels/power/cc-power-panel.c:2141
+#: panels/power/cc-power-panel.c:2205
 msgid "Hibernate"
 msgstr "Pasivumigi"
 
-#: panels/power/cc-power-panel.c:2142
+#: panels/power/cc-power-panel.c:2206
 msgid "Nothing"
 msgstr "Nenio"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2242
+#: panels/power/cc-power-panel.c:2306
 msgid "Suspend & Power Button"
 msgstr "Halteta & ŝalta butono"
 
-#: panels/power/cc-power-panel.c:2280
+#: panels/power/cc-power-panel.c:2348
 msgid "_Automatic suspend"
 msgstr "_Aŭtomata haltetado"
 
-#: panels/power/cc-power-panel.c:2281
+#: panels/power/cc-power-panel.c:2350
 msgid "Automatic suspend"
 msgstr "Aŭtomata haltetado"
 
-#: panels/power/cc-power-panel.c:2344
+#: panels/power/cc-power-panel.c:2416
 msgid "_When the Power Button is pressed"
 msgstr "_Kiam la ŝaltbutono estas premita"
 
-#: panels/power/cc-power-panel.c:2454 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:247
-msgid "Devices"
-msgstr "Aparatoj"
-
-#: panels/power/gnome-power-panel.desktop.in.in:3
-msgid "Power"
-msgstr "Elektro"
-
-#: panels/power/gnome-power-panel.desktop.in.in:4
-msgid "View your battery status and change power saving settings"
-msgstr "Vidu vian baterian staton kaj elektu elektroŝparajn funkciojn"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/power/gnome-power-panel.desktop.in.in:7
-msgid "gnome-power-manager"
-msgstr "gnome-power-manager"
-
-#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/power/gnome-power-panel.desktop.in.in:19
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Kurento;Elektro;Dormeti;Pasivumigi;Baterio;Heleco;Malheligi;Malplena;Ekrano;"
-"DPMS;Senokupo;"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:13
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "15 minutoj"
 
-#: panels/power/power.ui:17
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:17
+msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 minutoj"
 
-#: panels/power/power.ui:21
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:21
+msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 minutoj"
 
-#: panels/power/power.ui:29
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:25
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "30 minutoj"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:29
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 minutoj"
 
-#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
-#: panels/privacy/privacy.ui:56
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:33
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 horo"
 
-#: panels/power/power.ui:37
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:37
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 minutoj"
 
-#: panels/power/power.ui:41
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:41
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 minutoj"
 
-#: panels/power/power.ui:45
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:45
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 minutoj"
 
-#: panels/power/power.ui:49
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:49
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 horoj"
 
-#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 minutoj"
 
-#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 minutoj"
 
-#: panels/power/power.ui:75
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 minutoj"
 
-#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 minutoj"
 
-#: panels/power/power.ui:83
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 minutoj"
 
-#: panels/power/power.ui:87
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 minutoj"
 
-#: panels/power/power.ui:91
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 minutoj"
 
-#: panels/power/power.ui:167
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 minutoj"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "Neniam"
+
+#: panels/power/cc-power-panel.ui:167
 msgid "Automatic Suspend"
 msgstr "Aŭtomata haltetado"
 
-#: panels/power/power.ui:192
+#: panels/power/cc-power-panel.ui:192
 msgid "_Plugged In"
 msgstr "_Konektita"
 
-#: panels/power/power.ui:208
+#: panels/power/cc-power-panel.ui:208
 msgid "On _Battery Power"
 msgstr "Je _bateria elektro"
 
-#: panels/power/power.ui:253 panels/power/power.ui:313
-#: panels/universal-access/uap.ui:1507
+#: panels/power/cc-power-panel.ui:253 panels/power/cc-power-panel.ui:313
+#: panels/universal-access/cc-ua-panel.ui:1507
 msgid "Delay"
 msgstr "Prokrasto"
 
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "Elektro"
+
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr "Vidu vian baterian staton kaj elektu elektroŝparajn funkciojn"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Kurento;Elektro;Dormeti;Pasivumigi;Baterio;Heleco;Malheligi;Malplena;Ekrano;"
+"DPMS;Senokupo;"
+
 #: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
@@ -4288,7 +4631,7 @@ msgstr "Uzantonomo"
 #. Translators: This is a password needed for printing.
 #: panels/printers/authentication-dialog.ui:96
 #: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
-#: panels/user-accounts/data/account-dialog.ui:240
+#: panels/user-accounts/cc-add-user-dialog.ui:248
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -4298,45 +4641,45 @@ msgid "Authentication Required"
 msgstr "Aŭtentigo estas bezonata"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:809
+#: panels/printers/cc-printers-panel.c:805
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Presilo “%s” estas forigita"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:1057
+#: panels/printers/cc-printers-panel.c:1052
 msgid "Failed to add new printer."
 msgstr "Aldono de nova presilo malsukcesis."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1394
+#: panels/printers/cc-printers-panel.c:1389
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Ne eblas ŝargi fasadon: %s"
 
-#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
+#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "Loko"
 
 #. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:111
+#: panels/printers/details-dialog.ui:114
 #: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "Pelilo"
 
-#: panels/printers/details-dialog.ui:147
+#: panels/printers/details-dialog.ui:152
 msgid "Searching for preferred drivers…"
 msgstr "Serĉante por preferitaj pelilojn…"
 
-#: panels/printers/details-dialog.ui:169
+#: panels/printers/details-dialog.ui:174
 msgid "Search for Drivers"
 msgstr "Serĉi petilojn"
 
-#: panels/printers/details-dialog.ui:177
+#: panels/printers/details-dialog.ui:182
 msgid "Select from Database…"
 msgstr "Elektu el datumbazo…"
 
-#: panels/printers/details-dialog.ui:185
+#: panels/printers/details-dialog.ui:190
 msgid "Install PPD File…"
 msgstr "Instali PPD-dosieron…"
 
@@ -4385,8 +4728,8 @@ msgstr "Neniu aktiva presa tasko"
 
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:384
-#: panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/pp-new-printer-dialog.c:382
+#: panels/printers/pp-new-printer-dialog.c:454
 msgid "Add Printer"
 msgstr "Aldoni presilon"
 
@@ -4413,7 +4756,7 @@ msgstr "Enigu uzantonomon kaj pasvorton por vidi presilojn je presila servilo."
 
 #. 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:22 panels/printers/pp-options-dialog.c:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:895
 msgid "Test Page"
 msgstr "Testpaĝo"
 
@@ -4437,15 +4780,15 @@ msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr ""
-"PostScript presilo-priskribaj dosieroj (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
+"PostScript presilo-priskribaj dosieroj (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
+"*.PPD.GZ)"
 
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Elekti presil-pelilon"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:146
 msgid "Select"
 msgstr "Elekti"
 
@@ -4454,12 +4797,12 @@ msgid "Loading drivers database…"
 msgstr "Ŝargante pelilan datumbazon…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:476
 msgid "JetDirect Printer"
 msgstr "JetDirect presilo"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:711
 msgid "LPD Printer"
 msgstr "LPD-presilo"
 
@@ -4550,7 +4893,7 @@ msgid "Completed"
 msgstr "Plenumita"
 
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:390
+#: panels/printers/pp-jobs-dialog.c:389
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
@@ -4558,67 +4901,67 @@ msgstr[0] "%u tasko bezonas aŭtentigon"
 msgstr[1] "%u taskoj bezonas aŭtentigon"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — Aktivaj taskoj"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:622
+#: panels/printers/pp-jobs-dialog.c:618
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "Entajpu akreditaĵojn por presi el %s."
 
-#: panels/printers/pp-new-printer-dialog.c:402
+#: panels/printers/pp-new-printer-dialog.c:400
 msgid "Unlock Print Server"
 msgstr "Malŝlosi presservilon"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:406
+#: panels/printers/pp-new-printer-dialog.c:404
 #, c-format
 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
+#: panels/printers/pp-new-printer-dialog.c:409
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr "Enigu uzantonomon kaj pasvorton por vidi presilojn je %s."
 
-#: panels/printers/pp-new-printer-dialog.c:894
+#: panels/printers/pp-new-printer-dialog.c:891
 msgid "Searching for Printers"
 msgstr "Serĉante presilojn"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1814
+#: panels/printers/pp-new-printer-dialog.c:1788
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1819
+#: panels/printers/pp-new-printer-dialog.c:1793
 msgid "Serial Port"
 msgstr "Seria pordo"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1826
+#: panels/printers/pp-new-printer-dialog.c:1800
 msgid "Parallel Port"
 msgstr "Paralela pordo"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1868
+#: panels/printers/pp-new-printer-dialog.c:1842
 #, c-format
 msgid "Location: %s"
 msgstr "Loko: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1873
+#: panels/printers/pp-new-printer-dialog.c:1847
 #, 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:1902
+#: panels/printers/pp-new-printer-dialog.c:1876
 msgid "Server requires authentication"
 msgstr "Servilo necesas aŭtentigon"
 
@@ -4643,65 +4986,65 @@ 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:534
+#: panels/printers/pp-options-dialog.c:536
 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:546
+#: panels/printers/pp-options-dialog.c:548
 msgid "Two-sided"
 msgstr "Duflanka"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:657
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Ĝenerala"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: panels/printers/pp-options-dialog.c:658
+#: panels/printers/pp-options-dialog.c:660
 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:661
+#: panels/printers/pp-options-dialog.c:663
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Instaleblaj opcioj"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:666
 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:667
+#: panels/printers/pp-options-dialog.c:669
 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:670
+#: panels/printers/pp-options-dialog.c:672
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Koloro"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Finigante"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:678
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Altnivela"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:908
+#: panels/printers/pp-options-dialog.c:910
 msgid "Test page"
 msgstr "Testpaĝo"
 
@@ -4747,12 +5090,12 @@ msgid "Manufacturer"
 msgstr "Fabrikanto"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:615 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:612 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "Neniuj aktivaj taskoj"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:620
+#: panels/printers/pp-printer-entry.c:617
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4760,111 +5103,111 @@ msgstr[0] "%u tasko"
 msgstr[1] "%u taskoj"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:777
 msgid "Low on toner"
 msgstr "Malmulte da inko"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:779
 msgid "Out of toner"
 msgstr "Neniu inko"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:785
+#: panels/printers/pp-printer-entry.c:782
 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/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:785
 msgid "Out of developer"
 msgstr "Neniu fotokreilkemiaĵo"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:787
 msgid "Low on a marker supply"
 msgstr "Malmulte da inkpulvora provizo"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:789
 msgid "Out of a marker supply"
 msgstr "Neniu inkpulvora provizo"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:791
 msgid "Open cover"
 msgstr "Malfermi kovrilon"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:793
 msgid "Open door"
 msgstr "Malfermi pordon"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:795
 msgid "Low on paper"
 msgstr "Malmulte da papero"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:800
+#: panels/printers/pp-printer-entry.c:797
 msgid "Out of paper"
 msgstr "Neniu papero"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:802
+#: panels/printers/pp-printer-entry.c:799
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Nekonektita"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: panels/printers/pp-printer-entry.c:804
-#: panels/printers/pp-printer-entry.c:932
+#: panels/printers/pp-printer-entry.c:801
+#: panels/printers/pp-printer-entry.c:929
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Haltigita"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:806
+#: panels/printers/pp-printer-entry.c:803
 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:808
+#: panels/printers/pp-printer-entry.c:805
 msgid "Waste receptacle full"
 msgstr "Forĵetaĵujo plena"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:810
+#: panels/printers/pp-printer-entry.c:807
 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:812
+#: panels/printers/pp-printer-entry.c:809
 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:918
+#: panels/printers/pp-printer-entry.c:915
 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:923
+#: panels/printers/pp-printer-entry.c:920
 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:928
+#: panels/printers/pp-printer-entry.c:925
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Traktado"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:952
+#: panels/printers/pp-printer-entry.c:949
 msgid "Clean print heads"
 msgstr "Purigi presilajn kapetojn"
 
@@ -4931,70 +5274,90 @@ msgstr ""
 "Pardonu! Ŝajnas, ke la sistema\n"
 "presservilo ne disponeblas."
 
-#: panels/privacy/cc-privacy-panel.c:389 panels/privacy/privacy.ui:280
+#: panels/privacy/cc-privacy-panel.c:409 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "Ekrana ŝloso"
 
-#: panels/privacy/cc-privacy-panel.c:439
+#: panels/privacy/cc-privacy-panel.c:453
 msgid "In use"
 msgstr "Uzata"
 
-#: panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:458
 msgctxt "Location services status"
 msgid "On"
 msgstr "Ŝaltita"
 
-#: panels/privacy/cc-privacy-panel.c:445
+#: panels/privacy/cc-privacy-panel.c:459
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Malŝaltita"
 
-#: panels/privacy/cc-privacy-panel.c:820 panels/privacy/privacy.ui:745
-msgid "Location Services"
-msgstr "Lokado-servoj"
+#: panels/privacy/cc-privacy-panel.c:881
+msgctxt "Camera status"
+msgid "Off"
+msgstr "Malŝaltita"
 
-#: panels/privacy/cc-privacy-panel.c:943 panels/privacy/privacy.ui:127
-msgid "Usage & History"
+#: panels/privacy/cc-privacy-panel.c:883
+msgctxt "Camera status"
+msgid "On"
+msgstr "Ŝaltita"
+
+#: panels/privacy/cc-privacy-panel.c:914
+msgctxt "Microphone status"
+msgid "Off"
+msgstr "Malŝaltita"
+
+#: panels/privacy/cc-privacy-panel.c:916
+msgctxt "Microphone status"
+msgid "On"
+msgstr "Ŝaltita"
+
+#: panels/privacy/cc-privacy-panel.c:1022
+#: panels/privacy/cc-privacy-panel.ui:127
+msgid "Usage & History"
 msgstr "Uzado & historio"
 
-#: panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1143
 msgid "Empty all items from Trash?"
 msgstr "Ĉu vakigi ĉiujn erojn de la rubujo?"
 
-#: panels/privacy/cc-privacy-panel.c:1073
+#: panels/privacy/cc-privacy-panel.c:1144
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Ĉiuj eroj en la rubujo forigitos daŭre."
 
-#: panels/privacy/cc-privacy-panel.c:1074
+#: panels/privacy/cc-privacy-panel.c:1145
 msgid "_Empty Trash"
 msgstr "_Malplenigi rubujon"
 
-#: panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1166
 msgid "Delete all the temporary files?"
 msgstr "Ĉu forigi ĉiujn provizorajn dosierojn?"
 
-#: panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1167
 msgid "All the temporary files will be permanently deleted."
 msgstr "Ĉiuj provizoraj dosieroj forigitos daŭre."
 
-#: panels/privacy/cc-privacy-panel.c:1099
+#: panels/privacy/cc-privacy-panel.c:1168
 msgid "_Purge Temporary Files"
 msgstr "_Senrubigi provizorajn dosierojn"
 
-#: panels/privacy/cc-privacy-panel.c:1121 panels/privacy/privacy.ui:432
+#: panels/privacy/cc-privacy-panel.c:1190
+#: panels/privacy/cc-privacy-panel.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "Senrubigi rubujon & provizorajn dosierojn"
 
-#: panels/privacy/cc-privacy-panel.c:1161 panels/privacy/privacy.ui:637
+#: panels/privacy/cc-privacy-panel.c:1223
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "Uzado de programaro"
 
-#: panels/privacy/cc-privacy-panel.c:1202 panels/privacy/privacy.ui:959
+#: panels/privacy/cc-privacy-panel.c:1262
+#: panels/privacy/cc-privacy-panel.ui:1169
 msgid "Problem Reporting"
 msgstr "Problemraportado"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: panels/privacy/cc-privacy-panel.c:1216
+#: panels/privacy/cc-privacy-panel.c:1274
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -5003,82 +5366,144 @@ msgstr ""
 "Sendado de raportoj de teĥnikaj problemoj helpas al ni plibonigi %s. "
 "Raportoj sendiĝas sennome kaj personaj datumoj estas viŝitaj."
 
-#: panels/privacy/cc-privacy-panel.c:1228 panels/privacy/privacy.ui:719
+#: panels/privacy/cc-privacy-panel.c:1286
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "Privateca politiko"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Privateco"
-
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr "Protekti viajn personan informon kaj regi kion aliaj povas vidi"
-
-#. FIXME
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
-msgid "preferences-system-privacy"
-msgstr "preferences-system-privacy"
-
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
-msgstr ""
-"ekrano;ŝlosi;ŝloso;diagnozo;kraŝo;privata;lastatempa;provizora;tmp;indekso;"
-"reto;identeco;"
-
-#: panels/privacy/privacy.ui:14
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:14
+msgctxt "lock_screen"
 msgid "Screen Turns Off"
 msgstr "La ekrano malŝaltas"
 
-#: panels/privacy/privacy.ui:18
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:18
+msgctxt "lock_screen"
 msgid "30 seconds"
 msgstr "30 sekundoj"
 
-#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:22
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 minuto"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:26
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 minutoj"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:30
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 minutoj"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:34
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 minutoj"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:38
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 minutoj"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:42
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 horo"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:56
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 horo"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:60
+msgctxt "purge_files"
 msgid "1 day"
 msgstr "1 tago"
 
-#: panels/privacy/privacy.ui:64
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:64
+msgctxt "purge_files"
 msgid "2 days"
 msgstr "2 tagoj"
 
-#: panels/privacy/privacy.ui:68
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:68
+msgctxt "purge_files"
 msgid "3 days"
 msgstr "3 tagoj"
 
-#: panels/privacy/privacy.ui:72
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:72
+msgctxt "purge_files"
 msgid "4 days"
 msgstr "4 tagoj"
 
-#: panels/privacy/privacy.ui:76
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:76
+msgctxt "purge_files"
 msgid "5 days"
 msgstr "5 tagoj"
 
-#: panels/privacy/privacy.ui:80
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:80
+msgctxt "purge_files"
 msgid "6 days"
 msgstr "6 tagoj"
 
-#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:84
+msgctxt "purge_files"
 msgid "7 days"
 msgstr "7 tagoj"
 
-#: panels/privacy/privacy.ui:88
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:88
+msgctxt "purge_files"
 msgid "14 days"
 msgstr "14 tagoj"
 
-#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:92
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 tagoj"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:106
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 tago"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:110
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 tagoj"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:114
+msgctxt "retain_history"
 msgid "30 days"
 msgstr "30 tagoj"
 
-#: panels/privacy/privacy.ui:118
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:118
+msgctxt "retain_history"
 msgid "Forever"
 msgstr "Por ĉiam"
 
-#: panels/privacy/privacy.ui:148
+#: panels/privacy/cc-privacy-panel.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -5086,35 +5511,35 @@ msgstr ""
 "Memori vian historion plifaciligas trovi aĵojn denove. Ĉi eroj estas neniam "
 "kunhavigitaj tra la reto."
 
-#: panels/privacy/privacy.ui:176
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "_Lastaj uzitaj"
 
-#: panels/privacy/privacy.ui:207
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "Teni _historion"
 
-#: panels/privacy/privacy.ui:247
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "_Vakigi historion"
 
-#: panels/privacy/privacy.ui:301
+#: panels/privacy/cc-privacy-panel.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "La ekrana ŝloso protektas vian privatecon kiam vi estas fora."
 
-#: panels/privacy/privacy.ui:328
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "Aŭtomata ekrana ŝ_loso"
 
-#: panels/privacy/privacy.ui:362
+#: panels/privacy/cc-privacy-panel.ui:362
 msgid "Lock screen _after blank for"
 msgstr "Ŝ_losi ekranon post ekrano estas malplena por"
 
-#: panels/privacy/privacy.ui:394
+#: panels/privacy/cc-privacy-panel.ui:394
 msgid "Show _Notifications"
 msgstr "Montri _sciigojn"
 
-#: panels/privacy/privacy.ui:454
+#: panels/privacy/cc-privacy-panel.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -5122,27 +5547,27 @@ msgstr ""
 "Aŭtomate vakigi la rubujon kaj provizorajn dosierojn por helpi forigi "
 "nebezonitan konfidencan informon de via komputilo."
 
-#: panels/privacy/privacy.ui:483
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "Aŭtomate malplenigi _rubujon"
 
-#: panels/privacy/privacy.ui:515
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "Aŭtomate forigi provizorajn _dosierojn"
 
-#: panels/privacy/privacy.ui:546
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "Vakigi _post"
 
-#: panels/privacy/privacy.ui:590
+#: panels/privacy/cc-privacy-panel.ui:590
 msgid "_Empty Trash…"
 msgstr "_Malplenigi rubujon…"
 
-#: panels/privacy/privacy.ui:606
+#: panels/privacy/cc-privacy-panel.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "Subrubigi _provizorajn dosierojn…"
 
-#: panels/privacy/privacy.ui:654
+#: panels/privacy/cc-privacy-panel.ui:654
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -5157,11 +5582,35 @@ msgstr ""
 "Ĉiuj informojn, kiujn ni kolektas, sennomiĝas, kaj ni neniam kunhavigos "
 "viajn datumojn al eksteraj liverantoj."
 
-#: panels/privacy/privacy.ui:681
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "_Sendi statistikojn pri uzado de programaro"
 
-#: panels/privacy/privacy.ui:764
+#: panels/privacy/cc-privacy-panel.ui:764
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"Uzado de la kamerao permesas al aplikaĵoj fari fotojn kaj registri videojn. "
+"Malŝaltado de la kamerao povus kaŭzi, ke kelkaj aplikaĵoj ne funkcias taŭge."
+
+#: panels/privacy/cc-privacy-panel.ui:812
+msgid "_Camera"
+msgstr "_Kamerao"
+
+#: panels/privacy/cc-privacy-panel.ui:869
+msgid ""
+"Use of the microphone allows applications to capture sounds. Disabling the "
+"microphone may cause some applications to not function properly."
+msgstr ""
+"Uzado de la mikrofono permesas al aplikaĵoj registri sonojn. Malŝaltado de "
+"la mikrofono povus kaŭzi, ke kelkaj aplikaĵoj ne funkcias taŭge."
+
+#: panels/privacy/cc-privacy-panel.ui:917
+msgid "_Microphone"
+msgstr "_Mikrofono"
+
+#: panels/privacy/cc-privacy-panel.ui:974
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5169,7 +5618,7 @@ msgstr ""
 "Lokado-servoj permesas al aplikaĵoj scii vian lokon. Uzado de vifio kaj "
 "portebla larĝkapacita konekto plialtigas ekzaktecon."
 
-#: panels/privacy/privacy.ui:778
+#: panels/privacy/cc-privacy-panel.ui:988
 msgid ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
@@ -5177,14 +5626,37 @@ msgstr ""
 "Uzas Mozilla Lokado-Servon: <a href='https://location.services.mozilla.com/";
 "privacy'>Privateco Politiko</a>"
 
-#: panels/privacy/privacy.ui:828
+#: panels/privacy/cc-privacy-panel.ui:1038
 msgid "_Location Services"
 msgstr "_Lokado-servoj"
 
-#: panels/privacy/privacy.ui:1026
+#: panels/privacy/cc-privacy-panel.ui:1236
 msgid "_Automatic Problem Reporting"
 msgstr "_Aŭtomata problemraportado"
 
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "Privateco"
+
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
+msgid "Protect your personal information and control what others might see"
+msgstr "Protekti viajn personan informon kaj regi kion aliaj povas vidi"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+"ekrano;ŝlosi;ŝloso;diagnozo;kraŝo;privata;lastatempa;provizora;tmp;indekso;"
+"reto;identeco;"
+
 #: panels/region/cc-format-chooser.c:114
 msgctxt "measurement format"
 msgid "Imperial"
@@ -5195,7 +5667,7 @@ msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metra"
 
-#: panels/region/cc-format-chooser.c:277
+#: panels/region/cc-format-chooser.c:286
 msgid "No regions found"
 msgstr "Neniuj regionoj trovitaj"
 
@@ -5203,177 +5675,173 @@ msgstr "Neniuj regionoj trovitaj"
 msgid "Formats"
 msgstr "Formoj"
 
-#: panels/region/cc-format-chooser.ui:120
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "Antaŭrigardo"
 
-#: panels/region/cc-format-chooser.ui:137
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "Datoj"
 
-#: panels/region/cc-format-chooser.ui:168
+#: panels/region/cc-format-chooser.ui:154
 msgid "Times"
 msgstr "Horoj"
 
-#: panels/region/cc-format-chooser.ui:199
+#: panels/region/cc-format-chooser.ui:185
 msgid "Dates & Times"
 msgstr "Datoj & tempoj"
 
-#: panels/region/cc-format-chooser.ui:230
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "Numeroj"
 
-#: panels/region/cc-format-chooser.ui:247
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "Mezuro"
 
-#: panels/region/cc-format-chooser.ui:264
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "Papero"
 
-#: panels/region/cc-input-chooser.c:181
+#: panels/region/cc-input-chooser.c:193
 msgid "No input sources found"
 msgstr "Neniuj enigaj fontoj trovitaj"
 
-#: panels/region/cc-input-chooser.c:953
+#: panels/region/cc-input-chooser.c:948
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Alia"
 
-#: panels/region/cc-region-panel.c:809
-msgid "No input source selected"
-msgstr "Neniu eniga fonto elektita"
-
-#: panels/region/cc-region-panel.c:1605
-msgid "Login _Screen"
-msgstr "Ensaluta _ekrano"
-
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "Regiono & lingvo"
-
-#: panels/region/gnome-region-panel.desktop.in.in:4
-msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr ""
-"Elektu vian montran lingvon, formojn, klavararanĝojn kaj enigajn fontojn"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/region/gnome-region-panel.desktop.in.in:7
-msgid "preferences-desktop-locale"
-msgstr "preferences-desktop-locale"
-
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Lingvo;Klavararanĝo;Klavaro;Enigo;"
-
-#: panels/region/input-chooser.ui:5
+#: panels/region/cc-input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "Aldoni enigan fonton"
 
-#: panels/region/input-chooser.ui:78
+#: panels/region/cc-input-chooser.ui:77
 msgid "Input methods can’t be used on the login screen"
 msgstr "Enigaj metodoj ne uzeblas ĉe saluta ekrano"
 
-#: panels/region/input-options.ui:7
-msgid "Input Source Options"
-msgstr "Enigaj fontaj agordoj"
-
-#: panels/region/input-options.ui:27
-msgid "Use the _same source for all windows"
-msgstr "Uzi la _saman fonton por ĉiuj fenestroj"
-
-#: panels/region/input-options.ui:45
-msgid "Allow _different sources for each window"
-msgstr "Permesi _malsamajn fontojn por ĉiu fenestro"
-
-#: panels/region/input-options.ui:85
-msgid "Switch to previous source"
-msgstr "Ŝanĝi al lasta fonto"
-
-#: panels/region/input-options.ui:102
-msgid "Super+Shift+Space"
-msgstr "Super+Maj+Spaceto"
-
-#: panels/region/input-options.ui:116
-msgid "Switch to next source"
-msgstr "Ŝanĝi al sekva fonto"
-
-#: panels/region/input-options.ui:133
-msgid "Super+Space"
-msgstr "Super+Spaceto"
-
-#: panels/region/input-options.ui:147
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "Vi povas ŝanĝi ĉi tiujn klavkombinojn en la klavaraj agordoj"
-
-#: panels/region/input-options.ui:164
-msgid "Alternative switch to next source"
-msgstr "Alternativa ŝanĝo al sekva fonto"
-
-#: panels/region/input-options.ui:181
-msgid "Left+Right Alt"
-msgstr "Maldekstra+Dekstra Alt"
+#: panels/region/cc-region-panel.c:1537
+msgid "Login _Screen"
+msgstr "Ensaluta _ekrano"
 
-#: panels/region/region.ui:71
-#: panels/user-accounts/data/user-accounts-dialog.ui:348
+#: panels/region/cc-region-panel.ui:60
+#: panels/user-accounts/cc-user-panel.ui:358
 msgid "_Language"
 msgstr "_Lingvo"
 
-#: panels/region/region.ui:115
+#: panels/region/cc-region-panel.ui:95
 msgid "Restart the session for changes to take effect"
 msgstr "Restartigi la seancon por ke la ŝanĝoj efektiviĝas"
 
-#: panels/region/region.ui:137
+#: panels/region/cc-region-panel.ui:112
 msgid "Restart…"
 msgstr "Restartigi…"
 
-#: panels/region/region.ui:173
+#: panels/region/cc-region-panel.ui:143
 msgid "_Formats"
 msgstr "_Formoj"
 
-#: panels/region/region.ui:232
+#: panels/region/cc-region-panel.ui:193
 msgid "Input Sources"
 msgstr "Enigaj fontoj"
 
-#: panels/region/region.ui:248
-msgid "_Options"
-msgstr "_Agordoj"
+#: panels/region/cc-region-panel.ui:207
+msgid "Choose keyboard layouts or input methods."
+msgstr "Elekti klavararanĝojn aŭ enigajn metodojn."
 
-#: panels/region/region.ui:316
+#: panels/region/cc-region-panel.ui:270
+msgid "No input source selected"
+msgstr "Neniu eniga fonto elektita"
+
+#: panels/region/cc-region-panel.ui:305
 msgid "Add input source"
 msgstr "Aldoni enigan fonton"
 
-#: panels/region/region.ui:342
+#: panels/region/cc-region-panel.ui:326
 msgid "Remove input source"
 msgstr "Forigi enigan fonton"
 
-#: panels/region/region.ui:393
+#: panels/region/cc-region-panel.ui:369
 msgid "Move input source up"
 msgstr "Movi enigan fonton supren"
 
-#: panels/region/region.ui:419
+#: panels/region/cc-region-panel.ui:390
 msgid "Move input source down"
 msgstr "Movi enigan fonton malsupren"
 
-#: panels/region/region.ui:470
+#: panels/region/cc-region-panel.ui:433
 msgid "Configure input source"
 msgstr "Agordi enigan fonton"
 
-#: panels/region/region.ui:496
+#: panels/region/cc-region-panel.ui:454
 msgid "Show input source keyboard layout"
 msgstr "Montri enigan fontan klavararanĝon"
 
-#: panels/region/region.ui:540
+#: panels/region/cc-region-panel.ui:480
 msgid "Login settings are used by all users when logging into the system"
 msgstr "Salutaj agordoj estas uzataj de ĉiuj uzantoj kiam salutante sistemen"
 
-#: panels/search/cc-search-locations-dialog.c:600
+#: panels/region/cc-region-panel.ui:524
+msgid "Input Source Options"
+msgstr "Enigaj fontaj agordoj"
+
+#: panels/region/cc-region-panel.ui:539
+msgid "Use the _same source for all windows"
+msgstr "Uzi la _saman fonton por ĉiuj fenestroj"
+
+#: panels/region/cc-region-panel.ui:557
+msgid "Allow _different sources for each window"
+msgstr "Permesi _malsamajn fontojn por ĉiu fenestro"
+
+#: panels/region/cc-region-panel.ui:599
+msgid "Previous source"
+msgstr "Antaŭa fonto"
+
+#: panels/region/cc-region-panel.ui:617
+msgid "Super+Shift+Space"
+msgstr "Super+Maj+Spaceto"
+
+#: panels/region/cc-region-panel.ui:632
+msgid "Next source"
+msgstr "Sekva fonto"
+
+#: panels/region/cc-region-panel.ui:650
+msgid "Super+Space"
+msgstr "Super+Spaceto"
+
+#: panels/region/cc-region-panel.ui:665
+msgid "Left+Right Alt"
+msgstr "Maldekstra+Dekstra Alt"
+
+#: panels/region/cc-region-panel.ui:681
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "Vi povas ŝanĝi ĉi tiujn klavkombinojn en la klavaraj agordoj"
+
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "Regiono & lingvo"
+
+#: panels/region/gnome-region-panel.desktop.in.in:4
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr ""
+"Elektu vian montran lingvon, formojn, klavararanĝojn kaj enigajn fontojn"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
+
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Lingvo;Klavararanĝo;Klavaro;Enigo;"
+
+#: panels/search/cc-search-locations-dialog.c:604
 msgid "Select Location"
 msgstr "Elekti lokon"
 
-#: panels/search/cc-search-locations-dialog.c:604
+#: panels/search/cc-search-locations-dialog.c:608
 msgid "_OK"
 msgstr "_Bone"
 
@@ -5381,6 +5849,18 @@ msgstr "_Bone"
 msgid "No applications found"
 msgstr "Neniuj aplikaĵoj trovitaj"
 
+#: panels/search/cc-search-panel.ui:52
+msgid "Move Up"
+msgstr "Movi supren"
+
+#: panels/search/cc-search-panel.ui:69
+msgid "Move Down"
+msgstr "Movi malsupren"
+
+#: panels/search/cc-search-panel.ui:105
+msgid "Preferences"
+msgstr "Agordoj"
+
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5414,20 +5894,8 @@ msgstr "Legosignoj"
 msgid "Other"
 msgstr "Alia"
 
-#: panels/search/search.ui:71
-msgid "Move Up"
-msgstr "Movi supren"
-
-#: panels/search/search.ui:88
-msgid "Move Down"
-msgstr "Movi malsupren"
-
-#: panels/search/search.ui:124
-msgid "Preferences"
-msgstr "Agordoj"
-
 #. Label
-#: panels/sharing/cc-sharing-networks.c:302
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "Neniuj retoj estas elektitaj por kunhavigado"
 
@@ -5455,7 +5923,7 @@ msgstr "Aktiva"
 msgid "Choose a Folder"
 msgstr "Elektu dosierujon"
 
-#: panels/sharing/cc-sharing-panel.c:721
+#: panels/sharing/cc-sharing-panel.c:724
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
@@ -5464,7 +5932,7 @@ msgstr ""
 "Dosier-kunhavigado permesas al vi kunhavigi vian Publikan dosieron kun aliaj "
 "ĉe via ĉimomenta reto uzante: <a href=\"dav://%s\">dav://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:723
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5475,7 +5943,7 @@ msgstr ""
 "sekuran ŝelan komando:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:725
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5484,134 +5952,138 @@ msgstr ""
 "Ekran-kunhavigado permesas al deforaj uzantoj vidi aŭ regi vian ekranon per "
 "konekti al <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:829
+#: panels/sharing/cc-sharing-panel.c:832
 msgid "Copy"
 msgstr "Kopii"
 
-#: panels/sharing/cc-sharing-panel.c:1280
+#: panels/sharing/cc-sharing-panel.c:1285
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
-msgid "Control what you want to share with others"
-msgstr "Regi kion vi volas kunhavigi kun aliaj"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
-msgid "preferences-system-sharing"
-msgstr "preferences-system-sharing"
-
-#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-msgstr ""
-"kunhavigi;kunhavigado;sekurŝelo;ssu;gastigo;nomo;fora;defora;labortablo;"
-"medio;aŭdo;vido;video;filmoj;aŭdovida;bildoj;fotoj;kinofilmoj;servilo;"
-"bildigilo;"
-
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "Retoj"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
-msgid "Enable or disable remote login"
-msgstr "Ŝalti aŭ malŝalti deforan salutadon"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
-msgid "Authentication is required to enable or disable remote login"
-msgstr "Aŭtentigo estas bezonata por ŝalti aŭ malŝalti deforan salutadon"
-
-#: panels/sharing/sharing.ui:50
+#: panels/sharing/cc-sharing-panel.ui:50
 msgid "_Computer Name"
 msgstr "_Komputila nomo"
 
-#: panels/sharing/sharing.ui:108
+#: panels/sharing/cc-sharing-panel.ui:108
 msgid "_File Sharing"
 msgstr "_Dosier-kunhavigado"
 
-#: panels/sharing/sharing.ui:151
+#: panels/sharing/cc-sharing-panel.ui:151
 msgid "_Screen Sharing"
 msgstr "_Ekran-kunhavigado"
 
-#: panels/sharing/sharing.ui:194
+#: panels/sharing/cc-sharing-panel.ui:194
 msgid "_Media Sharing"
 msgstr "_Aŭdovid-kunhavigado"
 
-#: panels/sharing/sharing.ui:237
+#: panels/sharing/cc-sharing-panel.ui:237
 msgid "_Remote Login"
 msgstr "_Defora salutado"
 
-#: panels/sharing/sharing.ui:276
+#: panels/sharing/cc-sharing-panel.ui:276
 msgid "Some services are disabled because of no network access."
 msgstr "Kelkaj servoj estas malŝaltitaj pro manko de retaliro."
 
-#: panels/sharing/sharing.ui:292 panels/sharing/sharing.ui:419
+#: panels/sharing/cc-sharing-panel.ui:292
+#: panels/sharing/cc-sharing-panel.ui:419
 msgid "File Sharing"
 msgstr "Dosier-kunhavigado"
 
-#: panels/sharing/sharing.ui:339
+#: panels/sharing/cc-sharing-panel.ui:339
 msgid "_Require Password"
 msgstr "_Bezonas pasvorton"
 
-#: panels/sharing/sharing.ui:430 panels/sharing/sharing.ui:502
+#: panels/sharing/cc-sharing-panel.ui:430
+#: panels/sharing/cc-sharing-panel.ui:502
 msgid "Remote Login"
 msgstr "Defora salutado"
 
-#: panels/sharing/sharing.ui:525 panels/sharing/sharing.ui:771
+#: panels/sharing/cc-sharing-panel.ui:525
+#: panels/sharing/cc-sharing-panel.ui:771
 msgid "Screen Sharing"
 msgstr "Ekran-kunhavigado"
 
-#: panels/sharing/sharing.ui:583
+#: panels/sharing/cc-sharing-panel.ui:583
 msgid "_Allow connections to control the screen"
 msgstr "_Permesi al konektoj regi la ekranon"
 
-#: panels/sharing/sharing.ui:628
+#: panels/sharing/cc-sharing-panel.ui:628
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: panels/sharing/sharing.ui:658
+#: panels/sharing/cc-sharing-panel.ui:658
 msgid "_Show Password"
 msgstr "_Montri pasvorton"
 
-#: panels/sharing/sharing.ui:689
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "Access Options"
 msgstr "Aliro-agordoj"
 
-#: panels/sharing/sharing.ui:703
+#: panels/sharing/cc-sharing-panel.ui:703
 msgid "_New connections must ask for access"
 msgstr "_Novaj konektoj devas peti aliron"
 
-#: panels/sharing/sharing.ui:721
+#: panels/sharing/cc-sharing-panel.ui:721
 msgid "_Require a password"
 msgstr "_Bezonas pasvorton"
 
-#: panels/sharing/sharing.ui:782 panels/sharing/sharing.ui:876
+#: panels/sharing/cc-sharing-panel.ui:782
+#: panels/sharing/cc-sharing-panel.ui:876
 msgid "Media Sharing"
 msgstr "Aŭdovid-kunhavigado"
 
-#: panels/sharing/sharing.ui:815
+#: panels/sharing/cc-sharing-panel.ui:815
 msgid "Share music, photos and videos over the network."
 msgstr "Kunhavigi muzikon, fotojn kaj videojn sur la reto."
 
-#: panels/sharing/sharing.ui:830
+#: panels/sharing/cc-sharing-panel.ui:830
 msgid "Folders"
 msgstr "Dosierujoj"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
-msgid "Sound"
-msgstr "Sono"
-
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
-msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "Ŝanĝi sonan laŭtecon, enigojn, eligojn, kaj avertajn sonojn"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "Regi kion vi volas kunhavigi kun aliaj"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
-msgid "multimedia-volume-control"
-msgstr "multimedia-volume-control"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
+
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+msgstr ""
+"kunhavigi;kunhavigado;sekurŝelo;ssu;gastigo;nomo;fora;defora;labortablo;"
+"medio;aŭdo;vido;video;filmoj;aŭdovida;bildoj;fotoj;kinofilmoj;servilo;"
+"bildigilo;"
+
+#: panels/sharing/networks.ui:19
+msgid "Networks"
+msgstr "Retoj"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
+msgid "Enable or disable remote login"
+msgstr "Ŝalti aŭ malŝalti deforan salutadon"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Aŭtentigo estas bezonata por ŝalti aŭ malŝalti deforan salutadon"
+
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "Sono"
+
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "Ŝanĝi sonan laŭtecon, enigojn, eligojn, kaj avertajn sonojn"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
 
 #. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/sound/data/gnome-sound-panel.desktop.in.in:20
@@ -5643,54 +6115,54 @@ msgstr "Vitro"
 msgid "Sonar"
 msgstr "Sonaro"
 
-#: panels/sound/gvc-balance-bar.c:104
+#: panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "Maldekstra"
 
-#: panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "Dekstra"
 
-#: panels/sound/gvc-balance-bar.c:108
+#: panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "Malantaŭa"
 
-#: panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "Antaŭa"
 
-#: panels/sound/gvc-balance-bar.c:112
+#: panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimuma"
 
-#: panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maksimuma"
 
-#: panels/sound/gvc-balance-bar.c:288
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Balance:"
 msgstr "Ekvili_bro:"
 
-#: panels/sound/gvc-balance-bar.c:291
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Fade:"
 msgstr "_Dissolvo:"
 
-#: panels/sound/gvc-balance-bar.c:294
+#: panels/sound/gvc-balance-bar.c:297
 msgid "_Subwoofer:"
 msgstr "_Bas-laŭparolilo:"
 
-#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
+#: panels/sound/gvc-channel-bar.c:614 panels/sound/gvc-channel-bar.c:623
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: panels/sound/gvc-channel-bar.c:614
+#: panels/sound/gvc-channel-bar.c:618
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Neamplifita"
@@ -5717,47 +6189,47 @@ msgstr "Aparato"
 msgid "Speaker Testing for %s"
 msgstr "Laŭtparolila testo por %s"
 
-#: panels/sound/gvc-mixer-dialog.c:1617
+#: panels/sound/gvc-mixer-dialog.c:1620
 msgid "_Output volume:"
-msgstr "_Eliga sonforto:"
+msgstr "_Eliga laŭteco:"
 
-#: panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "Output"
 msgstr "Eligo"
 
-#: panels/sound/gvc-mixer-dialog.c:1636
+#: panels/sound/gvc-mixer-dialog.c:1642
 msgid "C_hoose a device for sound output:"
 msgstr "_Elektu aparaton por soneligo:"
 
-#: panels/sound/gvc-mixer-dialog.c:1658
+#: panels/sound/gvc-mixer-dialog.c:1667
 msgid "Settings for the selected device:"
 msgstr "Agordoj de la elektita aparato:"
 
-#: panels/sound/gvc-mixer-dialog.c:1669
+#: panels/sound/gvc-mixer-dialog.c:1681
 msgid "Input"
 msgstr "Enigo"
 
-#: panels/sound/gvc-mixer-dialog.c:1676
+#: panels/sound/gvc-mixer-dialog.c:1690
 msgid "_Input volume:"
-msgstr "E_niga sonforto:"
+msgstr "E_niga laŭteco:"
 
-#: panels/sound/gvc-mixer-dialog.c:1697
+#: panels/sound/gvc-mixer-dialog.c:1713
 msgid "Input level:"
 msgstr "Enignivelo:"
 
-#: panels/sound/gvc-mixer-dialog.c:1723
+#: panels/sound/gvc-mixer-dialog.c:1743
 msgid "C_hoose a device for sound input:"
 msgstr "_Elektu aparaton por sonenigo:"
 
-#: panels/sound/gvc-mixer-dialog.c:1747
+#: panels/sound/gvc-mixer-dialog.c:1771
 msgid "Sound Effects"
 msgstr "Sonefektoj"
 
-#: panels/sound/gvc-mixer-dialog.c:1754
+#: panels/sound/gvc-mixer-dialog.c:1780
 msgid "_Alert volume:"
 msgstr "Sonforto por _avertoj:"
 
-#: panels/sound/gvc-mixer-dialog.c:1775
+#: panels/sound/gvc-mixer-dialog.c:1805
 msgid "No application is currently playing or recording audio."
 msgstr "Neniu aplikaĵo estas aktuale ludanta aŭ registranta sonon."
 
@@ -5794,9 +6266,9 @@ msgstr "_Elekti avertsonon:"
 msgid "Stop"
 msgstr "Halti"
 
-#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:343
 msgid "Test"
-msgstr "Testo"
+msgstr "Testi"
 
 #: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
@@ -5804,7 +6276,7 @@ msgstr "Bas-laŭtparolilo"
 
 #: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
-msgstr "Propre"
+msgstr "Propra"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:86
 #: panels/thunderbolt/cc-bolt-device-entry.c:119
@@ -6008,336 +6480,342 @@ msgid_plural "%d pixels"
 msgstr[0] "%d bildero"
 msgstr[1] "%d bilderoj"
 
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
-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: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
-msgid "preferences-desktop-accessibility"
-msgstr "preferences-desktop-accessibility"
-
-#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr ""
-"Klavaro;Muso;a11y;Alirebleco;Kontrasto;Zomi;Ekrano;Legilo;teksto;tiparo;"
-"grando;AccessX;Fiksaj;Klavoj;Salti;Muso;Duobla;klaki;alklaki;Malfruo;"
-"Prokrasto;Asisto;Helpo;Ripeti;Pusli;"
-
-#: panels/universal-access/uap.ui:93
+#: panels/universal-access/cc-ua-panel.ui:93
 msgid "_Always Show Universal Access Menu"
 msgstr "Ĉi_am montri la menuon de universala aliro"
 
-#: panels/universal-access/uap.ui:135
+#: panels/universal-access/cc-ua-panel.ui:135
 msgid "Seeing"
 msgstr "Vidi"
 
-#: panels/universal-access/uap.ui:181
+#: panels/universal-access/cc-ua-panel.ui:181
 msgid "_High Contrast"
 msgstr "_Alta kontrasto"
 
-#: panels/universal-access/uap.ui:228
+#: panels/universal-access/cc-ua-panel.ui:228
 msgid "_Large Text"
 msgstr "_Granda teksto"
 
-#: panels/universal-access/uap.ui:273
+#: panels/universal-access/cc-ua-panel.ui:273
 msgid "C_ursor Size"
 msgstr "_Grando de musmontrilo"
 
-#: panels/universal-access/uap.ui:320
+#: panels/universal-access/cc-ua-panel.ui:320
 #: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: panels/universal-access/uap.ui:366
+#: panels/universal-access/cc-ua-panel.ui:366
 msgid "Screen _Reader"
 msgstr "Ek_ranlegilo"
 
-#: panels/universal-access/uap.ui:412 panels/universal-access/uap.ui:1243
+#: panels/universal-access/cc-ua-panel.ui:412
+#: panels/universal-access/cc-ua-panel.ui:1243
 msgid "_Sound Keys"
 msgstr "_Son-klavoj"
 
-#: panels/universal-access/uap.ui:474
+#: panels/universal-access/cc-ua-panel.ui:474
 msgid "Hearing"
 msgstr "Aŭdado"
 
-#: panels/universal-access/uap.ui:518 panels/universal-access/uap.ui:1346
+#: panels/universal-access/cc-ua-panel.ui:518
+#: panels/universal-access/cc-ua-panel.ui:1346
 msgid "_Visual Alerts"
 msgstr "_Videblaj avertoj"
 
-#: panels/universal-access/uap.ui:626
+#: panels/universal-access/cc-ua-panel.ui:626
 msgid "Screen _Keyboard"
 msgstr "Ekran_klavaro"
 
-#: panels/universal-access/uap.ui:671
+#: panels/universal-access/cc-ua-panel.ui:671
 msgid "R_epeat Keys"
 msgstr "Rip_eti klavojn"
 
-#: panels/universal-access/uap.ui:717
+#: panels/universal-access/cc-ua-panel.ui:717
 msgid "Cursor _Blinking"
 msgstr "_Pulsado de tajpmontrilo"
 
-#: panels/universal-access/uap.ui:763
+#: panels/universal-access/cc-ua-panel.ui:763
 msgid "_Typing Assist (AccessX)"
 msgstr "_Tajpada asisto (AccessX)"
 
-#: panels/universal-access/uap.ui:824
+#: panels/universal-access/cc-ua-panel.ui:824
 msgid "Pointing & Clicking"
 msgstr "Indiki & klaki"
 
-#: panels/universal-access/uap.ui:870
+#: panels/universal-access/cc-ua-panel.ui:870
 msgid "_Mouse Keys"
 msgstr "_Musklavoj"
 
-#: panels/universal-access/uap.ui:915
+#: panels/universal-access/cc-ua-panel.ui:915
 msgid "_Click Assist"
 msgstr "_Alklaka asisto"
 
-#: panels/universal-access/uap.ui:961
+#: panels/universal-access/cc-ua-panel.ui:961
 msgid "_Double-Click Delay"
 msgstr "_Duobla-klaka prokrasto"
 
-#: panels/universal-access/uap.ui:981
+#: panels/universal-access/cc-ua-panel.ui:981
 msgid "Double-Click Delay"
 msgstr "Duobla-klaka prokrasto"
 
-#: panels/universal-access/uap.ui:1048
+#: panels/universal-access/cc-ua-panel.ui:1048
 msgid "Cursor Size"
 msgstr "Grando de musmontrilo"
 
-#: panels/universal-access/uap.ui:1075
+#: panels/universal-access/cc-ua-panel.ui:1075
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "Grando de musmontrilo povas esti kombinita kun zomo por plifaciligi vidadon "
 "de musmontrilon."
 
-#: panels/universal-access/uap.ui:1111
+#: panels/universal-access/cc-ua-panel.ui:1111
 msgid "Screen Reader"
 msgstr "Ekranlegilo"
 
-#: panels/universal-access/uap.ui:1128
+#: panels/universal-access/cc-ua-panel.ui:1128
 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:1161
+#: panels/universal-access/cc-ua-panel.ui:1161
 msgid "_Screen Reader"
 msgstr "_Ekranlegilo"
 
-#: panels/universal-access/uap.ui:1200
+#: panels/universal-access/cc-ua-panel.ui:1200
 msgid "Sound Keys"
 msgstr "Son-klavoj"
 
-#: panels/universal-access/uap.ui:1218
+#: panels/universal-access/cc-ua-panel.ui:1218
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Pepi kiam majuskla kaj nombra baskuloj estas ŝaltita aŭ malŝaltita."
 
-#: panels/universal-access/uap.ui:1288
+#: panels/universal-access/cc-ua-panel.ui:1288
 msgid "Visual Alerts"
 msgstr "Vidaj avertoj"
 
-#: panels/universal-access/uap.ui:1292
+#: panels/universal-access/cc-ua-panel.ui:1292
 msgid "_Test flash"
 msgstr "_Provi fulmadon"
 
-#: panels/universal-access/uap.ui:1321
+#: panels/universal-access/cc-ua-panel.ui:1321
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Uzi vidan indikon kiam averta sono okazas."
 
-#: panels/universal-access/uap.ui:1372
+#: panels/universal-access/cc-ua-panel.ui:1372
 msgid "Flash the _window title"
 msgstr "Fulmi la _fenestran titolon"
 
-#: panels/universal-access/uap.ui:1390
+#: panels/universal-access/cc-ua-panel.ui:1390
 msgid "Flash the entire _screen"
 msgstr "Fulmi la tutan _ekranon"
 
-#: panels/universal-access/uap.ui:1435
+#: panels/universal-access/cc-ua-panel.ui:1435
 msgid "Repeat Keys"
 msgstr "Ripeti klavojn"
 
-#: panels/universal-access/uap.ui:1465
+#: panels/universal-access/cc-ua-panel.ui:1465
 msgid "Key presses repeat when key is held down."
 msgstr "Klavpremoj ripetas kiam klavo estas tenata malsupre."
 
-#: panels/universal-access/uap.ui:1544
+#: panels/universal-access/cc-ua-panel.ui:1545
 msgid "Repeat keys delay"
 msgstr "Ripetklava prokrasto"
 
-#: panels/universal-access/uap.ui:1592 panels/universal-access/uap.ui:1725
+#: panels/universal-access/cc-ua-panel.ui:1593
+#: panels/universal-access/cc-ua-panel.ui:1728
 msgid "Speed"
 msgstr "Rapideco"
 
-#: panels/universal-access/uap.ui:1629
+#: panels/universal-access/cc-ua-panel.ui:1632
 msgid "Repeat keys speed"
 msgstr "Ripetklava rapido"
 
-#: panels/universal-access/uap.ui:1653
+#: panels/universal-access/cc-ua-panel.ui:1656
 msgid "Cursor Blinking"
 msgstr "Pulsanta tajpmontrilo"
 
-#: panels/universal-access/uap.ui:1683
+#: panels/universal-access/cc-ua-panel.ui:1686
 msgid "Cursor blinks in text fields."
 msgstr "Tajpmontrilo pulsas en tekstkampo."
 
-#: panels/universal-access/uap.ui:1762
+#: panels/universal-access/cc-ua-panel.ui:1765
 msgid "Cursor blinking speed"
 msgstr "Tajpmontrila pulsrapideco"
 
-#: panels/universal-access/uap.ui:1798
+#: panels/universal-access/cc-ua-panel.ui:1801
 msgid "Typing Assist"
 msgstr "Tajpada asisto"
 
-#: panels/universal-access/uap.ui:1837
+#: panels/universal-access/cc-ua-panel.ui:1840
 msgid "_Sticky Keys"
 msgstr "Fik_saj klavoj"
 
-#: panels/universal-access/uap.ui:1854
+#: panels/universal-access/cc-ua-panel.ui:1857
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Traktas sinsekvon de modifaj klavoj kiel klavkombino"
 
-#: panels/universal-access/uap.ui:1878
+#: panels/universal-access/cc-ua-panel.ui:1881
 msgid "_Disable if two keys are pressed together"
 msgstr "_Malŝalti se du klavoj estas kune premitaj"
 
-#: panels/universal-access/uap.ui:1896
+#: panels/universal-access/cc-ua-panel.ui:1899
 msgid "Beep when a _modifier key is pressed"
 msgstr "Pepi se _modifa klavo estas premata"
 
-#: panels/universal-access/uap.ui:1944
+#: panels/universal-access/cc-ua-panel.ui:1947
 msgid "S_low Keys"
 msgstr "_Malrapidaj klavoj"
 
-#: panels/universal-access/uap.ui:1961
+#: panels/universal-access/cc-ua-panel.ui:1964
 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:1994 panels/universal-access/uap.ui:2207
-#: panels/universal-access/uap.ui:2544
+#: panels/universal-access/cc-ua-panel.ui:1997
+#: panels/universal-access/cc-ua-panel.ui:2210
+#: panels/universal-access/cc-ua-panel.ui:2547
 msgid "A_cceptance delay:"
 msgstr "Antaŭak_cepta prokrasto:"
 
-#: panels/universal-access/uap.ui:2016
+#: panels/universal-access/cc-ua-panel.ui:2019
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Mallonga"
 
-#: panels/universal-access/uap.ui:2035
+#: panels/universal-access/cc-ua-panel.ui:2038
 msgid "Slow keys typing delay"
 msgstr "Malrapidklava tajpada prokrasto"
 
-#: panels/universal-access/uap.ui:2050
+#: panels/universal-access/cc-ua-panel.ui:2053
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Longa"
 
-#: panels/universal-access/uap.ui:2077
+#: panels/universal-access/cc-ua-panel.ui:2080
 msgid "Beep when a key is pr_essed"
 msgstr "Pepi se klavo estas pr_emata"
 
-#: panels/universal-access/uap.ui:2094
+#: panels/universal-access/cc-ua-panel.ui:2097
 msgid "Beep when a key is _accepted"
 msgstr "Pepi se klavo estas _akceptita"
 
-#: panels/universal-access/uap.ui:2111 panels/universal-access/uap.ui:2290
+#: panels/universal-access/cc-ua-panel.ui:2114
+#: panels/universal-access/cc-ua-panel.ui:2293
 msgid "Beep when a key is _rejected"
 msgstr "Pepi kiam klavo estas malak_ceptita"
 
-#: panels/universal-access/uap.ui:2157
+#: panels/universal-access/cc-ua-panel.ui:2160
 msgid "_Bounce Keys"
 msgstr "_Saltaj klavoj"
 
-#: panels/universal-access/uap.ui:2174
+#: panels/universal-access/cc-ua-panel.ui:2177
 msgid "Ignores fast duplicate keypresses"
 msgstr "Malatenti rapidajn duoblajn klavpremojn"
 
-#: panels/universal-access/uap.ui:2229
+#: panels/universal-access/cc-ua-panel.ui:2232
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Mallonga"
 
-#: panels/universal-access/uap.ui:2248
+#: panels/universal-access/cc-ua-panel.ui:2251
 msgid "Bounce keys typing delay"
 msgstr "Saltklava tajpada prokrasto"
 
-#: panels/universal-access/uap.ui:2263
+#: panels/universal-access/cc-ua-panel.ui:2266
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Longa"
 
-#: panels/universal-access/uap.ui:2376
+#: panels/universal-access/cc-ua-panel.ui:2379
 msgid "_Enable by Keyboard"
 msgstr "Ŝalti p_er klavaro"
 
-#: panels/universal-access/uap.ui:2393
+#: panels/universal-access/cc-ua-panel.ui:2396
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Ŝalti kaj malŝalti funkciojn por universala aliro per la klavaro"
 
-#: panels/universal-access/uap.ui:2457
+#: panels/universal-access/cc-ua-panel.ui:2460
 msgid "Click Assist"
 msgstr "Alklaka asisto"
 
-#: panels/universal-access/uap.ui:2493
+#: panels/universal-access/cc-ua-panel.ui:2496
 msgid "_Simulated Secondary Click"
 msgstr "_Simulita duaranĝa alklako"
 
-#: panels/universal-access/uap.ui:2511
+#: panels/universal-access/cc-ua-panel.ui:2514
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Fari duaranĝan alklakon per premteni la ĉefa butono"
 
-#: panels/universal-access/uap.ui:2565
+#: panels/universal-access/cc-ua-panel.ui:2568
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Mallonga"
 
-#: panels/universal-access/uap.ui:2584
+#: panels/universal-access/cc-ua-panel.ui:2587
 msgid "Secondary click delay"
 msgstr "Duaranĝa-alklaka prokrasto"
 
-#: panels/universal-access/uap.ui:2599
+#: panels/universal-access/cc-ua-panel.ui:2602
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Longa"
 
-#: panels/universal-access/uap.ui:2656
+#: panels/universal-access/cc-ua-panel.ui:2659
 msgid "_Hover Click"
 msgstr "Ŝ_veba alklako"
 
-#: panels/universal-access/uap.ui:2674
+#: panels/universal-access/cc-ua-panel.ui:2677
 msgid "Trigger a click when the pointer hovers"
 msgstr "Fari alklakon kiam la musmontrilo ŝvebas"
 
-#: panels/universal-access/uap.ui:2707
+#: panels/universal-access/cc-ua-panel.ui:2710
 msgid "D_elay:"
 msgstr "_Prokrasto:"
 
-#: panels/universal-access/uap.ui:2729
+#: panels/universal-access/cc-ua-panel.ui:2732
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Mallonga"
 
-#: panels/universal-access/uap.ui:2760
+#: panels/universal-access/cc-ua-panel.ui:2763
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Longa"
 
-#: panels/universal-access/uap.ui:2796
+#: panels/universal-access/cc-ua-panel.ui:2799
 msgid "Motion _threshold:"
 msgstr "_Mov-sojlo:"
 
-#: panels/universal-access/uap.ui:2818
+#: panels/universal-access/cc-ua-panel.ui:2821
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Malgranda"
 
-#: panels/universal-access/uap.ui:2849
+#: panels/universal-access/cc-ua-panel.ui:2852
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Granda"
 
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+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: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+msgstr ""
+"Klavaro;Muso;a11y;Alirebleco;Kontrasto;Zomi;Ekrano;Legilo;teksto;tiparo;"
+"grando;AccessX;Fiksaj;Klavoj;Salti;Muso;Duobla;klaki;alklaki;Malfruo;"
+"Prokrasto;Asisto;Helpo;Ripeti;Pulsi;vida;aŭda;tajpi;"
+
 #: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Short"
@@ -6387,171 +6865,222 @@ msgstr "Dekstra duono"
 msgid "Zoom Options"
 msgstr "Zomagordoj"
 
-#: panels/universal-access/zoom-options.ui:188
+#: panels/universal-access/zoom-options.ui:185
 msgid "_Magnification:"
 msgstr "_Pligrandigo:"
 
-#: panels/universal-access/zoom-options.ui:252
+#: panels/universal-access/zoom-options.ui:249
 msgid "_Follow mouse cursor"
 msgstr "_Sekvi musmontrilon"
 
-#: panels/universal-access/zoom-options.ui:272
+#: panels/universal-access/zoom-options.ui:269
 msgid "_Screen part:"
 msgstr "_Parto de ekrano:"
 
-#: panels/universal-access/zoom-options.ui:334
+#: panels/universal-access/zoom-options.ui:331
 msgid "Magnifier _extends outside of screen"
 msgstr "Pligrandigilo _etendas ekster la ekranon"
 
-#: panels/universal-access/zoom-options.ui:353
+#: panels/universal-access/zoom-options.ui:350
 msgid "_Keep magnifier cursor centered"
 msgstr "_Teni pligrandigilan musmontrilon en la centro"
 
-#: panels/universal-access/zoom-options.ui:372
+#: panels/universal-access/zoom-options.ui:369
 msgid "Magnifier cursor _pushes contents around"
 msgstr "Pligrandigila mustmontrilo _movas ĉirkaŭan enhavon"
 
-#: panels/universal-access/zoom-options.ui:391
+#: panels/universal-access/zoom-options.ui:388
 msgid "Magnifier cursor moves with _contents"
 msgstr "Pligrandigila kursoro movas kune kun _enhavo"
 
-#: panels/universal-access/zoom-options.ui:425
+#: panels/universal-access/zoom-options.ui:422
 msgid "Magnifier Position:"
 msgstr "Pligrandigila pozicio:"
 
-#: panels/universal-access/zoom-options.ui:446
+#: panels/universal-access/zoom-options.ui:443
 msgid "Magnifier"
 msgstr "Pligrandigilo"
 
-#: panels/universal-access/zoom-options.ui:493
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "_Dikeco:"
 
-#: panels/universal-access/zoom-options.ui:519
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Maldika"
 
-#: panels/universal-access/zoom-options.ui:551
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Dika"
 
-#: panels/universal-access/zoom-options.ui:577
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "_Longo:"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:629
+#: panels/universal-access/zoom-options.ui:623
 msgid "Co_lor:"
 msgstr "Ko_loro:"
 
-#: panels/universal-access/zoom-options.ui:693
+#: panels/universal-access/zoom-options.ui:687
 msgid "_Crosshairs:"
 msgstr "_Celiloj:"
 
-#: panels/universal-access/zoom-options.ui:744
+#: panels/universal-access/zoom-options.ui:735
 msgid "_Overlaps mouse cursor"
 msgstr "Surmetas musm_ontrilon"
 
-#: panels/universal-access/zoom-options.ui:782
+#: panels/universal-access/zoom-options.ui:773
 msgid "Crosshairs"
 msgstr "Celiloj"
 
-#: panels/universal-access/zoom-options.ui:831
+#: panels/universal-access/zoom-options.ui:822
 msgid "_White on black:"
 msgstr "_Blanko sur nigro:"
 
-#: panels/universal-access/zoom-options.ui:854
+#: panels/universal-access/zoom-options.ui:842
 msgid "_Brightness:"
 msgstr "_Heleco:"
 
-#: panels/universal-access/zoom-options.ui:878
+#: panels/universal-access/zoom-options.ui:863
 msgid "_Contrast:"
 msgstr "_Kontrasto:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:901
+#: panels/universal-access/zoom-options.ui:883
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "Ko_loro"
 
-#: panels/universal-access/zoom-options.ui:929
+#: panels/universal-access/zoom-options.ui:908
 msgctxt "universal access, color"
 msgid "None"
 msgstr "Neniu"
 
-#: panels/universal-access/zoom-options.ui:961
+#: panels/universal-access/zoom-options.ui:940
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "Plena"
 
-#: panels/universal-access/zoom-options.ui:1027
+#: panels/universal-access/zoom-options.ui:1003
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Malalta"
 
-#: panels/universal-access/zoom-options.ui:1060
+#: panels/universal-access/zoom-options.ui:1036
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Alta"
 
-#: panels/universal-access/zoom-options.ui:1091
+#: panels/universal-access/zoom-options.ui:1067
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Malalta"
 
-#: panels/universal-access/zoom-options.ui:1124
+#: panels/universal-access/zoom-options.ui:1100
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Alta"
 
-#: panels/universal-access/zoom-options.ui:1160
+#: panels/universal-access/zoom-options.ui:1136
 msgid "Color Effects:"
 msgstr "Kolorefektoj:"
 
-#: panels/universal-access/zoom-options.ui:1185
+#: panels/universal-access/zoom-options.ui:1161
 msgid "Color Effects"
 msgstr "Kolorefektoj"
 
-#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/cc-add-user-dialog.c:34
+msgid "Should match the web address of your login provider."
+msgstr "Devus akordi al la retadredo de via salut-provizanto."
+
+#: panels/user-accounts/cc-add-user-dialog.c:204
+msgid "Failed to add account"
+msgstr "Malsukcesis aldoni konton"
+
+#: panels/user-accounts/cc-add-user-dialog.c:652
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "La pasvortoj ne kongruas."
+
+#: panels/user-accounts/cc-add-user-dialog.c:874
+#: panels/user-accounts/cc-add-user-dialog.c:920
+#: panels/user-accounts/cc-add-user-dialog.c:941
+msgid "Failed to register account"
+msgstr "Malsukcesis registri konton"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1064
+msgid "No supported way to authenticate with this domain"
+msgstr "Ne valida maniero por aŭtentigi per tiu ĉi domajno"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1137
+msgid "Failed to join domain"
+msgstr "Malsukcesis aliĝi al domajno"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1198
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"Tiu salutnomo ne funkciis.\n"
+"Bonvolu provi denove."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1205
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"Tiu salut-pasvorto ne funkciis.\n"
+"Bonvolu provi denove."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1213
+msgid "Failed to log into domain"
+msgstr "Malsukcesis salutado en domajno"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1271
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "Ne eblas trovi la domajnon. Ĉu vi eble misliterumis ĝin?"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:18
 #: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "Aldoni uzanton"
 
-#: panels/user-accounts/data/account-dialog.ui:171
+#: panels/user-accounts/cc-add-user-dialog.ui:179
 msgid "_Full Name"
 msgstr "_Tuta nomo"
 
-#: panels/user-accounts/data/account-dialog.ui:197
-#: panels/user-accounts/data/user-accounts-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:205
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Standard"
 msgstr "Norma"
 
-#: panels/user-accounts/data/account-dialog.ui:207
-#: panels/user-accounts/data/user-accounts-dialog.ui:155
+#: panels/user-accounts/cc-add-user-dialog.ui:215
+#: panels/user-accounts/cc-user-panel.ui:161
 msgid "Administrator"
 msgstr "Administranto"
 
-#: panels/user-accounts/data/account-dialog.ui:223
-#: panels/user-accounts/data/user-accounts-dialog.ui:173
+#: panels/user-accounts/cc-add-user-dialog.ui:231
+#: panels/user-accounts/cc-user-panel.ui:179
 msgid "Account _Type"
 msgstr "Konto_speco"
 
-#: panels/user-accounts/data/account-dialog.ui:260
+#: panels/user-accounts/cc-add-user-dialog.ui:268
 msgid "Allow user to set a password when they next _login"
 msgstr "Permesi al uzanto agordi pasvorton kiam ri venonte _salutas"
 
-#: panels/user-accounts/data/account-dialog.ui:274
+#: panels/user-accounts/cc-add-user-dialog.ui:282
 msgid "Set a password _now"
 msgstr "Agordi pasvorton _nun"
 
-#: panels/user-accounts/data/account-dialog.ui:387
+#: panels/user-accounts/cc-add-user-dialog.ui:404
 msgid "_Confirm"
 msgstr "_Konfirmi"
 
-#: panels/user-accounts/data/account-dialog.ui:463
-#: panels/user-accounts/data/account-dialog.ui:667
+#: panels/user-accounts/cc-add-user-dialog.ui:484
+#: panels/user-accounts/cc-add-user-dialog.ui:691
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
@@ -6561,23 +7090,331 @@ msgstr ""
 "uzantokonto sur ĉi tiu aparato. Vi povas ankaŭ uzi tiun konto por aliri "
 "firmaajn risurcojn sur la interreto."
 
-#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/cc-add-user-dialog.ui:506
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "_Domajno"
 
-#: panels/user-accounts/data/account-dialog.ui:707
+#: panels/user-accounts/cc-add-user-dialog.ui:731
 msgid "You are Offline"
 msgstr "Vi estas nekonektite"
 
-#: panels/user-accounts/data/account-dialog.ui:726
+#: panels/user-accounts/cc-add-user-dialog.ui:750
 msgid "You must be online in order to add enterprise users."
 msgstr "Vi devas esti konektite por aldoni entreprenajn uzantojn."
 
-#: panels/user-accounts/data/account-dialog.ui:760
+#: panels/user-accounts/cc-add-user-dialog.ui:781
 msgid "_Enterprise Login"
 msgstr "_Entreprena salutado"
 
+#: panels/user-accounts/cc-avatar-chooser.c:269
+msgid "Browse for more pictures"
+msgstr "Foliumi por pliaj bildoj"
+
+#: panels/user-accounts/cc-avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "Fari foton…"
+
+#: panels/user-accounts/cc-avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "Elekti dosieron…"
+
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "Ĉi tiu semajno"
+
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "Pasinta semajno"
+
+#. Translators: This is a date format string in the style of "Feb 18",
+#. shown as the first day of a week on login history dialog.
+#. Translators: This is a date format string in the style of "Feb 24",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:82
+#: panels/user-accounts/cc-login-history-dialog.c:86
+msgctxt "login history week label"
+msgid "%b %e"
+msgstr "%-e-a de %b"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:91
+msgctxt "login history week label"
+msgid "%b %e, %Y"
+msgstr "%-e-a de %b, %Y"
+
+#. Translators: This indicates a week label on a login history.
+#. The first %s is the first day of a week, and the second %s the last day.
+#: panels/user-accounts/cc-login-history-dialog.c:96
+#, c-format
+msgctxt "login history week label"
+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/cc-login-history-dialog.c:173
+#: panels/user-accounts/cc-user-panel.c:766
+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/cc-login-history-dialog.c:176
+#: panels/user-accounts/cc-user-panel.c:770
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "Seanco finis"
+
+#: panels/user-accounts/cc-login-history-dialog.c:249
+msgid "Session Started"
+msgstr "Seanco komencis"
+
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: panels/user-accounts/cc-login-history-dialog.c:343
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — Aktiveco de konto"
+
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "Bonvole elektu alian pasvorton."
+
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "Bonvolu tajpi vian aktualan pasvorton denove."
+
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "Ne eblis ŝanĝi pasvorton"
+
+#: panels/user-accounts/cc-password-dialog.ui:7
+msgid "Change Password"
+msgstr "Ŝanĝi pasvorton"
+
+#: panels/user-accounts/cc-password-dialog.ui:37
+msgid "Ch_ange"
+msgstr "Ŝ_anĝi"
+
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "_Konfirmi novan pasvorton"
+
+#: panels/user-accounts/cc-password-dialog.ui:162
+msgid "_New Password"
+msgstr "_Nova pasvorto"
+
+#: panels/user-accounts/cc-password-dialog.ui:216
+msgid "Current _Password"
+msgstr "Nuna _pasvorto"
+
+#: panels/user-accounts/cc-password-dialog.ui:254
+msgid "Allow user to change their password on next login"
+msgstr "Permesi al uzanto ŝanĝi rian pasvorton dum venontan salutadon"
+
+#: panels/user-accounts/cc-password-dialog.ui:267
+msgid "Set a password now"
+msgstr "Agordi pasvorton nun"
+
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "Ne povas aŭtomate aliĝi al ĉi tiu domajnspeco"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "Ne trovis tian domajnon aŭ regnon"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "Ne eblas saluti kiel %s en la %s domajno"
+
+#: panels/user-accounts/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "Nevalida pasvorto, bonvolu provi denove"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "Ne eblis koneti al la %s domajno: %s"
+
+#: panels/user-accounts/cc-user-panel.c:212
+msgid "Your account"
+msgstr "Via konto"
+
+#: panels/user-accounts/cc-user-panel.c:384
+msgid "Failed to delete user"
+msgstr "Malsukcesis forigi uzanton"
+
+#: panels/user-accounts/cc-user-panel.c:442
+#: panels/user-accounts/cc-user-panel.c:501
+#: panels/user-accounts/cc-user-panel.c:553
+msgid "Failed to revoke remotely managed user"
+msgstr "Malsukcesis senvalidigi defore mastrumitan uzanton"
+
+#: panels/user-accounts/cc-user-panel.c:605
+msgid "You cannot delete your own account."
+msgstr "Vi ne povas forigi vian propran konton."
+
+#: panels/user-accounts/cc-user-panel.c:614
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s jam estas salutite"
+
+#: panels/user-accounts/cc-user-panel.c:618
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr ""
+"La forigo de uzanto kiu estas ankoraŭ salutita, povas rezulti en "
+"nekonsekvencan sistemon."
+
+#: panels/user-accounts/cc-user-panel.c:627
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "Ĉu vi volas teni la dosierojn de %s?"
+
+#: panels/user-accounts/cc-user-panel.c:631
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+msgstr ""
+"Eblas teni la hejmdosierujon, retpoŝtmandrenon kaj provizorajn dosierojn "
+"ĉirkaŭe dum forigante uzantkonton."
+
+#: panels/user-accounts/cc-user-panel.c:634
+msgid "_Delete Files"
+msgstr "_Forigi dosierojn"
+
+#: panels/user-accounts/cc-user-panel.c:635
+msgid "_Keep Files"
+msgstr "_Konservi dosierojn"
+
+#: panels/user-accounts/cc-user-panel.c:649
+#, c-format
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "Ĉu vi certe volas senvalidigi la defore mastrumita konto de %s?"
+
+#: panels/user-accounts/cc-user-panel.c:653
+msgid "_Delete"
+msgstr "_Forigi"
+
+#: panels/user-accounts/cc-user-panel.c:703
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "Konto estas malŝaltita"
+
+#: panels/user-accounts/cc-user-panel.c:711
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "Agordota dum venonta salutado"
+
+#: panels/user-accounts/cc-user-panel.c:714
+msgctxt "Password mode"
+msgid "None"
+msgstr "Neniu"
+
+#: panels/user-accounts/cc-user-panel.c:759
+msgid "Logged in"
+msgstr "Salutita"
+
+#: panels/user-accounts/cc-user-panel.c:1089
+msgid "Failed to contact the accounts service"
+msgstr "Malsukcesis konekti la kontoservon"
+
+#: panels/user-accounts/cc-user-panel.c:1091
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "Bonvolu certigi ke la AccountService estas instalita kaj ŝaltita."
+
+#. 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/cc-user-panel.c:1123
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"Por fari ŝanĝojn,\n"
+"alklaku unue la *-piktogramon"
+
+#: panels/user-accounts/cc-user-panel.c:1196
+msgid "Create a user account"
+msgstr "Krei uzantkonton"
+
+#: panels/user-accounts/cc-user-panel.c:1207
+#: panels/user-accounts/cc-user-panel.c:1335
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"Por krei uzantkonton,\n"
+"alklaku unue la *-piktogramon"
+
+#: panels/user-accounts/cc-user-panel.c:1216
+msgid "Delete the selected user account"
+msgstr "Forigi la elektitan uzantkonton"
+
+#: panels/user-accounts/cc-user-panel.c:1228
+#: panels/user-accounts/cc-user-panel.c:1339
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"Por forigi la elektitan uzantkonton,\n"
+"klaku unue la *-piktogramon"
+
+#: panels/user-accounts/cc-user-panel.ui:18
+msgid "_Add User…"
+msgstr "_Aldoni uzanton…"
+
+#: panels/user-accounts/cc-user-panel.ui:70
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Via seanco devas esti restartigita por ke la ŝanĝoj efektiviĝas"
+
+#: panels/user-accounts/cc-user-panel.ui:78
+msgid "Restart Now"
+msgstr "Restarti nun"
+
+#: panels/user-accounts/cc-user-panel.ui:253
+msgid "A_utomatic Login"
+msgstr "_Aŭtomata salutado"
+
+#: panels/user-accounts/cc-user-panel.ui:295
+msgid "_Fingerprint Login"
+msgstr "_Fingroprema salutado"
+
+#: panels/user-accounts/cc-user-panel.ui:321
+#: panels/user-accounts/cc-user-panel.ui:334
+msgid "User Icon"
+msgstr "Uzanta bildsimbolo"
+
+#: panels/user-accounts/cc-user-panel.ui:398
+msgid "Last Login"
+msgstr "Pasinta salutado"
+
+#: panels/user-accounts/cc-user-panel.ui:447
+msgid "Remove User…"
+msgstr "Forigi uzanton…"
+
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/cc-user-panel.ui:480
+msgid "No Users Found"
+msgstr "Neniuj uzantoj estas trovitaj"
+
+#: panels/user-accounts/cc-user-panel.ui:490
+msgid "Unlock to add a user account."
+msgstr "Malŝlosi por krei uzantokonton."
+
 #: panels/user-accounts/data/account-fingerprint.ui:12
 msgid "Left thumb"
 msgstr "Maldekstra dikfingro"
@@ -6635,14 +7472,6 @@ msgstr ""
 "Via fingropremo estas sukcese konservita. Vi nun eblus saluti per via "
 "fingropremlegilon."
 
-#: panels/user-accounts/data/avatar-chooser.ui:27
-msgid "Take a Picture…"
-msgstr "Fari foton…"
-
-#: panels/user-accounts/data/avatar-chooser.ui:34
-msgid "Select a File…"
-msgstr "Elekti dosieron…"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "Uzantoj"
@@ -6688,76 +7517,6 @@ msgstr "Administranto-_nomo"
 msgid "Administrator Password"
 msgstr "Administranto-pasvorto"
 
-#: panels/user-accounts/data/password-dialog.ui:7
-msgid "Change Password"
-msgstr "Ŝanĝi pasvorton"
-
-#: panels/user-accounts/data/password-dialog.ui:38
-msgid "Ch_ange"
-msgstr "Ŝ_anĝi"
-
-#: panels/user-accounts/data/password-dialog.ui:142
-msgid "_Confirm New Password"
-msgstr "_Konfirmi novan pasvorton"
-
-#: panels/user-accounts/data/password-dialog.ui:159
-msgid "_New Password"
-msgstr "_Nova pasvorto"
-
-#: panels/user-accounts/data/password-dialog.ui:208
-msgid "Current _Password"
-msgstr "Nuna _pasvorto"
-
-#: panels/user-accounts/data/password-dialog.ui:243
-msgid "Allow user to change their password on next login"
-msgstr "Permesi al uzanto ŝanĝi rian pasvorton dum venontan salutadon"
-
-#: panels/user-accounts/data/password-dialog.ui:256
-msgid "Set a password now"
-msgstr "Agordi pasvorton nun"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:20
-msgid "_Add User…"
-msgstr "_Aldoni uzanton…"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:69
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "Via seanco devas esti restartigita por ke la ŝanĝoj efektiviĝas"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:77
-msgid "Restart Now"
-msgstr "Restarti nun"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:244
-msgid "A_utomatic Login"
-msgstr "_Aŭtomata salutado"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:285
-msgid "_Fingerprint Login"
-msgstr "_Fingroprema salutado"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:311
-#: panels/user-accounts/data/user-accounts-dialog.ui:324
-msgid "User Icon"
-msgstr "Uzanta bildsimbolo"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:387
-msgid "Last Login"
-msgstr "Pasinta salutado"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:434
-msgid "Remove User…"
-msgstr "Forigi uzanton…"
-
-#. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/data/user-accounts-dialog.ui:466
-msgid "No Users Found"
-msgstr "Neniuj uzantoj estas trovitaj"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:476
-msgid "Unlock to add a user account."
-msgstr "Malŝlosi por krei uzantokonton."
-
 #: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "Mastrumi uzanto-kontojn"
@@ -6766,77 +7525,77 @@ msgstr "Mastrumi uzanto-kontojn"
 msgid "Authentication is required to change user data"
 msgstr "Aŭtentigo estas bezonata por ŝanĝi uzanto-datumon"
 
-#: panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:94
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "La nova pasvorta devas esti malsama al la malnova."
 
-#: panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "Provu ŝanĝi kelkajn leterojn kaj nombrojn."
 
-#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "Provu ŝanĝi la pasvorton iom pli."
 
-#: panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "Pasvorto sen via uzantonomo estus pli forta."
 
-#: panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "Klopodu eviti vian uzantonomon en la pasvorto."
 
-#: panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "Klopodu eviti kelkajn vortojn, jam inkluditaj en la pasvorto."
 
-#: panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "Klopodu eviti komunajn vortojn."
 
-#: panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "Klopodu eviti reordon de jamaj vortoj."
 
-#: panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "Klopodu uzi pli da ciferoj."
 
-#: panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "Klopodu uzi pli da majusklaj literoj."
 
-#: panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "Klopodu uzi pli da minusklaj literoj."
 
-#: panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "Klopodu uzi pli da specialaj signoj, kiel interpunkcio."
 
-#: panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "Klopodu uzi kunmeton de literoj, ciferoj kaj interpunkcio."
 
-#: panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "Klopodu eviti ripeto de la sama signo."
 
-#: panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6845,12 +7604,12 @@ msgstr ""
 "Klopodu eviti ripeto de la sama signo: vi kunmetu literojn, ciferojn kaj "
 "interpunkcion."
 
-#: panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Klopodu eviti sekvencojn kiel 1234 aŭ abcd."
 
-#: panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6859,12 +7618,12 @@ msgstr ""
 "Pasvorto devas esti pli longa. Klopodu aldoni pli da literoj, ciferoj kaj "
 "interpunkcioj."
 
-#: panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "Kunmetu majusklojn kaj minusklojn, kaj uzu almenaŭ unu ciferon."
 
-#: panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
@@ -6921,66 +7680,30 @@ msgstr "La nova pasvorto ne enhavas sufiĉe da diversaj signoj"
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
-#: panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your login provider."
-msgstr "Devus akordi al la retadredo de via salut-provizanto."
-
-#: panels/user-accounts/um-account-dialog.c:225
-msgid "Failed to add account"
-msgstr "Malsukcesis aldoni konton"
-
-#: panels/user-accounts/um-account-dialog.c:465
-#: panels/user-accounts/um-password-dialog.c:291
-msgid "The passwords do not match."
-msgstr "La pasvortoj ne kongruas."
-
-#: panels/user-accounts/um-account-dialog.c:736
-#: panels/user-accounts/um-account-dialog.c:782
-#: panels/user-accounts/um-account-dialog.c:803
-msgid "Failed to register account"
-msgstr "Malsukcesis registri konton"
-
-#: panels/user-accounts/um-account-dialog.c:926
-msgid "No supported way to authenticate with this domain"
-msgstr "Ne valida maniero por aŭtentigi per tiu ĉi domajno"
+#: panels/user-accounts/user-utils.c:426
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "Pardonon, tiu uzantonomo ne estas disponebla. Bonvolu klopodi alian."
 
-#: panels/user-accounts/um-account-dialog.c:999
-msgid "Failed to join domain"
-msgstr "Malsukcesis aliĝi al domajno"
+#: panels/user-accounts/user-utils.c:429
+#, c-format
+msgid "The username is too long."
+msgstr "La uzantonomo estas tro longa."
 
-#: panels/user-accounts/um-account-dialog.c:1060
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr ""
-"Tiu salutnomo ne funkciis.\n"
-"Bonvolu provi denove."
+#: panels/user-accounts/user-utils.c:432
+msgid "The username cannot start with a “-”."
+msgstr "La uzantonomo ne povas komenci per “-”."
 
-#: panels/user-accounts/um-account-dialog.c:1067
+#: panels/user-accounts/user-utils.c:435
 msgid ""
-"That login password didn’t work.\n"
-"Please try again."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
-"Tiu salut-pasvorto ne funkciis.\n"
-"Bonvolu provi denove."
-
-#: panels/user-accounts/um-account-dialog.c:1075
-msgid "Failed to log into domain"
-msgstr "Malsukcesis salutado en domajno"
-
-#: panels/user-accounts/um-account-dialog.c:1133
-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-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Norma"
+"La uzantonomo rajtas nur konsisti el majusklaj kaj minusklaj literoj de a-z, "
+"ciferoj kaj la jenaj signoj: . - _"
 
-#: panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Administranto"
+#: panels/user-accounts/user-utils.c:439
+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."
 
 #: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
@@ -7067,261 +7790,6 @@ msgstr "Elektante fingron"
 msgid "Enrolling fingerprints"
 msgstr "Konservante fingropremojn"
 
-#: panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "Ĉi tiu semajno"
-
-#: panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "Pasinta semajno"
-
-#. Translators: This is a date format string in the style of "Feb 18",
-#. shown as the first day of a week on login history dialog.
-#. Translators: This is a date format string in the style of "Feb 24",
-#. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c: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: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:93
-#, c-format
-msgctxt "login history week label"
-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:177
-#: panels/user-accounts/um-user-panel.c:763
-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:180
-#: panels/user-accounts/um-user-panel.c:767
-#, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "Seanco finis"
-
-#: panels/user-accounts/um-history-dialog.c:256
-msgid "Session Started"
-msgstr "Seanco komencis"
-
-#. Translators: This is the title of the "Account Activity" dialog.
-#. The %s is the user real name.
-#: panels/user-accounts/um-history-dialog.c:299
-#, c-format
-msgid "%s — Account Activity"
-msgstr "%s — Aktiveco de konto"
-
-#: panels/user-accounts/um-password-dialog.c:150
-msgid "Please choose another password."
-msgstr "Bonvole elektu alian pasvorton."
-
-#: panels/user-accounts/um-password-dialog.c:159
-msgid "Please type your current password again."
-msgstr "Bonvolu tajpi vian aktualan pasvorton denove."
-
-#: panels/user-accounts/um-password-dialog.c:165
-msgid "Password could not be changed"
-msgstr "Ne eblis ŝanĝi pasvorton"
-
-#: panels/user-accounts/um-photo-dialog.c:227
-msgid "Browse for more pictures"
-msgstr "Foliumi por pliaj bildoj"
-
-#: panels/user-accounts/um-realm-manager.c:307
-msgid "Cannot automatically join this type of domain"
-msgstr "Ne povas aŭtomate aliĝi al ĉi tiu domajnspeco"
-
-#: panels/user-accounts/um-realm-manager.c:310
-msgid "No such domain or realm found"
-msgstr "Ne trovis tian domajnon aŭ regnon"
-
-#: panels/user-accounts/um-realm-manager.c:732
-#: panels/user-accounts/um-realm-manager.c:746
-#, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "Ne eblas saluti kiel %s en la %s domajno"
-
-#: panels/user-accounts/um-realm-manager.c:738
-msgid "Invalid password, please try again"
-msgstr "Nevalida pasvorto, bonvolu provi denove"
-
-#: panels/user-accounts/um-realm-manager.c:751
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "Ne eblis koneti al la %s domajno: %s"
-
-#: panels/user-accounts/um-user-panel.c:199
-msgid "Your account"
-msgstr "Via konto"
-
-#: panels/user-accounts/um-user-panel.c:379
-msgid "Failed to delete user"
-msgstr "Malsukcesis forigi uzanton"
-
-#: panels/user-accounts/um-user-panel.c:437
-#: panels/user-accounts/um-user-panel.c:496
-#: panels/user-accounts/um-user-panel.c:548
-msgid "Failed to revoke remotely managed user"
-msgstr "Malsukcesis senvalidigi defore mastrumitan uzanton"
-
-#: panels/user-accounts/um-user-panel.c:600
-msgid "You cannot delete your own account."
-msgstr "Vi ne povas forigi vian propran konton."
-
-#: panels/user-accounts/um-user-panel.c:609
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s jam estas salutite"
-
-#: panels/user-accounts/um-user-panel.c:613
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr ""
-"La forigo de uzanto kiu estas ankoraŭ salutita, povas rezulti en "
-"nekonsekvencan sistemon."
-
-#: panels/user-accounts/um-user-panel.c:622
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "Ĉu vi volas teni la dosierojn de %s?"
-
-#: panels/user-accounts/um-user-panel.c:626
-msgid ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-msgstr ""
-"Eblas teni la hejmdosierujon, retpoŝtmandrenon kaj provizorajn dosierojn "
-"ĉirkaŭe dum forigante uzantkonton."
-
-#: panels/user-accounts/um-user-panel.c:629
-msgid "_Delete Files"
-msgstr "_Forigi dosierojn"
-
-#: panels/user-accounts/um-user-panel.c:630
-msgid "_Keep Files"
-msgstr "_Konservi dosierojn"
-
-#: panels/user-accounts/um-user-panel.c:644
-#, c-format
-msgid "Are you sure you want to revoke remotely managed %s’s account?"
-msgstr "Ĉu vi certe volas senvalidigi la defore mastrumita konto de %s?"
-
-#: panels/user-accounts/um-user-panel.c:648
-msgid "_Delete"
-msgstr "_Forigi"
-
-#: panels/user-accounts/um-user-panel.c:698
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "Konto estas malŝaltita"
-
-#: panels/user-accounts/um-user-panel.c:706
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "Agordota dum venonta salutado"
-
-#: panels/user-accounts/um-user-panel.c:709
-msgctxt "Password mode"
-msgid "None"
-msgstr "Neniu"
-
-#: panels/user-accounts/um-user-panel.c:756
-msgid "Logged in"
-msgstr "Salutita"
-
-#: panels/user-accounts/um-user-panel.c:1101
-msgid "Failed to contact the accounts service"
-msgstr "Malsukcesis konekti la kontoservon"
-
-#: panels/user-accounts/um-user-panel.c:1103
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "Bonvolu certigi ke la AccountService estas instalita kaj ŝaltita."
-
-#. 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:1135
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"Por fari ŝanĝojn,\n"
-"alklaku unue la *-piktogramon"
-
-#: panels/user-accounts/um-user-panel.c:1175
-msgid "Create a user account"
-msgstr "Krei uzantkonton"
-
-#: panels/user-accounts/um-user-panel.c:1186
-#: panels/user-accounts/um-user-panel.c:1364
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"Por krei uzantkonton,\n"
-"alklaku unue la *-piktogramon"
-
-#: panels/user-accounts/um-user-panel.c:1196
-msgid "Delete the selected user account"
-msgstr "Forigi la elektitan uzantkonton"
-
-#: panels/user-accounts/um-user-panel.c:1208
-#: panels/user-accounts/um-user-panel.c:1369
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"Por forigi la elektitan uzantkonton,\n"
-"klaku unue la *-piktogramon"
-
-#: panels/user-accounts/um-utils.c:496
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr "Pardonon, tiu uzantonomo ne estas disponebla. Bonvolu klopodi alian."
-
-#: panels/user-accounts/um-utils.c:499
-#, c-format
-msgid "The username is too long."
-msgstr "La uzantonomo estas tro longa."
-
-#: panels/user-accounts/um-utils.c:502
-msgid "The username cannot start with a “-”."
-msgstr "La uzantonomo ne povas komenci per “-”."
-
-#: panels/user-accounts/um-utils.c:505
-msgid ""
-"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 jenaj signoj: . - _"
-
-#: panels/user-accounts/um-utils.c:509
-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."
-
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "Mapobutonoj"
@@ -7341,10 +7809,10 @@ msgid ""
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
 "Por redakti klavkombinon, elektu la “Sendi klavofrapon” agon, premu la "
-"klavbombina butono, kaj premu la novajn klavojn, aŭ premu la retropaŝan "
+"klavkombina butono, kaj premu la novajn klavojn, aŭ premu la retropaŝan "
 "klavon por vakigi."
 
-#: panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator.ui:60
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -7352,7 +7820,7 @@ msgstr ""
 "Bonvolu bateti la celajn indikilojn kiam ili aperas sur la ekrano por "
 "alĝustigi la tabulkomputilo."
 
-#: panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator.ui:77
 msgid "Mis-click detected, restarting…"
 msgstr "Misalklako dekektita, restartante…"
 
@@ -7405,7 +7873,7 @@ msgstr "%d de %d"
 msgid "Display Mapping"
 msgstr "Ekrana mapado"
 
-#: panels/wacom/cc-wacom-panel.c:804 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:825 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "Grifelo"
 
@@ -7461,33 +7929,33 @@ msgstr "Bonvolu konekti aŭ ŝalti vian Wacom tabuleton"
 msgid "Bluetooth Settings"
 msgstr "Agordoj de Bludento"
 
-#: panels/wacom/gnome-wacom-properties.ui:233
+#: panels/wacom/gnome-wacom-properties.ui:238
+msgid "Tracking Mode"
+msgstr "Ĉasreĝimo"
+
+#: panels/wacom/gnome-wacom-properties.ui:266
+msgid "Left-Handed Orientation"
+msgstr "Maldekstramano orientiĝo"
+
+#: panels/wacom/gnome-wacom-properties.ui:296
 msgid "Map to Monitor…"
 msgstr "Mapi al ekrano…"
 
-#: panels/wacom/gnome-wacom-properties.ui:249
+#: panels/wacom/gnome-wacom-properties.ui:309
 msgid "Map Buttons…"
 msgstr "Map-butonoj…"
 
-#: panels/wacom/gnome-wacom-properties.ui:265
+#: panels/wacom/gnome-wacom-properties.ui:322
 msgid "Calibrate…"
 msgstr "Alĝustigi…"
 
-#: panels/wacom/gnome-wacom-properties.ui:286
-msgid "Adjust display resolution"
-msgstr "Ĝustigi ekranan distingivon"
-
-#: panels/wacom/gnome-wacom-properties.ui:302
+#: panels/wacom/gnome-wacom-properties.ui:340
 msgid "Adjust mouse settings"
 msgstr "Agordi musagordojn"
 
-#: panels/wacom/gnome-wacom-properties.ui:330
-msgid "Tracking Mode"
-msgstr "Ĉasreĝimo"
-
-#: panels/wacom/gnome-wacom-properties.ui:358
-msgid "Left-Handed Orientation"
-msgstr "Maldekstramano orientiĝo"
+#: panels/wacom/gnome-wacom-properties.ui:356
+msgid "Adjust display resolution"
+msgstr "Ĝustigi ekranan distingivon"
 
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
@@ -7561,55 +8029,55 @@ msgstr ""
 "La stircentro estas la ĉefa interfaco de GNOME por agordado de diversaj ecoj "
 "de via labortablo."
 
-#: shell/cc-application.c:62
+#: shell/appdata/gnome-control-center.appdata.xml.in:21
+msgid "The GNOME Project"
+msgstr "La GNOME Projekto"
+
+#: shell/cc-application.c:58
 msgid "Display version number"
 msgstr "Montri versionumeron"
 
-#: shell/cc-application.c:63
+#: shell/cc-application.c:59
 msgid "Enable verbose mode"
 msgstr "Ŝalti adan reĝimon"
 
-#: shell/cc-application.c:64
+#: shell/cc-application.c:60
 msgid "Search for the string"
 msgstr "Serĉi la ĉenon"
 
-#: shell/cc-application.c:65
+#: shell/cc-application.c:61
 msgid "List possible panel names and exit"
 msgstr "Listigi eblajn panelnomojn kaj eliri"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "Panel to display"
 msgstr "Panelo por montri"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANELO] [ARGUMENTO…]"
 
-#: shell/cc-application.c:137
-msgid "Available panels:"
-msgstr "Disponeblaj paneloj:"
-
-#: shell/cc-application.c:253
-msgid "Help"
-msgstr "Helpo"
-
-#: shell/cc-application.c:254
-msgid "Quit"
-msgstr "Ĉesi"
-
 #: shell/cc-panel-list.ui:195
 msgid "No results found"
 msgstr "Neniu rezulto troviĝis"
 
-#: shell/cc-window.ui:140
+#: shell/cc-panel-loader.c:279
+msgid "Available panels:"
+msgstr "Disponeblaj paneloj:"
+
+#: shell/cc-window.ui:138
 msgid "All Settings"
 msgstr "Ĉiuj agordoj"
 
-#: shell/cc-window.ui:234
+#: shell/cc-window.ui:176
+msgid "Primary Menu"
+msgstr "Ĉefa menuo"
+
+#: shell/cc-window.ui:247
 msgid "Warning: Development Version"
 msgstr "Averto: Programista versio"
 
-#: shell/cc-window.ui:235
+#: shell/cc-window.ui:248
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7619,10 +8087,14 @@ msgstr ""
 "Vi spertus neĝustan sistemkonduton, datumperdon, kaj aliajn neanticipitajn "
 "problemojn. "
 
+#: shell/cc-window.ui:259
+msgid "Help"
+msgstr "Helpo"
+
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: shell/gnome-control-center.desktop.in.in:5
-msgid "gnome-control-center"
-msgstr "gnome-control-center"
+msgid "org.gnome.Settings"
+msgstr "org.gnome.Settings"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: shell/gnome-control-center.desktop.in.in:17
@@ -7704,6 +8176,35 @@ msgstr[1] "%u enigoj"
 msgid "System Sounds"
 msgstr "Sistemsonoj"
 
+#~ msgid "Language"
+#~ msgstr "Lingvo"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "Ŝanĝi al lasta fonto"
+
+#~ msgid "Switch to next source"
+#~ msgstr "Ŝanĝi al sekva fonto"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "Alternativa ŝanĝo al sekva fonto"
+
+#~ msgid "_Options"
+#~ msgstr "_Agordoj"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "Norma"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "Administranto"
+
+#~ msgid "Quit"
+#~ msgstr "Ĉesi"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
+
 #~| msgid "Background"
 #~ msgid "Back­ground"
 #~ msgstr "Fono"
@@ -7826,9 +8327,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Mirrored"
 #~ msgstr "Spegulata"
 
-#~ msgid "Primary"
-#~ msgstr "Ĉefa"
-
 #~ msgid "Secondary"
 #~ msgstr "Kroma"
 
@@ -8186,9 +8684,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Chat"
 #~ msgstr "Retbabilado"
 
-#~ msgid "Resources"
-#~ msgstr "Risurcoj"
-
 #~ msgid "Error logging into the account"
 #~ msgstr "Eraro dum ensalutado"
 
@@ -8285,9 +8780,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Supply"
 #~ msgstr "Provizo"
 
-#~ msgid "_Default printer"
-#~ msgstr "_Defaŭlta presilo"
-
 #~ msgid "Jobs"
 #~ msgstr "Taskoj"
 
@@ -8496,9 +8988,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Mouse & Touchpad Settings"
 #~ msgstr "Agordoj de muso kaj tuŝplato"
 
-#~ msgid "Sound Settings"
-#~ msgstr "Sonagordoj"
-
 #~ msgid "Keyboard Settings"
 #~ msgstr "Klavaragordoj"
 
@@ -8773,9 +9262,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Unspecified"
 #~ msgstr "Nedifinite"
 
-#~ msgid "Select a language"
-#~ msgstr "Elekti lingvon"
-
 #~ msgid "_Region:"
 #~ msgstr "_Regiono:"
 
@@ -8883,9 +9369,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Forced _Fallback Mode"
 #~ msgstr "Per_forti retropaŝan reĝimon"
 
-#~ msgid "Change keyboard settings"
-#~ msgstr "Ŝanĝi la klavaragordojn"
-
 #~ msgid "Layout Settings"
 #~ msgstr "Aranĝaj agordoj"
 
@@ -9159,9 +9642,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Enable debugging code"
 #~ msgstr "Enŝalti sencimigan kodon"
 
-#~ msgid "Version of this application"
-#~ msgstr "Versio de ĉi tiu aplikaĵo"
-
 #~ msgid " — GNOME Volume Control Applet"
 #~ msgstr " — Laŭtecregilo-aplikaĵeto de GNOME"
 
@@ -9171,9 +9651,6 @@ msgstr "Sistemsonoj"
 #~ msgid "Sound Output Volume"
 #~ msgstr "Laŭteco de soneligo"
 
-#~ msgid "Microphone Volume"
-#~ msgstr "Laŭteco de mikrofono"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "_Elektu agordendan aparaton:"
 
@@ -9606,12 +10083,6 @@ msgstr "Sistemsonoj"
 #~ msgid "No Image"
 #~ msgstr "Neniu bildo"
 
-#~ msgid "Images"
-#~ msgstr "Bildoj"
-
-#~ msgid "All Files"
-#~ msgstr "Ĉiuj dosieroj"
-
 #~ msgid ""
 #~ "There was an error while trying to get the addressbook information\n"
 #~ "Evolution Data Server can't handle the protocol"
@@ -10578,9 +11049,6 @@ msgstr "Sistemsonoj"
 #~ "Ŝlosi ekranon post certa daŭro por helpi preventi sanajn damaĝojn pro "
 #~ "ripeta klavara uzo"
 
-#~ msgid "Move the selected keyboard layout down in the list"
-#~ msgstr "Movi la elektitan klavararanĝon malsupren en la listo"
-
 #~ msgid "Move the selected keyboard layout up in the list"
 #~ msgstr "Movi la elektitan klavararanĝon supren en la listo"
 
@@ -10877,9 +11345,6 @@ msgstr "Sistemsonoj"
 #~ msgid "I_nstall Font"
 #~ msgstr "I_nstali tiparon"
 
-#~ msgid "Font Viewer"
-#~ msgstr "Tiparvidilo"
-
 #~ msgid "Text to thumbnail (default: Aa)"
 #~ msgstr "Teksto al miniaturo (defaŭlte: Aa)"
 


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