Merge ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master

[Andrea Azzarone]

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/NEWS b/NEWS
index 2449a32..cb41ab8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,28 @@
 ===============
+Version 3.30.1
+===============
+
+- Translation updates
+- Fix crash in the object cache system
+
+Color:
+- Fix fallout from GtkTemplate port
+
+Power:
+- Do not crash when canceling KDB brightness proxy creation
+
+Region:
+- Do not release locale keys in IM hash table
+- Plug leaking GFile objects
+- Replace tab characters by whitespaces
+- Fix language section not marked as insensitive
+- Cancel async permission when panel is closed
+
+Sharing:
+- Bind hostname entry from UI
+
+
+===============
 Version 3.30.0
 ===============
 
diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json
index 1f976b1..2a8e241 100644
--- a/build-aux/flatpak/org.gnome.Settings.json
+++ b/build-aux/flatpak/org.gnome.Settings.json
@@ -58,6 +58,43 @@
             ]
         },
         {
+            "name" : "mozjs52",
+            "build-options" : {
+                "arch" : {
+                    "i386" : {
+                        "config-opts" : [
+                            "--host=i586-unknown-linux-gnu"
+                        ]
+                    },
+                    "arm" : {
+                        "config-opts" : [
+                            "--host=arm-unknown-linux-gnueabi"
+                        ]
+                    }
+                }
+            },
+            "config-opts": [
+                "--enable-posix-nspr-emulation",
+                "--with-system-zlib",
+                "--without-system-icu",
+                "--with-intl-api",
+                "--disable-jemalloc",
+                "AUTOCONF=autoconf"
+            ],
+            "builddir" : true,
+            "subdir" : "js/src",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/mozjs-52.2.1gnome1.tar.gz",
+                    "sha256" : "31697943b1dbbb51ba9aee35b8269a353c487d7af4d336010b90054dc4f9b0af"
+                }
+            ],
+            "cleanup" : [
+                "libjs_static.ajs"
+            ]
+        },
+        {
             "name" : "polkit",
             "buildsystem" : "autotools",
             "config-opts" : [
@@ -154,7 +191,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/libgudev"
+                    "url" : "https://gitlab.gnome.org/GNOME/libgudev.git"
                 }
             ]
         },
@@ -194,7 +231,7 @@
                 {
                     "type" : "git",
                     "branch" : "librest-0-7",
-                    "url" : "https://git.gnome.org/browse/librest"
+                    "url" : "https://gitlab.gnome.org/GNOME/librest.git"
                 }
             ]
         },
@@ -211,16 +248,17 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/gnome-online-accounts"
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
                 }
             ]
         },
         {
             "name" : "gnome-desktop",
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/gnome-desktop"
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
                 }
             ]
         },
@@ -230,7 +268,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/geocode-glib"
+                    "url" : "https://gitlab.gnome.org/GNOME/geocode-glib.git"
                 }
             ]
         },
@@ -278,6 +316,10 @@
         {
             "name" : "NetworkManager",
             "buildsystem" : "meson",
+            "build-options" : {
+                "cflags" : "-ltinfo",
+                "cxxflags" : "-ltinfo"
+            },
             "config-opts" : [
                 "-Dlibaudit=no",
                 "-Ddbus_conf_dir=/app/etc/dbus-1/system.d",
@@ -305,8 +347,8 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "tag" : "1.12.0",
-                    "commit" : "8964dbe8bc9cbe7300a48bffe86faee6b149fbf2",
+                    "tag": "1.14.0",
+                    "commit" : "2979c891c4af7584780924e92b6d448b7d6cd328",
                     "url" : "https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git"
                 }
             ]
@@ -320,12 +362,13 @@
                 "-Dlibnm_gtk=false",
                 "-Dselinux=false",
                 "-Dteam=false",
-                "-Dwwan=false"
+                "-Dwwan=false",
+                "-Dmobile_broadband_provider_info=false"
             ],
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/network-manager-applet"
+                    "url" : "https://gitlab.gnome.org/GNOME/network-manager-applet.git"
                 }
             ]
         },
@@ -365,7 +408,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/gnome-bluetooth"
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-bluetooth.git"
                 }
             ]
         },
@@ -382,7 +425,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/grilo"
+                    "url" : "https://gitlab.gnome.org/GNOME/grilo.git"
                 }
             ]
         },
@@ -455,7 +498,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "git://git.gnome.org/cheese"
+                    "url" : "https://gitlab.gnome.org/GNOME/cheese.git"
                 }
             ]
         },
diff --git a/debian/changelog b/debian/changelog
index ee592e7..c0e7919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,115 @@
+gnome-control-center (1:3.30.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with debian unstable (LP: #1795460)
+    Remaining changes:
+    + debian/control.in:
+      - Depend on language-selector-gnome and whoopsie-preferences
+      - Depend on instead of Recommend system-config-printer
+      - Recommend ibus and ubuntu-system-service
+      - Suggest instead of Recommend gnome-user-share, realmd and rygel
+      - Build-Depend on dh-migrations and libwhoopsie-preferences-dev
+      - Don't recommend libnss-myhostname since systemd-resolved handles this
+        functionality
+      - Bump dep on g-s-d and schema
+    + Split gnome-control-center-faces to a separate package so that it can be
+      used by unity-control-center & recommend this
+    + Install apport hook
+    + debian/gnome-control-center-data.install:
+      - Don't install gnome-control-center.pkla since we use
+        policykit-desktop-privileges instead
+      - Install additional assets used by unity-control-center
+    + debian/ubuntu-logo-icon.png, debian/source/include-binaries,
+      debian/gnome-control-center-data.install: Include an Ubuntu logo
+    + debian/gnome-control-center-data.links:
+      - Link audio-speaker-center* to audio-speaker-mono* so that an
+        icon is shown in the test speaker panel.
+    + debian/rules: Enable whoospie integration
+    + Add migration script to transition from old user settings to new one.
+    + debian/patches:
+      - 08_lowercase_user_names.patch:
+         Disallow upper-case letters in user names for compliance with adduser
+      - 52_region_language.patch:
+         Adapt region panel to use Ubuntu style regions
+      - 64_restore_terminal_keyboard_shortcut.patch
+         Bring back terminal shortcut
+      - 70_allow_sound_above_100.patch:
+         Allow setting volume above 100% in the Ubuntu session
+      - 71_ubuntu_dock_settings.patch
+         Add Dock panel for Ubuntu session
+      - 99_add_lock-on-suspend.patch
+         Add option to lock on suspend
+      - auto_quit_after_goa_add.patch
+         Hide window after adding an online account from another app.
+      - connectivity-switch.patch
+         Add Connectivity Checking switch to Privacy panel
+      - distro-logo.patch:
+         Add Ubuntu branding to Details panel
+      - privacy-panel-whoopsie.patch
+         Support Ubuntu's whoopsie service in the Privacy panel
+      - ubuntu-language-support.patch
+         Add Language Support button to Region & Language panel to work around
+      - ubuntu-legacy-notifications.patch
+         Ubuntu ships compatibility names for .desktop that got renamed
+         upstream, those use NoDisplay but the panel doesn't respect that key,
+         skip known buggy entries for file-roller and nautilus
+      - ubuntu-printer-support.patch
+         Add Advanced Printer Settings button to work around missing printer
+         sharing feature
+      - ubuntu-region-langpack-install.patch:
+         Check for missing language packs when loading region panel to pull
+         in packs that aren't included with the installer
+      - ubuntu-region-packagekit.patch
+         Fix detection of installed language packs
+  * Patches have been round-tripped through gbp-pq and all rebased on the new
+    version - that's why their metadata has changed.
+
+ -- Andrea Azzarone <[e-mail]>  Tue, 02 Oct 2018 18:18:58 +0100
+
+gnome-control-center (1:3.30.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - d/p/Fix-icons-in-translations.patch:
+    - d/p/Update-Belarusian-translation.patch:
+    - d/p/Update-German-translation.patch:
+    - d/p/Update-Russian-translation.patch:
+    - d/p/Updated-Czech-translation-1.patch:
+    - d/p/Updated-Czech-translation-2.patch:
+    - d/p/Updated-Czech-translation.patch:
+    - d/p/color-Fix-fallout-from-the-GtkTemplate-port.patch:
+    - d/p/region-Cancel-async-permission-requests-when-panel-is-clo.patch:
+    - d/p/region-Do-not-release-locale-keys-in-IM-hash-table.patch:
+    - d/p/region-Don-t-leak-GFile-objects.patch:
+    - d/p/region-Fix-language-section-not-being-marked-insensitive.patch:
+    - d/p/region-Remove-duplicate-cancellable-code.patch:
+    - d/p/region-Replace-tab-characters-with-spaces.patch:
+      Drop patches applied upstream.
+  * debian/rules:
+    - Bump Standards-Version to 4.2.1 (no changes required)
+    - Don't include gnome-get-source.mk because it's no longer required since
+      Debian Policy 4.1.4
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 01 Oct 2018 16:37:52 +0100
+
+gnome-control-center (1:3.30.0-2) unstable; urgency=medium
+
+  * Team upload
+  * d/patches: Update from upstream gnome-3-30 branch at commit
+    3.30.0-21-g230f659a3 (excluding CI and Flatpak changes) for bug fixes
+    and translation updates
+  * Release to unstable
+    - d/gbp.conf, d/control: Switch branches for unstable
+    - d/watch: Watch for upstream stable (even-numbered) releases
+
+ -- Simon McVittie <[e-mail]>  Thu, 20 Sep 2018 12:49:10 +0100
+
+gnome-control-center (1:3.30.0-1) experimental; urgency=medium
+
+  * Team upload
+  * d/gbp.conf: Update from glib2.0
+  * New upstream release
+
+ -- Simon McVittie <[e-mail]>  Wed, 19 Sep 2018 14:55:49 +0100
+
 gnome-control-center (1:3.30.0-0ubuntu1) cosmic; urgency=medium
 
   * Update to 3.30.0
diff --git a/debian/control b/debian/control
index b6b5321..67632d5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Iain Lane <[e-mail]>, Jeremy Bicha <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Build-Depends: debhelper (>= 11.1.3),
                dh-migrations,
                libaccountsservice-dev (>= 0.6.39),
diff --git a/debian/control.in b/debian/control.in
index 07519b7..4a04dbc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Build-Depends: debhelper (>= 11.1.3),
                dh-migrations,
                libaccountsservice-dev (>= 0.6.39),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8b5a8d6..f650b31 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,4 +4,12 @@ debian-branch=ubuntu/master
 upstream-branch=upstream/latest
 debian-tag=ubuntu/%(version)s
 upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
 patch-numbers = False
diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch
index 842a52b..56df791 100644
--- a/debian/patches/52_region_language.patch
+++ b/debian/patches/52_region_language.patch
@@ -48,18 +48,18 @@ Last-Update: 2013-03-21
  * The 'common_name' field taken into account when parsing the iso-codes XML files
    for language names.
 ---
- panels/common/cc-common-language.c   | 146 ++++++++++++++++++++++++++++++-----
+ panels/common/cc-common-language.c   | 152 +++++++++++++++++++++++++++++------
  panels/common/cc-common-language.h   |   4 +
  panels/common/cc-language-chooser.c  |   4 +-
- panels/region/cc-region-panel.c      | 139 ++++++++++++++++++++++++---------
- panels/user-accounts/um-user-panel.c |   8 +-
- 5 files changed, 242 insertions(+), 59 deletions(-)
+ panels/region/cc-region-panel.c      | 139 ++++++++++++++++++++++++--------
+ panels/user-accounts/um-user-panel.c |   6 +-
+ 5 files changed, 244 insertions(+), 61 deletions(-)
 
-Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/common/cc-common-language.c
-+++ gnome-control-center-3.29.92/panels/common/cc-common-language.c
-@@ -161,6 +161,66 @@ cc_common_language_get_current_language
+diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
+index 9357c3e..26a647e 100644
+--- a/panels/common/cc-common-language.c
++++ b/panels/common/cc-common-language.c
+@@ -161,6 +161,66 @@ cc_common_language_get_current_language (void)
          return language;
  }
  
@@ -153,9 +153,9 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
          } else {
 -                g_hash_table_insert (ht, g_strdup (lang), g_strdup (label_own_lang));
 +                g_hash_table_insert (ht, g_strdup (key), g_strdup (label_own_lang));
-+        }
-+}
-+
+         }
+ }
+ 
 +gchar **
 +cc_common_language_get_installed_languages (void)
 +{
@@ -168,13 +168,13 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
 +                g_warning ("Couldn't get installed languages: %s", error->message);
 +                g_error_free (error);
 +                return NULL;
-         }
++        }
 +        langs = g_strsplit (output, "\n", 0);
 +
 +        g_free(output);
 +        return langs;
- }
- 
++}
++
  GHashTable *
  cc_common_language_get_initial_languages (void)
  {
@@ -197,7 +197,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
          insert_language (ht, "en_US.UTF-8");
          insert_language (ht, "en_GB.UTF-8");
          insert_language (ht, "de_DE.UTF-8");
-@@ -234,10 +328,32 @@ cc_common_language_get_initial_languages
+@@ -234,10 +328,32 @@ cc_common_language_get_initial_languages (void)
          insert_language (ht, "ja_JP.UTF-8");
          insert_language (ht, "ru_RU.UTF-8");
          insert_language (ht, "ar_EG.UTF-8");
@@ -231,7 +231,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
  static void
  foreach_user_lang_cb (gpointer key,
                        gpointer value,
-@@ -263,28 +379,18 @@ cc_common_language_add_user_languages (G
+@@ -263,28 +379,18 @@ cc_common_language_add_user_languages (GtkTreeModel *model)
          GtkListStore *store = GTK_LIST_STORE (model);
          GHashTable *user_langs;
          const char *display;
@@ -264,7 +264,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
                  display = g_hash_table_lookup (user_langs, name);
          }
  
-@@ -296,8 +402,8 @@ cc_common_language_add_user_languages (G
+@@ -296,8 +402,8 @@ cc_common_language_add_user_languages (GtkTreeModel *model)
          g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store);
  
          /* And now the "Other…" selection */
@@ -275,11 +275,11 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.c
  
          g_hash_table_destroy (user_langs);
  }
-Index: gnome-control-center-3.29.92/panels/common/cc-common-language.h
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/common/cc-common-language.h
-+++ gnome-control-center-3.29.92/panels/common/cc-common-language.h
-@@ -43,6 +43,8 @@ guint    cc_common_language_add_availabl
+diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
+index 1f578b7..2e5a446 100644
+--- a/panels/common/cc-common-language.h
++++ b/panels/common/cc-common-language.h
+@@ -43,6 +43,8 @@ guint    cc_common_language_add_available_languages (GtkListStore     *store,
                                                       GHashTable       *user_langs);
  gboolean cc_common_language_has_font                (const gchar  *locale);
  gchar   *cc_common_language_get_current_language    (void);
@@ -288,18 +288,18 @@ Index: gnome-control-center-3.29.92/panels/common/cc-common-language.h
  
  GHashTable *cc_common_language_get_initial_languages   (void);
  GHashTable *cc_common_language_get_user_languages      (void);
-@@ -55,4 +57,6 @@ void     cc_common_language_select_curre
+@@ -55,4 +57,6 @@ void     cc_common_language_select_current_language (GtkTreeView  *treeview);
  
  void     cc_common_language_add_user_languages (GtkTreeModel *model);
  
 +void    cc_common_language_get_locale (const gchar *language, gchar **locale);
 +
  G_END_DECLS
-Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/common/cc-language-chooser.c
-+++ gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
-@@ -165,7 +165,7 @@ add_languages (CcLanguageChooser *choose
+diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
+index 445952a..421585f 100644
+--- a/panels/common/cc-language-chooser.c
++++ b/panels/common/cc-language-chooser.c
+@@ -165,7 +165,7 @@ add_languages (CcLanguageChooser *chooser,
                  gtk_container_add (GTK_CONTAINER (chooser->language_listbox), widget);
          }
  
@@ -308,7 +308,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
  
          gtk_widget_show_all (chooser->language_listbox);
  }
-@@ -376,7 +376,7 @@ cc_language_chooser_init (CcLanguageChoo
+@@ -376,7 +376,7 @@ cc_language_chooser_init (CcLanguageChooser *chooser)
  
          gtk_widget_init_template (GTK_WIDGET (chooser));
  
@@ -317,11 +317,11 @@ Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
          /* We ref-sink here so we can reuse this widget multiple times */
          chooser->no_results = g_object_ref_sink (no_results_widget_new ());
          gtk_widget_show_all (chooser->no_results);
-Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/region/cc-region-panel.c
-+++ gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-@@ -348,11 +348,15 @@ language_response (CcLanguageChooser *ch
+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+index b20106d..7f78dbd 100644
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -360,11 +360,15 @@ language_response (CcLanguageChooser *chooser,
                     gint               response_id,
                     CcRegionPanel     *self)
  {
@@ -340,7 +340,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
          }
  
          gtk_widget_destroy (GTK_WIDGET (chooser));
-@@ -372,6 +376,47 @@ set_system_region (CcRegionPanel *self,
+@@ -384,6 +388,47 @@ set_system_region (CcRegionPanel *self,
  }
  
  static void
@@ -388,7 +388,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  update_region (CcRegionPanel *self,
                 const gchar   *region)
  {
-@@ -380,6 +425,7 @@ update_region (CcRegionPanel *self,
+@@ -392,6 +437,7 @@ update_region (CcRegionPanel *self,
          } else {
                  if (g_strcmp0 (region, self->region) == 0)
                          return;
@@ -396,7 +396,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
                  g_settings_set_string (self->locale_settings, KEY_REGION, region);
                  if (self->login_auto_apply)
                          set_system_region (self, region);
-@@ -548,7 +594,7 @@ static void
+@@ -560,7 +606,7 @@ static void
  update_region_from_setting (CcRegionPanel *self)
  {
          g_free (self->region);
@@ -405,7 +405,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
          update_region_label (self);
  }
  
-@@ -574,15 +620,19 @@ static void
+@@ -586,15 +632,19 @@ static void
  update_language_from_user (CcRegionPanel *self)
  {
          const gchar *language = NULL;
@@ -429,7 +429,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
          update_language_label (self);
  }
  
-@@ -1334,6 +1384,16 @@ setup_input_section (CcRegionPanel *self
+@@ -1342,6 +1392,16 @@ setup_input_section (CcRegionPanel *self)
          update_buttons (self);
  }
  
@@ -446,7 +446,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  static void
  on_localed_properties_changed (GDBusProxy     *proxy,
                                 GVariant       *changed_properties,
-@@ -1347,28 +1407,39 @@ on_localed_properties_changed (GDBusProx
+@@ -1355,28 +1415,39 @@ on_localed_properties_changed (GDBusProxy     *proxy,
                  g_autofree const gchar **strv = NULL;
                  gsize len;
                  gint i;
@@ -495,7 +495,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
                  g_free (self->system_region);
                  self->system_region = g_strdup (time);
  
-@@ -1432,28 +1503,26 @@ set_localed_locale (CcRegionPanel *self)
+@@ -1440,28 +1511,26 @@ set_localed_locale (CcRegionPanel *self)
  {
          g_autoptr(GVariantBuilder) b = NULL;
          g_autofree gchar *lang_value = NULL;
@@ -540,11 +540,11 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
          }
          g_dbus_proxy_call (self->localed,
                             "SetLocale",
-Index: gnome-control-center-3.29.92/panels/user-accounts/um-user-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/user-accounts/um-user-panel.c
-+++ gnome-control-center-3.29.92/panels/user-accounts/um-user-panel.c
-@@ -837,6 +837,7 @@ show_user (ActUser *user, CcUserPanel *s
+diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
+index eaa77bd..7fa7f40 100644
+--- a/panels/user-accounts/um-user-panel.c
++++ b/panels/user-accounts/um-user-panel.c
+@@ -837,6 +837,7 @@ show_user (ActUser *user, CcUserPanel *self)
  
          name = NULL;
          lang = g_strdup (act_user_get_language (user));
diff --git a/debian/patches/99_add_lock-on-suspend.patch b/debian/patches/99_add_lock-on-suspend.patch
index ac05a55..6519df7 100644
--- a/debian/patches/99_add_lock-on-suspend.patch
+++ b/debian/patches/99_add_lock-on-suspend.patch
@@ -7,10 +7,10 @@ Subject: Add "Lock Screen on Suspend" option
  panels/privacy/privacy.ui         | 31 +++++++++++++++++++++++++++++++
  2 files changed, 36 insertions(+)
 
-Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/cc-privacy-panel.c
-+++ gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
+diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
+index 27f0826..d8b5424 100644
+--- a/panels/privacy/cc-privacy-panel.c
++++ b/panels/privacy/cc-privacy-panel.c
 @@ -414,6 +414,11 @@ add_screen_lock (CcPrivacyPanel *self)
    g_settings_bind (self->notification_settings, "show-in-lock-screen",
                     w, "active",
@@ -23,11 +23,11 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  }
  
  static void
-Index: gnome-control-center-3.29.92/panels/privacy/privacy.ui
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/privacy.ui
-+++ gnome-control-center-3.29.92/panels/privacy/privacy.ui
-@@ -703,6 +703,37 @@ All the information we collect is made a
+diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
+index c15b653..3dc6cea 100644
+--- a/panels/privacy/privacy.ui
++++ b/panels/privacy/privacy.ui
+@@ -703,6 +703,37 @@ All the information we collect is made anonymous, and we will never share your d
                  <property name="height">1</property>
                </packing>
              </child>
diff --git a/debian/patches/connectivity-switch.patch b/debian/patches/connectivity-switch.patch
index 94fbc4b..2d1f87e 100644
--- a/debian/patches/connectivity-switch.patch
+++ b/debian/patches/connectivity-switch.patch
@@ -12,15 +12,15 @@ is supported.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=737362
 ---
- panels/privacy/cc-privacy-panel.c | 76 ++++++++++++++++++++++++++++++++++
+ panels/privacy/cc-privacy-panel.c | 75 ++++++++++++++++++++++++++++++++++
  panels/privacy/meson.build        |  7 +++-
  panels/privacy/privacy.ui         | 86 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 168 insertions(+), 1 deletion(-)
+ 3 files changed, 167 insertions(+), 1 deletion(-)
 
-Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/cc-privacy-panel.c
-+++ gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
+diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
+index d8b5424..8f1abbd 100644
+--- a/panels/privacy/cc-privacy-panel.c
++++ b/panels/privacy/cc-privacy-panel.c
 @@ -18,6 +18,8 @@
   * Author: Matthias Clasen <[e-mail]>
   */
@@ -120,7 +120,7 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  static void
  cc_privacy_panel_finalize (GObject *object)
  {
-@@ -1275,6 +1346,8 @@ cc_privacy_panel_finalize (GObject *obje
+@@ -1275,6 +1346,8 @@ cc_privacy_panel_finalize (GObject *object)
    g_clear_pointer (&self->location_apps_perms, g_variant_unref);
    g_clear_pointer (&self->location_apps_data, g_variant_unref);
    g_clear_pointer (&self->location_app_switches, g_hash_table_unref);
@@ -129,7 +129,7 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  
    G_OBJECT_CLASS (cc_privacy_panel_parent_class)->finalize (object);
  }
-@@ -1339,6 +1412,7 @@ cc_privacy_panel_init (CcPrivacyPanel *s
+@@ -1339,6 +1412,7 @@ cc_privacy_panel_init (CcPrivacyPanel *self)
    self->trash_dialog = GTK_WIDGET (gtk_builder_get_object (self->builder, "trash_dialog"));
    self->software_dialog = GTK_WIDGET (gtk_builder_get_object (self->builder, "software_dialog"));
    self->abrt_dialog = GTK_WIDGET (gtk_builder_get_object (self->builder, "abrt_dialog"));
@@ -137,7 +137,7 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  
    frame = WID ("frame");
    widget = gtk_list_box_new ();
-@@ -1373,6 +1447,7 @@ cc_privacy_panel_init (CcPrivacyPanel *s
+@@ -1373,6 +1447,7 @@ cc_privacy_panel_init (CcPrivacyPanel *self)
    add_trash_temp (self);
    add_software (self);
    add_abrt (self);
@@ -145,10 +145,10 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  
    g_signal_connect (self->lockdown_settings, "changed",
                      G_CALLBACK (on_lockdown_settings_changed), self);
-Index: gnome-control-center-3.29.92/panels/privacy/meson.build
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/meson.build
-+++ gnome-control-center-3.29.92/panels/privacy/meson.build
+diff --git a/panels/privacy/meson.build b/panels/privacy/meson.build
+index a929451e..b1eec8a 100644
+--- a/panels/privacy/meson.build
++++ b/panels/privacy/meson.build
 @@ -29,12 +29,17 @@ sources += gnome.compile_resources(
    export: true
  )
@@ -168,11 +168,11 @@ Index: gnome-control-center-3.29.92/panels/privacy/meson.build
 +  dependencies: deps,
    c_args: cflags
  )
-Index: gnome-control-center-3.29.92/panels/privacy/privacy.ui
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/privacy.ui
-+++ gnome-control-center-3.29.92/panels/privacy/privacy.ui
-@@ -1090,4 +1090,90 @@ All the information we collect is made a
+diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
+index 3dc6cea..65754a4 100644
+--- a/panels/privacy/privacy.ui
++++ b/panels/privacy/privacy.ui
+@@ -1090,4 +1090,90 @@ All the information we collect is made anonymous, and we will never share your d
      </child>
    </object>
  
diff --git a/debian/patches/distro-logo.patch b/debian/patches/distro-logo.patch
index f5a22a1..41e0b1f 100644
--- a/debian/patches/distro-logo.patch
+++ b/debian/patches/distro-logo.patch
@@ -17,10 +17,10 @@ and drop the "Version" string from the GNOME version line
  2 files changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
-index 19f785a..446520b 100644
+index 7758271..131106c 100644
 --- a/panels/info/cc-info-overview-panel.c
 +++ b/panels/info/cc-info-overview-panel.c
-@@ -770,7 +770,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
+@@ -772,7 +772,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
    if (res)
      {
        g_autofree gchar *text = NULL;
diff --git a/debian/patches/privacy-panel-whoopsie.patch b/debian/patches/privacy-panel-whoopsie.patch
index a4ac859..407351e 100644
--- a/debian/patches/privacy-panel-whoopsie.patch
+++ b/debian/patches/privacy-panel-whoopsie.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] panels/privacy: add Whoopsie support to privacy panel
  panels/privacy/privacy.ui         |  86 +++++++++++++++-
  5 files changed, 286 insertions(+), 17 deletions(-)
 
-Index: gnome-control-center-3.29.92/meson.build
-===================================================================
---- gnome-control-center-3.29.92.orig/meson.build
-+++ gnome-control-center-3.29.92/meson.build
+diff --git a/meson.build b/meson.build
+index 2a8519c..5ef0cd5 100644
+--- a/meson.build
++++ b/meson.build
 @@ -181,6 +181,14 @@ endif
  config_h.set('HAVE_WAYLAND', enable_wayland,
               description: 'Define to 1 if Wayland is enabled')
@@ -29,7 +29,7 @@ Index: gnome-control-center-3.29.92/meson.build
  if host_is_linux
    # network manager
    network_manager_deps = [
-@@ -281,5 +289,6 @@ output += '     IBus (Region panel IBus
+@@ -281,5 +289,6 @@ output += '     IBus (Region panel IBus support) ........... ' + enable_ibus.to_
  output += '     NetworkManager (Network panel) ............. ' + host_is_linux.to_string() + '\n'
  output += '     Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n'
  output += '     Wayland .................................... ' + enable_wayland.to_string() + '\n'
@@ -38,11 +38,11 @@ Index: gnome-control-center-3.29.92/meson.build
 -message(output)
 \ No newline at end of file
 +message(output)
-Index: gnome-control-center-3.29.92/meson_options.txt
-===================================================================
---- gnome-control-center-3.29.92.orig/meson_options.txt
-+++ gnome-control-center-3.29.92/meson_options.txt
-@@ -3,4 +3,5 @@ option('documentation', type: 'boolean',
+diff --git a/meson_options.txt b/meson_options.txt
+index a347168..ce462a7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,4 +3,5 @@ option('documentation', type: 'boolean', value: false, description: 'build docum
  option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
  option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
  option('tracing', type: 'boolean', value: false, description: 'add extra debugging information')
@@ -50,10 +50,10 @@ Index: gnome-control-center-3.29.92/meson_options.txt
 \ No newline at end of file
 +option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
 +option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support')
-Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/cc-privacy-panel.c
-+++ gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
+diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
+index 8f1abbd..71d5588 100644
+--- a/panels/privacy/cc-privacy-panel.c
++++ b/panels/privacy/cc-privacy-panel.c
 @@ -35,6 +35,12 @@ typedef struct _NMClient NMClient;
  
  #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->builder, s))
@@ -81,7 +81,7 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  
    GCancellable *cancellable;
  
-@@ -1207,25 +1219,129 @@ abrt_vanished_cb (GDBusConnection *conne
+@@ -1207,25 +1219,129 @@ abrt_vanished_cb (GDBusConnection *connection,
    gtk_widget_hide (self->abrt_row);
  }
  
@@ -295,10 +295,10 @@ Index: gnome-control-center-3.29.92/panels/privacy/cc-privacy-panel.c
  }
  
  #if defined(BUILD_NETWORK) && NM_CHECK_VERSION(1,10,0)
-Index: gnome-control-center-3.29.92/panels/privacy/meson.build
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/meson.build
-+++ gnome-control-center-3.29.92/panels/privacy/meson.build
+diff --git a/panels/privacy/meson.build b/panels/privacy/meson.build
+index b1eec8a..3215b79 100644
+--- a/panels/privacy/meson.build
++++ b/panels/privacy/meson.build
 @@ -33,6 +33,9 @@ deps = common_deps
  if host_is_linux
    deps += network_manager_deps
@@ -309,11 +309,11 @@ Index: gnome-control-center-3.29.92/panels/privacy/meson.build
  
  cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
  
-Index: gnome-control-center-3.29.92/panels/privacy/privacy.ui
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/privacy/privacy.ui
-+++ gnome-control-center-3.29.92/panels/privacy/privacy.ui
-@@ -1039,7 +1039,7 @@ All the information we collect is made a
+diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
+index 65754a4..ee3a827 100644
+--- a/panels/privacy/privacy.ui
++++ b/panels/privacy/privacy.ui
+@@ -1039,7 +1039,7 @@ All the information we collect is made anonymous, and we will never share your d
            </packing>
          </child>
          <child>
@@ -322,17 +322,10 @@ Index: gnome-control-center-3.29.92/panels/privacy/privacy.ui
              <property name="visible">True</property>
              <property name="can_focus">False</property>
              <property name="margin_start">12</property>
-@@ -1079,6 +1079,90 @@ All the information we collect is made a
-                 <property name="height">1</property>
-               </packing>
-             </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
+@@ -1086,6 +1086,90 @@ All the information we collect is made anonymous, and we will never share your d
+             <property name="position">2</property>
+           </packing>
+         </child>
 +        <child>
 +          <object class="GtkGrid" id="whoopsie_grid">
 +            <property name="visible">False</property>
@@ -410,6 +403,13 @@ Index: gnome-control-center-3.29.92/panels/privacy/privacy.ui
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
-           </object>
-           <packing>
-             <property name="expand">False</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
+       </object>
+     </child>
+   </object>
diff --git a/debian/patches/ubuntu-language-support.patch b/debian/patches/ubuntu-language-support.patch
index a763037..1f2fef1 100644
--- a/debian/patches/ubuntu-language-support.patch
+++ b/debian/patches/ubuntu-language-support.patch
@@ -8,11 +8,11 @@ Workaround for https://launchpad.net/bugs/1631750
  panels/region/region.ui         | 26 ++++++++++++++++++++++++++
  2 files changed, 56 insertions(+)
 
-Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/region/cc-region-panel.c
-+++ gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-@@ -109,6 +109,7 @@ struct _CcRegionPanel {
+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+index 1e4ffdc..3084f35 100644
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -108,6 +108,7 @@ struct _CcRegionPanel {
          GtkWidget *show_layout;
          GtkWidget *restart_button;
          GtkWidget *language_list;
@@ -20,7 +20,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  
          GSettings *input_settings;
          GnomeXkbInfo *xkb_info;
-@@ -1276,6 +1277,33 @@ show_selected_settings (CcRegionPanel *s
+@@ -1284,6 +1285,33 @@ show_selected_settings (CcRegionPanel *self)
                  g_warning ("Failed to launch input source setup: %s", error->message);
  }
  
@@ -54,7 +54,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  static void
  show_selected_layout (CcRegionPanel *self)
  {
-@@ -1738,6 +1766,7 @@ cc_region_panel_class_init (CcRegionPane
+@@ -1747,6 +1775,7 @@ cc_region_panel_class_init (CcRegionPanelClass * klass)
          gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, restart_button);
          gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, login_label);
          gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_list);
@@ -62,7 +62,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  
          gtk_widget_class_bind_template_callback (widget_class, restart_now);
          gtk_widget_class_bind_template_callback (widget_class, show_input_options);
-@@ -1747,6 +1776,7 @@ cc_region_panel_class_init (CcRegionPane
+@@ -1756,6 +1785,7 @@ cc_region_panel_class_init (CcRegionPanelClass * klass)
          gtk_widget_class_bind_template_callback (widget_class, move_selected_input_down);
          gtk_widget_class_bind_template_callback (widget_class, show_selected_settings);
          gtk_widget_class_bind_template_callback (widget_class, show_selected_layout);
@@ -70,10 +70,10 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
  }
  
  static void
-Index: gnome-control-center-3.29.92/panels/region/region.ui
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/region/region.ui
-+++ gnome-control-center-3.29.92/panels/region/region.ui
+diff --git a/panels/region/region.ui b/panels/region/region.ui
+index 53ebb48..46e3862 100644
+--- a/panels/region/region.ui
++++ b/panels/region/region.ui
 @@ -544,6 +544,32 @@
                 </style>
                </object>
diff --git a/debian/patches/ubuntu-legacy-notifications.patch b/debian/patches/ubuntu-legacy-notifications.patch
index bc2ba1a..1b3e32f 100644
--- a/debian/patches/ubuntu-legacy-notifications.patch
+++ b/debian/patches/ubuntu-legacy-notifications.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
  1 file changed, 8 insertions(+)
 
 diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c
-index f4a5cc7..7db9364 100644
+index 31c0a8b..b00a95e 100644
 --- a/panels/notifications/cc-notifications-panel.c
 +++ b/panels/notifications/cc-notifications-panel.c
 @@ -464,6 +464,14 @@ process_app_info (CcNotificationsPanel *panel,
diff --git a/debian/patches/ubuntu-printer-support.patch b/debian/patches/ubuntu-printer-support.patch
index bb6f4e6..2afc304 100644
--- a/debian/patches/ubuntu-printer-support.patch
+++ b/debian/patches/ubuntu-printer-support.patch
@@ -26,11 +26,10 @@ index f05a3ec..4d20ab7 100644
  #include <glib/gi18n-lib.h>
  #include <glib/gstdio.h>
  #include <polkit/polkit.h>
-@@ -1107,6 +1108,32 @@ printer_add_cb (GtkToolButton *toolbutton,
-                     self);
+@@ -1108,6 +1109,32 @@ printer_add_cb (GtkToolButton *toolbutton,
  }
  
-+static void
+ static void
 +show_system_config_printer (void)
 +{
 +  GAppInfo *app_info;
@@ -56,9 +55,10 @@ index f05a3ec..4d20ab7 100644
 +  g_object_unref (ctx);
 +}
 +
- static void
++static void
  update_sensitivity (gpointer user_data)
  {
+   CcPrintersPanelPrivate  *priv;
 @@ -1424,6 +1451,14 @@ cc_printers_panel_init (CcPrintersPanel *self)
      gtk_builder_get_object (priv->builder, "printer-add-button2");
    g_signal_connect (widget, "clicked", G_CALLBACK (printer_add_cb), self);
diff --git a/debian/patches/ubuntu-region-langpack-install.patch b/debian/patches/ubuntu-region-langpack-install.patch
index 2eede45..68ee913 100644
--- a/debian/patches/ubuntu-region-langpack-install.patch
+++ b/debian/patches/ubuntu-region-langpack-install.patch
@@ -8,10 +8,10 @@ Subject: [PATCH 3/3] Modify the input-chooser dialog to allow for the
  panels/region/cc-region-panel.c     | 8 ++++++++
  2 files changed, 12 insertions(+), 2 deletions(-)
 
-Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/common/cc-language-chooser.c
-+++ gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
+diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
+index 421585f..52fc02e 100644
+--- a/panels/common/cc-language-chooser.c
++++ b/panels/common/cc-language-chooser.c
 @@ -123,7 +123,7 @@ more_widget_new (void)
          row = gtk_list_box_row_new ();
          box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
@@ -21,7 +21,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
  
          arrow = gtk_image_new_from_icon_name ("view-more-symbolic", GTK_ICON_SIZE_MENU);
          gtk_style_context_add_class (gtk_widget_get_style_context (arrow), "dim-label");
-@@ -176,7 +176,7 @@ add_all_languages (CcLanguageChooser *ch
+@@ -176,7 +176,7 @@ add_all_languages (CcLanguageChooser *chooser)
          gchar **locale_ids;
          GHashTable *initial;
  
@@ -30,7 +30,7 @@ Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
          initial = cc_common_language_get_initial_languages ();
          add_languages (chooser, locale_ids, initial);
          g_hash_table_destroy (initial);
-@@ -287,6 +287,8 @@ show_more (CcLanguageChooser *chooser, g
+@@ -287,6 +287,8 @@ show_more (CcLanguageChooser *chooser, gboolean visible)
          chooser->showing_extra = visible;
  
          gtk_list_box_invalidate_filter (GTK_LIST_BOX (chooser->language_listbox));
@@ -39,11 +39,11 @@ Index: gnome-control-center-3.29.92/panels/common/cc-language-chooser.c
  }
  static void
  set_locale_id (CcLanguageChooser *chooser,
-Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-===================================================================
---- gnome-control-center-3.29.92.orig/panels/region/cc-region-panel.c
-+++ gnome-control-center-3.29.92/panels/region/cc-region-panel.c
-@@ -331,6 +331,9 @@ static void
+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+index 7f78dbd..1e4ffdc 100644
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -343,6 +343,9 @@ static void
  update_language (CcRegionPanel *self,
                   const gchar   *language)
  {
@@ -53,7 +53,7 @@ Index: gnome-control-center-3.29.92/panels/region/cc-region-panel.c
          if (self->login) {
                  set_system_language (self, language);
          } else {
-@@ -659,6 +662,11 @@ setup_language_section (CcRegionPanel *s
+@@ -671,6 +674,11 @@ setup_language_section (CcRegionPanel *self)
  
          update_language_from_user (self);
          update_region_from_setting (self);
diff --git a/debian/patches/ubuntu-region-packagekit.patch b/debian/patches/ubuntu-region-packagekit.patch
index 26833fc..e4de605 100644
--- a/debian/patches/ubuntu-region-packagekit.patch
+++ b/debian/patches/ubuntu-region-packagekit.patch
@@ -11,7 +11,7 @@ language packs for the selected language
  2 files changed, 239 insertions(+)
 
 diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
-index 4add980..d0a7aa7 100644
+index 26a647e..4f8a67e 100644
 --- a/panels/common/cc-common-language.c
 +++ b/panels/common/cc-common-language.c
 @@ -408,3 +408,240 @@ cc_common_language_add_user_languages (GtkTreeModel *model)
diff --git a/debian/rules b/debian/rules
index b650b4a..3f81604 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 export DEB_CPPFLAGS_MAINT_APPEND = -DSSHD_SERVICE=\"ssh.service\"
 
diff --git a/debian/watch b/debian/watch
index 35b7b17..ac38817 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
 	@PACKAGE@@ANY_VERSION@\.tar\.xz
diff --git a/meson.build b/meson.build
index 1dd93bf..2a8519c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'gnome-control-center', 'c',
-        version : '3.30.0',
+        version : '3.30.1',
         license : 'GPL2+',
   meson_version : '>= 0.43.0'
 )
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 2a30f35..ee26cfe 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -574,7 +574,7 @@ gcm_prefs_title_entry_changed_cb (GtkWidget *widget,
   const gchar *value;
 
   assistant = GTK_ASSISTANT (prefs->assistant_calib);
-  value = gtk_entry_get_text (GTK_ENTRY (prefs->box_calib_title));
+  value = gtk_entry_get_text (GTK_ENTRY (prefs->entry_calib_title));
   cc_color_calibrate_set_title (prefs->calibrate, value);
   gtk_assistant_set_page_complete (assistant, prefs->box_calib_title, value[0] != '\0');
 }
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 2c13b7d..b4c96e1 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1107,7 +1107,7 @@ on_kbd_property_change (GDBusProxy *proxy,
 static void
 got_kbd_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-  CcPowerPanel *self = CC_POWER_PANEL (user_data);
+  CcPowerPanel *self;
   g_autoptr(GError) error = NULL;
   GDBusProxy *kbd_proxy;
 
@@ -1119,6 +1119,7 @@ got_kbd_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
       return;
     }
 
+  self = CC_POWER_PANEL (user_data);
   self->kbd_proxy = kbd_proxy;
 
   /* we want to change the bar if the user presses brightness buttons */
diff --git a/panels/region/cc-input-chooser.c b/panels/region/cc-input-chooser.c
index ab8a2ee..6746620 100644
--- a/panels/region/cc-input-chooser.c
+++ b/panels/region/cc-input-chooser.c
@@ -884,7 +884,7 @@ get_locale_infos (GtkWidget *chooser)
   GList *l;
 
   priv->locales = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                         NULL, locale_info_free);
+                                         g_free, locale_info_free);
   priv->locales_by_language = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                      g_free, (GDestroyNotify) g_hash_table_destroy);
 
@@ -919,7 +919,7 @@ get_locale_infos (GtkWidget *chooser)
       tmp = gnome_get_language_from_locale (simple_locale, "C");
       info->untranslated_name = cc_util_normalize_casefold_and_unaccent (tmp);
 
-      g_hash_table_replace (priv->locales, simple_locale, info);
+      g_hash_table_replace (priv->locales, g_strdup (simple_locale), info);
       add_locale_to_table (priv->locales_by_language, lang_code, info);
 
       if (gnome_get_input_source_from_locale (simple_locale, &type, &id) &&
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 1f10753..b20106d 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -68,7 +68,7 @@ typedef enum {
 } SystemOp;
 
 struct _CcRegionPanel {
-	CcPanel      parent_instance;
+        CcPanel      parent_instance;
 
         GtkWidget   *login_button;
         GtkWidget   *login_label;
@@ -81,7 +81,6 @@ struct _CcRegionPanel {
         GCancellable *cancellable;
 
         GtkWidget *restart_revealer;
-        gchar *needs_restart_file_path;
 
         GtkWidget     *language_section;
         GtkListBoxRow *language_row;
@@ -115,7 +114,6 @@ struct _CcRegionPanel {
 #ifdef HAVE_IBUS
         IBusBus *ibus;
         GHashTable *ibus_engines;
-        GCancellable *ibus_cancellable;
 #endif
 };
 
@@ -124,8 +122,8 @@ CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)
 static void
 cc_region_panel_finalize (GObject *object)
 {
-	CcRegionPanel *self = CC_REGION_PANEL (object);
-	GtkWidget *chooser;
+        CcRegionPanel *self = CC_REGION_PANEL (object);
+        GtkWidget *chooser;
 
         g_cancellable_cancel (self->cancellable);
         g_clear_object (&self->cancellable);
@@ -148,9 +146,6 @@ cc_region_panel_finalize (GObject *object)
         g_clear_object (&self->xkb_info);
 #ifdef HAVE_IBUS
         g_clear_object (&self->ibus);
-        if (self->ibus_cancellable)
-                g_cancellable_cancel (self->ibus_cancellable);
-        g_clear_object (&self->ibus_cancellable);
         g_clear_pointer (&self->ibus_engines, g_hash_table_destroy);
 #endif
         g_free (self->language);
@@ -158,13 +153,11 @@ cc_region_panel_finalize (GObject *object)
         g_free (self->system_language);
         g_free (self->system_region);
 
-        g_clear_pointer (&self->needs_restart_file_path, g_free);
-
         chooser = g_object_get_data (G_OBJECT (self), "input-chooser");
         if (chooser)
                 gtk_widget_destroy (chooser);
 
-	G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
+        G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
 }
 
 static void
@@ -185,11 +178,24 @@ cc_region_panel_get_help_uri (CcPanel *panel)
         return "help:gnome-help/prefs-language";
 }
 
+static GFile *
+get_needs_restart_file (void)
+{
+        g_autofree gchar *path = NULL;
+
+        path = g_build_filename (g_get_user_runtime_dir (),
+                                 "gnome-control-center-region-needs-restart",
+                                 NULL);
+        return g_file_new_for_path (path);
+}
+
 static void
 restart_now (CcRegionPanel *self)
 {
-        g_file_delete (g_file_new_for_path (self->needs_restart_file_path),
-                                            NULL, NULL);
+        g_autoptr(GFile) file = NULL;
+
+        file = get_needs_restart_file ();
+        g_file_delete (file, NULL, NULL);
 
         g_dbus_proxy_call (self->session,
                            "Logout",
@@ -204,6 +210,9 @@ set_restart_notification_visible (CcRegionPanel *self,
                                   gboolean       visible)
 {
         g_autofree gchar *current_locale = NULL;
+        g_autoptr(GFile) file = NULL;
+        g_autoptr(GFileOutputStream) output_stream = NULL;
+        g_autoptr(GError) error = NULL;
 
         if (locale) {
                 current_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
@@ -215,15 +224,18 @@ set_restart_notification_visible (CcRegionPanel *self,
         if (locale)
                 setlocale (LC_MESSAGES, current_locale);
 
-        if (!visible) {
-                g_file_delete (g_file_new_for_path (self->needs_restart_file_path),
-                                                    NULL, NULL);
+        file = get_needs_restart_file ();
 
+        if (!visible) {
+                g_file_delete (file, NULL, NULL);
                 return;
         }
 
-        if (!g_file_set_contents (self->needs_restart_file_path, "", -1, NULL))
-                g_warning ("Unable to create %s", self->needs_restart_file_path);
+        output_stream = g_file_create (file, G_FILE_CREATE_NONE, NULL, &error);
+        if (output_stream == NULL) {
+                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+                        g_warning ("Unable to create %s: %s", g_file_get_path (file), error->message);
+        }
 }
 
 typedef struct {
@@ -512,7 +524,7 @@ activate_language_row (CcRegionPanel *self,
                 } else if (g_permission_get_can_acquire (self->permission)) {
                         self->op = CHOOSE_LANGUAGE;
                         g_permission_acquire_async (self->permission,
-                                                    NULL,
+                                                    self->cancellable,
                                                     permission_acquired,
                                                     self);
                 }
@@ -522,7 +534,7 @@ activate_language_row (CcRegionPanel *self,
                 } else if (g_permission_get_can_acquire (self->permission)) {
                         self->op = CHOOSE_REGION;
                         g_permission_acquire_async (self->permission,
-                                                    NULL,
+                                                    self->cancellable,
                                                     permission_acquired,
                                                     self);
                 }
@@ -668,8 +680,6 @@ fetch_ibus_engines_result (GObject       *object,
                 return;
         }
 
-        g_clear_object (&self->ibus_cancellable);
-
         /* Maps engine ids to engine description objects */
         self->ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
 
@@ -690,11 +700,9 @@ fetch_ibus_engines_result (GObject       *object,
 static void
 fetch_ibus_engines (CcRegionPanel *self)
 {
-        self->ibus_cancellable = g_cancellable_new ();
-
         ibus_bus_list_engines_async (self->ibus,
                                      -1,
-                                     self->ibus_cancellable,
+                                     self->cancellable,
                                      (GAsyncReadyCallback)fetch_ibus_engines_result,
                                      self);
 
@@ -1061,7 +1069,7 @@ add_input (CcRegionPanel *self)
         } else if (g_permission_get_can_acquire (self->permission)) {
                 self->op = ADD_INPUT;
                 g_permission_acquire_async (self->permission,
-                                            NULL,
+                                            self->cancellable,
                                             permission_acquired,
                                             self);
         }
@@ -1122,7 +1130,7 @@ remove_selected_input (CcRegionPanel *self)
         } else if (g_permission_get_can_acquire (self->permission)) {
                 self->op = REMOVE_INPUT;
                 g_permission_acquire_async (self->permission,
-                                            NULL,
+                                            self->cancellable,
                                             permission_acquired,
                                             self);
         }
@@ -1172,7 +1180,7 @@ move_selected_input (CcRegionPanel *self,
         } else if (g_permission_get_can_acquire (self->permission)) {
                 self->op = op;
                 g_permission_acquire_async (self->permission,
-                                            NULL,
+                                            self->cancellable,
                                             permission_acquired,
                                             self);
         }
@@ -1633,19 +1641,20 @@ session_proxy_ready (GObject      *source,
 static void
 cc_region_panel_class_init (CcRegionPanelClass * klass)
 {
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+        CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
-	panel_class->get_help_uri = cc_region_panel_get_help_uri;
+        panel_class->get_help_uri = cc_region_panel_get_help_uri;
 
         object_class->constructed = cc_region_panel_constructed;
-	object_class->finalize = cc_region_panel_finalize;
+        object_class->finalize = cc_region_panel_finalize;
 
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/region/region.ui");
 
         gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_row);
         gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_label);
+        gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_section);
         gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, formats_row);
         gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, formats_label);
         gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, restart_revealer);
@@ -1675,6 +1684,8 @@ cc_region_panel_class_init (CcRegionPanelClass * klass)
 static void
 cc_region_panel_init (CcRegionPanel *self)
 {
+        g_autoptr(GFile) needs_restart_file = NULL;
+
         g_resources_register (cc_region_get_resource ());
 
         gtk_widget_init_template (GTK_WIDGET (self));
@@ -1697,9 +1708,7 @@ cc_region_panel_init (CcRegionPanel *self)
         setup_language_section (self);
         setup_input_section (self);
 
-        self->needs_restart_file_path = g_build_filename (g_get_user_runtime_dir (),
-                                                          "gnome-control-center-region-needs-restart",
-                                                          NULL);
-        if (g_file_query_exists (g_file_new_for_path (self->needs_restart_file_path), NULL))
+        needs_restart_file = get_needs_restart_file ();
+        if (g_file_query_exists (needs_restart_file, NULL))
                 set_restart_notification_visible (self, NULL, TRUE);
 }
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index 6d0141b..6334c2e 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -218,6 +218,7 @@ cc_sharing_panel_class_init (CcSharingPanelClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sharing/sharing.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcSharingPanel, approve_connections_radiobutton);
+  gtk_widget_class_bind_template_child (widget_class, CcSharingPanel, hostname_entry);
   gtk_widget_class_bind_template_child (widget_class, CcSharingPanel, screen_sharing_grid);
   gtk_widget_class_bind_template_child (widget_class, CcSharingPanel, shared_folders_grid);
   gtk_widget_class_bind_template_child (widget_class, CcSharingPanel, main_list_box);
diff --git a/po/ar.po b/po/ar.po
index 4b32d72..e458e71 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -224,7 +224,7 @@ msgstr "شغّل أو أغلق بلوتوث لتوصيل جهازك بالأجه
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
 msgid "bluetooth"
-msgstr "بلوتوث"
+msgstr "bluetooth"
 
 #. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
diff --git a/po/be.po b/po/be.po
index fcf102e..fba62b1 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-27 19:03+0000\n"
-"PO-Revision-Date: 2017-09-01 17:39+0300\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
+"issues\n"
+"POT-Creation-Date: 2018-08-27 23:05+0000\n"
+"PO-Revision-Date: 2018-09-05 19:07+0300\n"
 "Last-Translator: Yuras Shumovich <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
 "Language: be\n"
@@ -19,208 +19,217 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.1.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Абрус"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "Змяняецца цягам дня"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "_Заблакіраваць экран"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "Кафля"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "Набліжэнне"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "Пасярэдзіне"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "Маштабаванне"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "Запаўненне"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "Ад краю да краю"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
+#: panels/background/cc-background-chooser-dialog.c:424
 msgid "Wallpapers"
 msgstr "Абрусы"
 
-#: ../panels/background/cc-background-chooser-dialog.c:439
+#: panels/background/cc-background-chooser-dialog.c:433
 msgid "Colors"
 msgstr "Колеры"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:476
+#: panels/background/cc-background-chooser-dialog.c:468
 msgid "Select Background"
 msgstr "Выбар абрусу"
 
-#: ../panels/background/cc-background-chooser-dialog.c:504
+#: panels/background/cc-background-chooser-dialog.c:496
 msgid "Pictures"
 msgstr "Выявы"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:536
+#: panels/background/cc-background-chooser-dialog.c:528
 msgid "No Pictures Found"
 msgstr "Выявы не знойдзены"
 
 #. 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:554
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:545
+#: panels/search/cc-search-locations-dialog.c:286
 msgid "Home"
 msgstr "Дом"
 
 #. 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:566
+#: panels/background/cc-background-chooser-dialog.c:555
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Тут вы зможаце ўбачыць выявы, якія змесціце ў папку %s"
 
-#: ../panels/background/cc-background-chooser-dialog.c:573
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:2718
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1318
-#: ../panels/network/net-device-wifi.c:1398
-#: ../panels/network/net-device-wifi.c:1633
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1049
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:375
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:644
-#: ../panels/user-accounts/um-user-panel.c:662
+#: panels/background/cc-background-chooser-dialog.c:560
+#: 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:1901
+#: 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:1411 panels/network/net-device-wifi.c:1491
+#: panels/network/net-device-wifi.c:1736 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/sharing/cc-sharing-panel.c:426
+#: panels/user-accounts/data/account-dialog.ui:28
+#: 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 "_Скасаваць"
 
-#: ../panels/background/cc-background-chooser-dialog.c:574
+#: panels/background/cc-background-chooser-dialog.c:561
 msgid "_Select"
 msgstr "_Выбраць"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:191
 msgid "multiple sizes"
 msgstr "некалькі памераў"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:207
+#: panels/background/cc-background-item.c:195
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:320
 msgid "No Desktop Background"
 msgstr "Без настольнага абруса"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "Цяперашні абрус"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "Абрус"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
 msgstr "Настройка фонавай выявы"
 
-#. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/background/gnome-background-panel.desktop.in.in:7
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
+#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/background/gnome-background-panel.desktop.in.in:15
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Абрус;Экран;Стол;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:268
+#: panels/bluetooth/cc-bluetooth-panel.c:266
 msgid "Turn Off Airplane Mode"
 msgstr "Выключыць рэжым \"у самалёце\""
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:329
 msgid "No Bluetooth Found"
 msgstr "Bluetooth не знойдзены"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:329
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Устаўце ключ каб карыстацца Bluetooth."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth выключаны"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Уключыце, каб злучыць прыстасаванні прыняць файлы."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Airplane Mode is on"
 msgstr "Рэжым \"у самалёце\" ўключаны"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth выключаны ў рэжыме \"у самалёце\""
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Hardware Airplane Mode is on"
 msgstr "Апаратны рэжым \"у сама_лёце\" ўключаны"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Выключыце рэжым \"у самалёце\" каб уключыць Bluetooth."
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Blue­tooth"
+#. 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
+msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Уключэнне Bluetooth і падлучэнне прыстасаванняў"
 
-#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
+msgid "bluetooth"
+msgstr "bluetooth"
+
+#. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "апублікаваць;супольны;bluetooth;obex;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:361
+#: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
 msgstr ""
 "Змясціце ваша калібравальнае прыстасаванне ў квадраце і націсніце \"Пачаць\""
@@ -228,7 +237,7 @@ msgstr ""
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:367
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
@@ -238,7 +247,7 @@ msgstr ""
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:373
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr ""
@@ -248,157 +257,157 @@ msgstr ""
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:379
+#: panels/color/cc-color-calibrate.c:366
 msgid "Shut the laptop lid"
 msgstr "Зачыніце вечка ноўтбука"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:397
 msgid "An internal error occurred that could not be recovered."
 msgstr "Узнікла непапраўная ўнутраная памылка."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:415
+#: panels/color/cc-color-calibrate.c:402
 msgid "Tools required for calibration are not installed."
 msgstr "Калібравальныя прылады не ўсталяваныя."
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:408
 msgid "The profile could not be generated."
 msgstr "Не ўдалося ўтварыць профіль."
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:427
+#: panels/color/cc-color-calibrate.c:414
 msgid "The target whitepoint was not obtainable."
 msgstr "Немагчыма задзейнічаць мэтавы белы пункт."
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:467
+#: panels/color/cc-color-calibrate.c:453
 msgid "Complete!"
 msgstr "Усё!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:475
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "Няўдалае калібраванне!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:468
 msgid "You can remove the calibration device."
 msgstr "Цяпер можна адлучыць калібравальнае прыстасаванне."
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:553
+#: panels/color/cc-color-calibrate.c:537
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Падчас працы не чапайце калібравальнае прыстасаванне"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "Экран ноўтбука"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "Убудаваная сеціўная камера"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s, манітор"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s, сканер"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s, камера"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s, прынтар"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s, сеціўная камера"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:91
 #, c-format
 msgid "Enable color management for %s"
 msgstr "Уключыць кіраванне колерамі для %s"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:94
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "Паказаць профілі колераў для %s"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:301
 msgid "Not calibrated"
 msgstr "Не адкалібравана"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:141
+#: panels/color/cc-color-panel.c:170
 msgid "Default: "
 msgstr "Прадвызначаны: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:149
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
 msgstr "Прастора колераў: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "Тэставы профіль: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "Выбар файла профілю ICC"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "І_мпартаваць"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "Вядомыя профілі ICC"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:260
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "Экран"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Не ўдалося загрузіць файл на сервер: %s"
@@ -406,42 +415,42 @@ msgstr "Не ўдалося загрузіць файл на сервер: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:922
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "Профіль быў загружаны на:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "Запішыце дзе-небудзь гэты URL-адрас."
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:862
 msgid "Restart this computer and boot your normal operating system."
 msgstr ""
 "Перазапусціце камп'ютар і загрузіце вашу звычайную аперацыйную сістэму."
 
-#: ../panels/color/cc-color-panel.c:926
+#: panels/color/cc-color-panel.c:863
 msgid "Type the URL into your browser to download and install the profile."
 msgstr ""
 "Увядзіце гэты URL-адрас у вашым сеціўным аглядальніку і, сцягнуўшы профіль, "
 "усталюйце яго."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:960
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "Захаваць профіль"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:895
+#: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_Захаваць"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1324
+#: panels/color/cc-color-panel.c:1209
 msgid "Create a color profile for the selected device"
 msgstr "Стварыць профіль колераў для вылучанага прыстасавання"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -450,24 +459,24 @@ msgstr ""
 "падлучана."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1373
+#: panels/color/cc-color-panel.c:1258
 msgid "The measuring instrument does not support printer profiling."
 msgstr "Прылада вымярэння не падтрымлівае прафілявання прынтараў."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1384
+#: panels/color/cc-color-panel.c:1269
 msgid "The device type is not currently supported."
 msgstr "Тып прыстасавання не падтрымліваецца."
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:103
+#: panels/color/cc-color-profile.c:100
 msgid "Standard Space"
 msgstr "Стандартная прастора"
 
 #. 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:109
+#: panels/color/cc-color-profile.c:106
 msgid "Test Profile"
 msgstr "Выпрабоўчы профіль"
 
@@ -475,7 +484,7 @@ msgstr "Выпрабоўчы профіль"
 #. * 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:117
+#: panels/color/cc-color-profile.c:114
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "Аўтаматычны"
@@ -483,13 +492,13 @@ msgstr "Аўтаматычны"
 #. 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:127
+#: panels/color/cc-color-profile.c:124
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "Нізкая якасць"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
+#: panels/color/cc-color-profile.c:129
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "Сярэдняя якасць"
@@ -497,62 +506,61 @@ msgstr "Сярэдняя якасць"
 #. 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:139
+#: panels/color/cc-color-profile.c:136
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "Высокая якасць"
 
 #. 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:156
+#: panels/color/cc-color-profile.c:153
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Прадвызначаны RGB"
 
 #. 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:163
+#: panels/color/cc-color-profile.c:160
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Прадвызначаны CMYK"
 
 #. 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:170
+#: panels/color/cc-color-profile.c:167
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Прадвызначаны шэры"
 
-#: ../panels/color/cc-color-profile.c:194
+#: panels/color/cc-color-profile.c:190
 msgid "Vendor supplied factory calibration data"
 msgstr "Калібравальныя даныя ад вытворцы"
 
-#: ../panels/color/cc-color-profile.c:203
+#: panels/color/cc-color-profile.c:199
 msgid "Full-screen display correction not possible with this profile"
 msgstr "Поўнаэкранная карэкцыя дысплея немагчыма для гэтага профілю"
 
-#: ../panels/color/cc-color-profile.c:225
+#: panels/color/cc-color-profile.c:221
 msgid "This profile may no longer be accurate"
 msgstr "Гэты профіль ужо можа быць недакладным"
 
-#: ../panels/color/color-calibrate.ui.h:1
+#: panels/color/color-calibrate.ui:7
 msgid "Display Calibration"
 msgstr "Калібраванне дысплея"
 
 #. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
+#: panels/color/color-calibrate.ui:40
 msgid "_Start"
 msgstr "_Пачаць"
 
 #. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
+#: panels/color/color-calibrate.ui:54
 msgid "_Resume"
 msgstr "_Узнавіць"
 
 #. This button returns the user back to the color control panel
-#: ../panels/color/color-calibrate.ui.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: panels/color/color-calibrate.ui:67 panels/common/cc-language-chooser.ui:11
+#: panels/region/cc-format-chooser.ui:13
 msgid "_Done"
 msgstr "_Зроблена"
 
@@ -560,11 +568,11 @@ msgstr "_Зроблена"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "Калібраванне экрана"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/color.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 "
@@ -574,42 +582,42 @@ msgstr ""
 "колерамі экрана. Чым болей часу выдаткавана на калібраванне, тым лепшая "
 "якасць выніковага профілю колераў."
 
-#: ../panels/color/color.ui.h:3
+#: panels/color/color.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "Падчас калібравання вы не зможаце карыстацца камп'ютарам."
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:5
+#: panels/color/color.ui:58
 msgid "Quality"
 msgstr "Якасць"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/color.ui:75
 msgid "Approximate Time"
 msgstr "Прыблізны час"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/color.ui:121
 msgid "Calibration Quality"
 msgstr "Якасць калібравання"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/color.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "Выберыце датчык для калібравання."
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/color.ui:174
 msgid "Calibration Device"
 msgstr "Калібравальнае прыстасаванне"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/color.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Выберыце тып падлучанага дысплея."
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/color.ui:226
 msgid "Display Type"
 msgstr "Тып дысплея"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/color.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -617,11 +625,11 @@ msgstr ""
 "Выберыце мэтавы белы пункт дысплея. Большасць дысплеяў патрэбна калібраваць "
 "адносна асвятлення D65."
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/color.ui:278
 msgid "Profile Whitepoint"
 msgstr "Белы пункт профілю"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/color.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."
@@ -629,7 +637,7 @@ msgstr ""
 "Настаўце звыклую для вас яркасць дысплея. Кіраванне колерамі будзе найбольш "
 "дакладным на такім узроўні яркасці."
 
-#: ../panels/color/color.ui.h:16
+#: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -637,11 +645,11 @@ msgstr ""
 "Як варыянт, вы можаце ўжыць узровень яркасці з аднаго з іншых профіляў да "
 "гэтага прыстасавання."
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/color.ui:318
 msgid "Display Brightness"
 msgstr "Яркасць дысплея"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/color.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -649,35 +657,35 @@ msgstr ""
 "Профіль колераў можа быць выкарыстаны на розных камп'ютарах. Таксама вы "
 "можаце стварыць розныя профілі для рознага асвятлення."
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/color.ui:348
 msgid "Profile Name:"
 msgstr "Назва профілю:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/color.ui:377
 msgid "Profile Name"
 msgstr "Назва профілю"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/color.ui:392
 msgid "Profile successfully created!"
 msgstr "Профіль паспяхова створаны!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/color.ui:443
 msgid "Copy profile"
 msgstr "Скапіраваць профіль"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/color.ui:456
 msgid "Requires writable media"
 msgstr "Патрабуецца носьбіт з магчымасцю запісу"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/color.ui:519
 msgid "Upload profile"
 msgstr "Загрузіць профіль на сервер"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/color.ui:532
 msgid "Requires Internet connection"
 msgstr "Патрабуецца сеціўнае злучэнне"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/color.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"
@@ -687,28 +695,26 @@ msgstr ""
 "профіль на сістэмах <a href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple "
 "OS X</a> і <a href=\"windows\">Microsoft Windows</a>"
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:723
+#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "Рэзюмэ"
 
-#: ../panels/color/color.ui.h:28
+#: panels/color/color.ui:621
 msgid "Add Profile"
 msgstr "Дадаць профіль"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/color.ui:643
 msgid "_Import File…"
 msgstr "_Імпартаваць файл..."
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:519
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: 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
 msgid "_Add"
 msgstr "_Дадаць"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/color.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -716,222 +722,233 @@ msgstr ""
 "Узніклі праблемы. Профіль не будзе працаваць як мае быць. <a href="
 "\"\">Падрабязнасці.</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/color.ui:811
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "Каб кіраваць колерамі прыстасавання, яно павінна мець свежы профіль."
 
-#: ../panels/color/color.ui.h:34
+#: panels/color/color.ui:833
 msgid "Learn more"
 msgstr "Больш інфармацыі"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/color.ui:838
 msgid "Learn more about color management"
 msgstr "Больш інфармацыі аб кіраванні колерамі"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/color.ui:886
 msgid "_Set for all users"
 msgstr "_Ужыць для ўсіх карыстальнікаў"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/color.ui:890 panels/color/color.ui:905
+#: panels/color/color.ui:906
 msgid "Set this profile for all users on this computer"
 msgstr "Прызначыць профіль для ўсіх карыстальнікаў гэтага камп'ютара"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/color.ui:901
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/color.ui:932
 msgid "_Add profile"
 msgstr "_Дадаць профіль"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/color.ui:945
 msgid "_Calibrate…"
 msgstr "_Адкалібраваць..."
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/color.ui:949
 msgid "Calibrate the device"
 msgstr "Адкалібраваць прыстасаванне"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/color.ui:960
 msgid "_Remove profile"
 msgstr "_Выдаліць профіль"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/color.ui:973
 msgid "_View details"
 msgstr "_Паказаць падрабязнасці"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/color.ui:1009
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Не ўдалося апазнаць прыстасаванні з магчымасцю кіравання колерамі"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/color.ui:1053
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/color.ui:1058
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/color.ui:1063
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/color.ui:1068
 msgid "Projector"
 msgstr "Праектар"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/color.ui:1073
 msgid "Plasma"
 msgstr "Плазма"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/color.ui:1078
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (падсветка CCFL)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/color.ui:1083
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (падсветка RGB LED)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/color.ui:1088
 msgid "LCD (white LED backlight)"
 msgstr "LCD (белая падсветка LED)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/color.ui:1093
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Wide gamut LCD (падсветка CCFL)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/color.ui:1098
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Wide gamut LCD (падсветка RGB LED)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/color.ui:1115
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Высокая"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/color.ui:1116
 msgid "40 minutes"
 msgstr "40 хвілін"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/color.ui:1120
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Сярэдняя"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/color.ui:1121 panels/power/power.ui:25
+#: panels/privacy/privacy.ui:38
 msgid "30 minutes"
 msgstr "30 хвілін"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/color.ui:1125
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Нізкая"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/color.ui:1126 panels/power/power.ui:13 panels/power/power.ui:95
 msgid "15 minutes"
 msgstr "15 хвілін"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/color.ui:1148
 msgid "Native to display"
 msgstr "Родная для гэтага дысплея"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/color.ui:1152
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (друк і публікацыі)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/color.ui:1156
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/color.ui:1160
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (фатаграфіі і графіка)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/color.ui:1164
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Co­lor"
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
 msgstr "Колер"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "Калібраванне колераў прыстасаванняў: дысплеяў, камер, прынтараў і інш."
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#. 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"
+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 "Колер;ICC;Профіль;Калібраванне;Прынтар;Друк;Манітор;Экран;"
 
-#: ../panels/common/cc-common-language.c:323
+#: panels/common/cc-common-language.c:300
 msgid "Other…"
 msgstr "Яшчэ..."
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:269
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:126
+#: panels/region/cc-format-chooser.c:261 panels/region/cc-input-chooser.c:168
 msgid "More…"
 msgstr "Болей..."
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:142
 msgid "No languages found"
 msgstr "Мовы не знойдзены"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:106
+#: panels/common/cc-language-chooser.ui:5
+msgid "Language"
+msgstr "Мова"
+
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "Сёння"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:108
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "Учора"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%e %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%e %b, %Y"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Language"
-msgstr "Мова"
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: panels/common/hostname-helper.c:177
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Хотспот"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "Дзень"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "Месяц"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "Год"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: panels/datetime/cc-datetime-panel.c:326
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e %B %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:344
+#: panels/datetime/cc-datetime-panel.c:331
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:522
+#: panels/datetime/cc-datetime-panel.c:496
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -939,7 +956,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:523
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -947,210 +964,208 @@ 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:560
+#: panels/datetime/cc-datetime-panel.c:530
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:565
+#: panels/datetime/cc-datetime-panel.c:535
 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:570
+#: panels/datetime/cc-datetime-panel.c:540
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:575
+#: panels/datetime/cc-datetime-panel.c:545
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/datetime.ui:22
 msgid "January"
 msgstr "Студзень"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/datetime.ui:25
 msgid "February"
 msgstr "Люты"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/datetime.ui:28
 msgid "March"
 msgstr "Сакавік"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/datetime.ui:31
 msgid "April"
 msgstr "Красавік"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/datetime.ui:34
 msgid "May"
 msgstr "Май"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/datetime.ui:37
 msgid "June"
 msgstr "Чэрвень"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/datetime.ui:40
 msgid "July"
 msgstr "Ліпень"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/datetime.ui:43
 msgid "August"
 msgstr "Жнівень"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/datetime.ui:46
 msgid "September"
 msgstr "Верасень"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/datetime.ui:49
 msgid "October"
 msgstr "Кастрычнік"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/datetime.ui:52
 msgid "November"
 msgstr "Лістапад"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/datetime.ui:55
 msgid "December"
 msgstr "Снежань"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/datetime.ui:61
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "Дата і час"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/datetime.ui:109
 msgid "Hour"
 msgstr "Гадзіна"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/datetime.ui:124
 msgid "∶"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/datetime.ui:148
 msgid "Minute"
 msgstr "Хвіліна"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/datetime.ui:215
 msgid "Time Zone"
 msgstr "Часавы пояс"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/datetime.ui:236
 msgid "Search for a city"
 msgstr "Пошук горада"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/datetime.ui:318
 msgid "Automatic _Date & Time"
 msgstr "_Аўтаматычная настройка даты і часу"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/datetime.ui:333 panels/datetime/datetime.ui:411
 msgid "Requires internet access"
 msgstr "Патрабуецца доступ да Інтэрнэту"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/datetime.ui:396
 msgid "Automatic Time _Zone"
 msgstr "Аўтаматычны _выбар часавага пояса"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/datetime.ui:468
 msgid "Date & _Time"
 msgstr "Дата і _час"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/datetime.ui:516
 msgid "Time Z_one"
 msgstr "Часавы п_ояс"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/datetime.ui:586
 msgid "Time _Format"
 msgstr "_Фармат часу"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/datetime.ui:605
 msgid "24-hour"
 msgstr "24 гадзіны"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/datetime.ui:606
 msgid "AM / PM"
 msgstr "AM / PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "Настройка даты і часу, а таксама часавага пояса"
 
-#. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
+#. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
 msgstr "Гадзіннік;Часавы пояс;Месцазнаходжанне;Месца;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "Змяненне сістэмных настроек часу і даты"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Каб змяняць настройкі часу і даты, трэба ідэнтыфікаваць сябе."
 
-#: ../panels/display/cc-display-panel.c:738
+#: panels/display/cc-display-panel.c:520
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "Пейзаж"
 
-#: ../panels/display/cc-display-panel.c:741
+#: panels/display/cc-display-panel.c:523
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "Правы партрэт"
 
-#: ../panels/display/cc-display-panel.c:744
+#: panels/display/cc-display-panel.c:526
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "Левы партрэт"
 
-#: ../panels/display/cc-display-panel.c:747
+#: panels/display/cc-display-panel.c:529
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "Перакулены пейзаж"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/display/cc-display-panel.c:788
-#: ../panels/display/cc-display-panel.c:838
-#: ../panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:596
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Арыентацыя"
 
-#: ../panels/display/cc-display-panel.c:881
-#: ../panels/display/cc-display-panel.c:933
-#: ../panels/display/cc-display-panel.c:1772
-#: ../panels/display/cc-display-panel.c:1818
-#: ../panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-panel.c:663 panels/display/cc-display-panel.c:1428
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Распазнавальнасць"
 
-#: ../panels/display/cc-display-panel.c:978
-#: ../panels/display/cc-display-panel.c:1049
+#: panels/display/cc-display-panel.c:750
 msgid "Refresh Rate"
 msgstr "Частата абнаўлення"
 
-#: ../panels/display/cc-display-panel.c:1207
+#: panels/display/cc-display-panel.c:885
 msgid "Scale"
 msgstr "Маштабаванне"
 
-#: ../panels/display/cc-display-panel.c:1260
+#: panels/display/cc-display-panel.c:937
 msgid "Adjust for TV"
 msgstr "Падстроіць для ТБ"
 
-#: ../panels/display/cc-display-panel.c:1472
-#: ../panels/display/cc-display-panel.c:1518
+#: panels/display/cc-display-panel.c:1172
 msgid "Primary Display"
 msgstr "Асноўны манітор"
 
-#: ../panels/display/cc-display-panel.c:1567
+#: panels/display/cc-display-panel.c:1200
 msgid "Display Arrangement"
 msgstr "Парадак манітораў"
 
-#: ../panels/display/cc-display-panel.c:1568
+#: panels/display/cc-display-panel.c:1201
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
@@ -1158,84 +1173,93 @@ msgstr ""
 "Перацягніце маніторы на свой лад. Верхняя паліца з'явіцца на асноўным "
 "маніторы."
 
-#: ../panels/display/cc-display-panel.c:2006
+#: panels/display/cc-display-panel.c:1615
 msgid "Display Mode"
 msgstr "Рэжым манітора"
 
-#: ../panels/display/cc-display-panel.c:2022
+#: panels/display/cc-display-panel.c:1631
 msgid "Join Displays"
 msgstr "Аб'яднаць маніторы"
 
-#: ../panels/display/cc-display-panel.c:2025
+#: panels/display/cc-display-panel.c:1634
 msgid "Mirror"
 msgstr "Адлюстроўваць"
 
-#: ../panels/display/cc-display-panel.c:2028
+#: panels/display/cc-display-panel.c:1637
 msgid "Single Display"
 msgstr "Адзіны манітор"
 
-#: ../panels/display/cc-display-panel.c:2714
+#: panels/display/cc-display-panel.c:1911
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
+msgid "_Apply"
+msgstr "_Ужыць"
+
+#: panels/display/cc-display-panel.c:1933
 msgid "Apply Changes?"
 msgstr "Ужыць змены?"
 
-#: ../panels/display/cc-display-panel.c:2728
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "_Ужыць"
+#: panels/display/cc-display-panel.c:1938
+msgid "Changes Cannot be Applied"
+msgstr "Немагчыма ўжыць змены"
 
-#: ../panels/display/cc-display-panel.c:3104
+#: panels/display/cc-display-panel.c:1939
+msgid "This could be due to hardware limitations."
+msgstr "Магчыма, гэта з-за апаратных абмежаванняў."
+
+#: panels/display/cc-display-panel.c:2070
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Гц"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:3320
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
+#: panels/display/cc-display-panel.c:2242
+#: panels/notifications/cc-notifications-panel.c:288
+#: panels/power/cc-power-panel.c:2038 panels/power/cc-power-panel.c:2045
+#: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+#: 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
 msgid "On"
 msgstr "Укл"
 
-#: ../panels/display/cc-display-panel.c:3320 ../panels/network/net-proxy.c:54
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/display/cc-display-panel.c:2242 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:288
+#: panels/power/cc-power-panel.c:2032 panels/power/cc-power-panel.c:2043
+#: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+#: 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
 msgid "Off"
 msgstr "Выкл."
 
-#: ../panels/display/cc-display-panel.c:3341
+#: panels/display/cc-display-panel.c:2262
 msgid "_Night Light"
 msgstr "_Начное святло"
 
-#: ../panels/display/cc-display-panel.c:3406
+#: panels/display/cc-display-panel.c:2323
 msgid "Could not get screen information"
 msgstr "Не ўдалося атрымаць звесткі аб экране"
 
 #. This cancels the redshift inhibit.
-#: ../panels/display/display.ui.h:2
+#: panels/display/cc-night-light-dialog.ui:47
 msgid "Restart Filter"
 msgstr "Перазапусціць фільтр"
 
 #. Inhibit the redshift functionality until the next day starts
-#: ../panels/display/display.ui.h:4
+#: panels/display/cc-night-light-dialog.ui:80
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "Часова выключана да заўтра"
 
-#: ../panels/display/display.ui.h:5
+#: panels/display/cc-night-light-dialog.ui:107
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1244,60 +1268,68 @@ msgstr ""
 "стамлення вачэй і бяссонніцы."
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: ../panels/display/display.ui.h:7
+#: panels/display/cc-night-light-dialog.ui:129
+#: panels/display/cc-night-light-dialog.ui:466
 msgid "Night Light"
 msgstr "Начное святло"
 
-#: ../panels/display/display.ui.h:8
+#: panels/display/cc-night-light-dialog.ui:145
 msgid "Schedule"
 msgstr "Спланаваць"
 
-#: ../panels/display/display.ui.h:9
+#: panels/display/cc-night-light-dialog.ui:174
 msgid "Sunset to Sunrise"
 msgstr "Ад заходу да ўсходу"
 
-#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/display/cc-night-light-dialog.ui:189
+#: 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
 msgid "Manual"
 msgstr "Уручную"
 
-#: ../panels/display/display.ui.h:11
+#: panels/display/cc-night-light-dialog.ui:224
 msgid "From"
 msgstr "Ад"
 
-#: ../panels/display/display.ui.h:12
+#: panels/display/cc-night-light-dialog.ui:256
+#: panels/display/cc-night-light-dialog.ui:353
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: ../panels/display/display.ui.h:14
+#: panels/display/cc-night-light-dialog.ui:281
+#: panels/display/cc-night-light-dialog.ui:378
 msgid "AM"
 msgstr "AM"
 
 #. This is the short form for the time period in the afternoon
-#: ../panels/display/display.ui.h:16
+#: panels/display/cc-night-light-dialog.ui:297
+#: panels/display/cc-night-light-dialog.ui:394
 msgid "PM"
 msgstr "PM"
 
-#: ../panels/display/display.ui.h:17
+#: panels/display/cc-night-light-dialog.ui:436
 msgid "To"
 msgstr "Да"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
 msgstr "Маніторы"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Настройка выкарыстання падлучаных манітораў і праектараў"
 
-#. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/display/gnome-display-panel.desktop.in.in:7
+msgid "preferences-desktop-display"
+msgstr "preferences-desktop-display"
+
+#. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/display/gnome-display-panel.desktop.in.in:19
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
@@ -1306,9 +1338,8 @@ msgstr ""
 "Святло;колер;заход;усход;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-overview-panel.c:381
-#: ../panels/info/cc-info-overview-panel.c:468
-#: ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:374
+#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Невядома"
 
@@ -1316,78 +1347,62 @@ msgstr "Невядома"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: ../panels/info/cc-info-overview-panel.c:476
+#: panels/info/cc-info-overview-panel.c:465
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s; ID сборкі: %s"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:493
+#: panels/info/cc-info-overview-panel.c:482
 #, c-format
 msgid "64-bit"
 msgstr "64-бітная"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:496
+#: panels/info/cc-info-overview-panel.c:485
 #, c-format
 msgid "32-bit"
 msgstr "32-бітная"
 
-#: ../panels/info/cc-info-overview-panel.c:800
+#: panels/info/cc-info-overview-panel.c:775
 #, c-format
 msgid "Version %s"
 msgstr "Версія %s"
 
-#: ../panels/info/cc-info-panel.c:138
-msgid "Section"
-msgstr "Раздзел"
-
-#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
-msgid "Overview"
-msgstr "Агляд"
-
-#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
-msgid "Default Applications"
-msgstr "Прадвызначаныя праграмы"
-
-#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
-msgid "Removable Media"
-msgstr "Зменныя носьбіты"
-
-#: ../panels/info/cc-info-removable-media-panel.c:312
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "Спытаць аб патрэбным дзеянні"
 
-#: ../panels/info/cc-info-removable-media-panel.c:316
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "Нічога не рабіць"
 
-#: ../panels/info/cc-info-removable-media-panel.c:320
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "Адкрыць папку"
 
-#: ../panels/info/cc-info-removable-media-panel.c:411
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "Іншыя носьбіты"
 
-#: ../panels/info/cc-info-removable-media-panel.c:444
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "Выберыце праграму для Audio CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:445
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "Выберыце праграму для Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:446
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
 msgstr "Выберыце праграму для запуску пры падлучэнні музычнага плэера"
 
-#: ../panels/info/cc-info-removable-media-panel.c:447
+#: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
 msgstr ""
 "Выберыце праграму для запуску пры падлучэнні фотаапарата ці відэакамеры"
 
-#: ../panels/info/cc-info-removable-media-panel.c:448
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "Выберыце праграму для дыскаў з апраграмаваннем"
 
@@ -1396,81 +1411,91 @@ msgstr "Выберыце праграму для дыскаў з апрагра�
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-removable-media-panel.c:460
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "Audio DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:461
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "Пусты Blu-ray дыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:462
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "Пусты CD-дыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:463
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "Пусты DVD-дыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:464
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "Пусты HD DVD-дыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:465
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "Blu-ray відэадыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:466
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "Электронная кніга"
 
-#: ../panels/info/cc-info-removable-media-panel.c:467
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD-відэадыск"
 
-#: ../panels/info/cc-info-removable-media-panel.c:468
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:469
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:470
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:471
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows-апраграмаванне"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
-msgid "Defa­ult Applications"
-msgstr "Прад­выз­на­ча­ныя праг­ра­мы"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "Прадвызначаныя праграмы"
 
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
 msgid "Configure Default Applications"
 msgstr "Настроіць прадвызначаныя праграмы"
 
-#. Translators: those are keywords for the Default Applications panel
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:7
+msgid "starred"
+msgstr "starred"
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:19
 msgid "default;application;preferred;media;"
 msgstr "прадвызначаны;праграма;перавагі;медыя;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
-msgid "Ab­out"
-msgstr "Пра праграму"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "Агляд"
 
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "Прагляд звестак аб сістэме"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-info-overview-panel.desktop.in.in:7
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: Search terms to find the About panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
+#. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
+#: panels/info/gnome-info-overview-panel.desktop.in.in:23
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1479,22 +1504,21 @@ msgstr ""
 "прадвызначанае;праграма;упадабанае;cd;dvd;usb;гук;аўдыя;відэа;дыск;зменны;"
 "носьбіт;аўтазапуск;аўтаматычны запуск;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "Пад­ра­бяз­нас­ці"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
-msgid "Remo­vable Media"
-msgstr "Змен­ныя нось­біты"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "Зменныя носьбіты"
 
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
 msgid "Configure Removable Media settings"
 msgstr "Настроіць зменныя носьбіты"
 
-#. Translators: those are keywords for the Removable Media panel
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:7
+msgid "media-removable"
+msgstr "media-removable"
+
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:19
 msgid ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
@@ -1503,291 +1527,287 @@ msgstr ""
 "прадвызначанае;праграма;упадабанае;cd;dvd;usb;гук;аўдыя;відэа;дыск;зменны;"
 "носьбіт;аўтазапуск;аўтаматычны запуск;"
 
-#: ../panels/info/info-default-apps.ui.h:1
+#: panels/info/info-default-apps.ui:31
 msgid "_Web"
 msgstr "_Сеціва"
 
-#: ../panels/info/info-default-apps.ui.h:2
+#: panels/info/info-default-apps.ui:43
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../panels/info/info-default-apps.ui.h:3
+#: panels/info/info-default-apps.ui:59
 msgid "_Calendar"
 msgstr "_Каляндар"
 
-#: ../panels/info/info-default-apps.ui.h:4
+#: panels/info/info-default-apps.ui:75
 msgid "M_usic"
 msgstr "_Музыка"
 
-#: ../panels/info/info-default-apps.ui.h:5
+#: panels/info/info-default-apps.ui:91
 msgid "_Video"
 msgstr "_Відэа"
 
-#: ../panels/info/info-default-apps.ui.h:6
-#: ../panels/info/info-removable-media.ui.h:5
+#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
 msgid "_Photos"
 msgstr "_Фатаграфіі"
 
-#: ../panels/info/info-overview.ui.h:1
+#: panels/info/info-overview.ui:58
 msgid "Device name"
 msgstr "Назва камп'ютара"
 
-#: ../panels/info/info-overview.ui.h:2
+#: panels/info/info-overview.ui:74
 msgid "Memory"
 msgstr "Памяць"
 
-#: ../panels/info/info-overview.ui.h:3
+#: panels/info/info-overview.ui:90
 msgid "Processor"
 msgstr "Працэсар"
 
-#: ../panels/info/info-overview.ui.h:4
+#: panels/info/info-overview.ui:106
 msgid "Graphics"
 msgstr "Графіка"
 
 #. To translators: this field contains the distro name and version
-#: ../panels/info/info-overview.ui.h:6
+#: panels/info/info-overview.ui:121
 msgid "OS name"
 msgstr "Імя АС"
 
 #. To translators: this field contains the distro type
-#: ../panels/info/info-overview.ui.h:8
+#: panels/info/info-overview.ui:137
 msgid "OS type"
 msgstr "Тып АС"
 
-#: ../panels/info/info-overview.ui.h:9
+#: panels/info/info-overview.ui:153
 msgid "Virtualization"
 msgstr "Віртуалізацыя"
 
-#: ../panels/info/info-overview.ui.h:10
+#: panels/info/info-overview.ui:169
 msgid "Disk"
 msgstr "Дыск"
 
-#: ../panels/info/info-overview.ui.h:11
+#: panels/info/info-overview.ui:274
 msgid "Calculating…"
 msgstr "Разлік..."
 
-#: ../panels/info/info-overview.ui.h:12
+#: panels/info/info-overview.ui:314
 msgid "Check for updates"
 msgstr "Праверыць наяўнасць абновак"
 
-#: ../panels/info/info-removable-media.ui.h:1
+#: panels/info/info-removable-media.ui:43
 msgid "Select how media should be handled"
 msgstr "Вызначыце, што трэба рабіць з носьбітамі даных"
 
-#: ../panels/info/info-removable-media.ui.h:2
+#: panels/info/info-removable-media.ui:74
 msgid "CD _audio"
 msgstr "_Гукавы CD"
 
-#: ../panels/info/info-removable-media.ui.h:3
+#: panels/info/info-removable-media.ui:91
 msgid "_DVD video"
 msgstr "_Відэа DVD"
 
-#: ../panels/info/info-removable-media.ui.h:4
+#: panels/info/info-removable-media.ui:132
 msgid "_Music player"
 msgstr "_Музычны плэер"
 
-#: ../panels/info/info-removable-media.ui.h:6
+#: panels/info/info-removable-media.ui:190
 msgid "_Software"
 msgstr "_Апраграмаванне"
 
-#: ../panels/info/info-removable-media.ui.h:7
+#: panels/info/info-removable-media.ui:228
 msgid "_Other Media…"
 msgstr "І_ншыя носьбіты..."
 
-#: ../panels/info/info-removable-media.ui.h:8
+#: panels/info/info-removable-media.ui:272
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Ніколі нічога не рабіць пры ўстаўцы новых носьбітаў даных"
 
-#: ../panels/info/info-removable-media.ui.h:9
+#: panels/info/info-removable-media.ui:331
 msgid "Select how other media should be handled"
 msgstr "Вызначыце, што трэба рабіць з іншымі носьбітамі даных"
 
-#: ../panels/info/info-removable-media.ui.h:10
+#: panels/info/info-removable-media.ui:370
 msgid "_Action:"
 msgstr "_Дзеянне:"
 
-#: ../panels/info/info-removable-media.ui.h:11
+#: panels/info/info-removable-media.ui:393
 msgid "_Type:"
 msgstr "_Тып:"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Гук і мультымедыі"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "Абязгучыць"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "Паменшыць гучнасць"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "Павялічыць гучнасць"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "Запусціць медыяпрайгравальнік"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "Зайграць (ці зайграць/прыпыніць)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "Прыпыніць прайграванне"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "Спыніць прайграванне"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "Да папярэдняга трэка"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "Да наступнага трэка"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "Выняць"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:580
 msgid "Typing"
 msgstr "Пісьмо"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "Пераключыць на наступную крыніцу ўводу"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "Пераключыць на папярэднюю крыніцу ўводу"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "Клавішы запуску"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "Запусціць аглядальнік даведкі"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
-#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: 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 "Настройкі"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Запусціць калькулятар"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "Запусціць паштовую праграму"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "Запусціць сеціўны аглядальнік"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "Хатняя папка"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
-msgctxt "keybinding"
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:156
 msgid "Search"
 msgstr "Пошук"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Экранныя здымкі"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "Захаваць здымак экрана ў папцы $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "Захаваць здымак акна ў папцы $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "Захаваць здымак часткі экрана ў папцы $PICTURES"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "Скапіраваць экранны здымак у буфер абмену"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "Скапіраваць экранны здымак акна ў буфер абмену"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "Скапіраваць здымак часткі экрана ў буфер абмену"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "Запісаць кароткі скрынкаст"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "Сістэма"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "Скончыць сеанс"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "Заблакіраваць экран"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "У­ні­вер­саль­ны дос­туп"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "Уключыць/выключыць маштабаванне"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "Набліжэнне"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "Аддаленне"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "Уключыць/выключыць чытача экрана"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "Уключыць/выключыць экранную клавіятуру"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "Павялічыць памер тэксту"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "Паменшыць памер тэксту"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "Уключыць/выключыць высокую кантраснасць"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:506
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-keyboard-manager.c:501
+#: panels/keyboard/cc-keyboard-manager.c:509
+#: panels/keyboard/cc-keyboard-manager.c:809
 msgid "Custom Shortcuts"
 msgstr "Уласныя клавіятурныя скароты"
 
@@ -1796,14 +1816,13 @@ msgstr "Уласныя клавіятурныя скароты"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:435
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-proxy.ui.h:4
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1866
-#: ../panels/user-accounts/um-fingerprint-dialog.c:214
+#: 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 "Выключана"
 
@@ -1811,7 +1830,7 @@ msgstr "Выключана"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:337
 msgid "Alternative Characters Key"
 msgstr "Клавіша альтэрнатыўных сімвалаў"
 
@@ -1819,41 +1838,41 @@ msgstr "Клавіша альтэрнатыўных сімвалаў"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:346
 msgid "Compose Key"
 msgstr "Compose-клавіша"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:351
 msgid "Modifiers-only switch to next source"
 msgstr "Пераключэнне на наступную крыніцу ўводу толькі мадыфікатарамі"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
+#: panels/keyboard/cc-keyboard-panel.c:179
 msgid "Reset All Shortcuts?"
 msgstr "Ануляваць усе скароты?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-panel.c:182
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr ""
 "Ануляванне можа закрануць вашыя ўласныя скароты і не можа быць адроблена."
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: panels/keyboard/cc-keyboard-panel.c:186
+#: panels/keyboard/shortcut-editor.ui:346
+#: panels/printers/authentication-dialog.ui:29
+#: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:189
+#: panels/keyboard/cc-keyboard-panel.c:187
 msgid "Reset All"
 msgstr "Ануляваць усё"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:281
+#: panels/keyboard/cc-keyboard-panel.c:279
 msgid "Reset the shortcut to its default value"
 msgstr "Перанастроіць скарот на прадвызначанае значэнне"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1862,230 +1881,240 @@ msgstr ""
 "%s ужо выкарыстоўваецца для <b>%s</b>. Калі вы яго зменіце, %s будзе "
 "выключана"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Custom Shortcut"
 msgstr "Наставіць уласны клавіятурны скарот"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Shortcut"
 msgstr "Наставіць клавіятурны скарот"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Увядзіце новы скарот на замену <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
 msgid "Add Custom Shortcut"
 msgstr "Дадаць уласны клавіятурны скарот"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "Клавіятура"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "Настройка клавіятурных скаротаў і ўводу тэксту"
 
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
+msgid "input-keyboard"
+msgstr "input-keyboard"
+
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
 "Скарот;Працоўны;Прастора;Акно;Памер;Маштаб;Кантраснасць;Увод;Блакіроўка;"
 "Гучнасць;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
+#: shell/cc-application.c:252
 msgid "Keyboard Shortcuts"
 msgstr "Клавіятурныя скароты"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: panels/keyboard/gnome-keyboard-panel.ui:77
 msgid "Reset All…"
 msgstr "Ануляваць усё..."
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: panels/keyboard/gnome-keyboard-panel.ui:78
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "Перанастроіць усе скароты на прадвызначанае значэнне"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:164
 msgid "No keyboard shortcut found"
 msgstr "Клавіятурны скарот не знойдзены"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
 msgid "Try a different search"
 msgstr "Паспрабуйце іншы пошук"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: 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 ""
 "Націсніце Esc каб скасаваць ці Backspace каб скінуць клавіятурны скарот."
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/sound/gvc-mixer-dialog.c:1480
+#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "Назва"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "Загад"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "Клавіятурны скарот"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
+#: panels/keyboard/shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "Наставіць скарот..."
 
-#: ../panels/keyboard/shortcut-editor.ui.h:7
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "Няма"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "Увядзіце новы скарот"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:357
 msgid "Remove"
 msgstr "Выдаліць"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "Дадаць"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "Замяніць"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "Наставіць"
 
-#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:427
 msgid "Test Your _Settings"
 msgstr "_Выпрабаваць настройкі"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "Мыш і чулая панэль"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr ""
 "Настройка чуласці мышы і чулай панэлі, а таксама падгонка мышы пад ляўшу"
 
-#. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
+msgid "input-mouse"
+msgstr "input-mouse"
+
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Чулая панэль;Паказальнік;Пстрычка;Дотык;Падвойная пстрычка;Кнопка;Трэкбол;"
 "Пракрутка;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:50
 msgid "General"
 msgstr "Агульныя настройкі"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:88
 msgid "Primary Button"
 msgstr "Галоўная кнопка"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:107
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "Настаўляе парадак апаратных кнопак на мышы і чулай панэлі."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:136
 msgid "Left"
 msgstr "Левы"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:146
 msgid "Right"
 msgstr "Правы"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:182
 msgid "Mouse"
 msgstr "Мыш"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:221
 msgid "Mouse Speed"
 msgstr "Хуткасць мышы"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:243
+#: panels/mouse/gnome-mouse-properties.ui:548
 msgid "Double-click timeout"
 msgstr "Затрымка падвойнай пстрычкі"
 
+#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use the same translation if possible.
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: panels/mouse/gnome-mouse-properties.ui:280
+#: panels/mouse/gnome-mouse-properties.ui:456
 msgid "Natural Scrolling"
 msgstr "Натуральная пракрутка"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:296
+#: panels/mouse/gnome-mouse-properties.ui:472
 msgid "Scrolling moves the content, not the view."
 msgstr "Пракрутка перамяшчае змесціва, а не прастору."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:346
+#: panels/mouse/gnome-mouse-properties.ui:391
 msgid "Touchpad"
 msgstr "Чулая панэль"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:527
 msgid "Touchpad Speed"
 msgstr "Хуткасць чулай панэлі"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:586
 msgid "Tap to Click"
 msgstr "Дотык як пстрычка"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:639
 msgid "Two-finger Scrolling"
 msgstr "Пракрутка двума пальцамі"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:693
 msgid "Edge Scrolling"
 msgstr "Пракрутка па краі"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
 msgid "Try clicking, double clicking, scrolling"
 msgstr ""
 "Паспрабуйце папстрыкаць (адзін раз і двойчы), а таксама пракруціць змесціва"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:137
 msgid "Five clicks, GEGL time!"
 msgstr "Пяць пстрычак, час на GEGL!"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "Падвойная пстрычка, галоўная кнопка"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "Адна пстрычка, галоўная кнопка"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "Падвойная пстрычка, сярэдняя кнопка"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "Адна пстрычка, сярэдняя кнопка"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "Падвойная пстрычка, дадатковая кнопка"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "Адна пстрычка, дадатковая кнопка"
 
 #. add proxy to device list
-#: ../panels/network/cc-network-panel.c:581
+#: panels/network/cc-network-panel.c:583
 msgid "Network proxy"
 msgstr "Сеткавы проксі-сервер"
 
@@ -2093,116 +2122,151 @@ msgstr "Сеткавы проксі-сервер"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192
-#: ../panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
+#: panels/network/net-vpn.c:299
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
+#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:320
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr ""
 "Ой, штосьці пайшло нечакана. Калі ласка, звяжыцеся з пастаўшчыком "
 "праграмнага забеспячэння."
 
-#: ../panels/network/cc-network-panel.c:787
+#: panels/network/cc-network-panel.c:789
 msgid "NetworkManager needs to be running."
 msgstr "Трэба каб NetworkManager быў запушчаны."
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/cc-wifi-panel.c:209
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
-#: ../panels/network/network-wifi.ui.h:58
+#: panels/network/cc-network-panel.ui:142
+#: panels/network/connection-editor/net-connection-editor.c:603
+msgid "VPN"
+msgstr "VPN"
+
+#: panels/network/cc-network-panel.ui:194
+msgid "Not set up"
+msgstr "Не настаўлена"
+
+#: panels/network/cc-wifi-panel.c:281
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1746
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/cc-wifi-panel.ui:73
+msgid "Airplane Mode"
+msgstr "Рэжым \"у самалёце\""
+
+#: panels/network/cc-wifi-panel.ui:88
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Выключыць Wi-Fi, Bluetooth і мабільны доступ"
+
+#: panels/network/cc-wifi-panel.ui:157
+msgid "No Wi-Fi Adapter Found"
+msgstr "Wi-Fi адаптар не знойдзены"
+
+#: panels/network/cc-wifi-panel.ui:169
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Праверце, што Wi-Fi адаптар падключаны"
+
+#: panels/network/cc-wifi-panel.ui:204
+msgid "Airplane Mode On"
+msgstr "Уключыць рэжым \"у самалёце\""
+
+#: panels/network/cc-wifi-panel.ui:216
+msgid "Turn off to use Wi-Fi"
+msgstr "Выключыць каб выкарыстаць Wi-Fi"
+
+#: panels/network/cc-wifi-panel.ui:242
+msgid "Visible Networks"
+msgstr "Бачныя сеткі"
+
+#: panels/network/cc-wifi-panel.ui:309
+msgid "NetworkManager needs to be running"
+msgstr "Трэба каб NetworkManager быў запушчаны"
+
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "_Бяспека 802.1x"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
 msgid "page 1"
 msgstr "аркуш 1"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:224
+#: panels/network/connection-editor/security-page.ui:223
+#: panels/network/wireless-security/eap-method-fast.ui:50
+#: panels/network/wireless-security/eap-method-peap.ui:48
+#: panels/network/wireless-security/eap-method-ttls.ui:31
 msgid "Anony_mous identity"
 msgstr "_Ананімная ідэнтычнасць"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: panels/network/connection-editor/8021x-security-page.ui:238
+#: panels/network/connection-editor/security-page.ui:237
 msgid "Inner _authentication"
 msgstr "_Унутраная ідэнтыфікацыя"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
 msgid "page 2"
 msgstr "аркуш 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:445
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-security.c:445
+#: panels/network/connection-editor/details-page.ui:86
+#: panels/network/network-wifi.ui:239
 msgid "Security"
 msgstr "Бяспека"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "аўтаматычна"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, c-format
 msgid "Profile %d"
 msgstr "Профіль %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:231
-#: ../panels/network/net-device-wifi.c:407
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:235
-#: ../panels/network/net-device-wifi.c:412
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
+#: 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:239
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:243
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:69
-#: ../panels/network/net-device-wifi.c:244
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:248
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:74
-#: ../panels/network/net-device-wifi.c:249
-#: ../panels/network/net-device-wifi.c:397
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Няма"
 
-#: ../panels/network/connection-editor/ce-page-details.c:95
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/power/power.ui:99
 msgid "Never"
 msgstr "Ніколі"
 
-#: ../panels/network/connection-editor/ce-page-details.c:110
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:505
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:121
+#: panels/network/net-device-wifi.c:567
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2211,356 +2275,366 @@ msgstr[1] "%i дні таму"
 msgstr[2] "%i дзён таму"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:176
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:561
+#: panels/network/connection-editor/ce-page-details.c:225
+#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Мб/с"
 
-#: ../panels/network/connection-editor/ce-page-details.c:202
-#: ../panels/network/net-device-wifi.c:590
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:675
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Няма"
 
-#: ../panels/network/connection-editor/ce-page-details.c:204
-#: ../panels/network/net-device-wifi.c:592
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:677
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Слабы"
 
-#: ../panels/network/connection-editor/ce-page-details.c:206
-#: ../panels/network/net-device-wifi.c:594
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:679
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Здавальняючы"
 
-#: ../panels/network/connection-editor/ce-page-details.c:208
-#: ../panels/network/net-device-wifi.c:596
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:681
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Добры"
 
-#: ../panels/network/connection-editor/ce-page-details.c:210
-#: ../panels/network/net-device-wifi.c:598
+#: panels/network/connection-editor/ce-page-details.c:259
+#: panels/network/net-device-wifi.c:683
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Выдатны"
 
-#: ../panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Forget Connection"
 msgstr "Забыць злучэнне"
 
-#: ../panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove Connection Profile"
 msgstr "Выдаліць профіль злучэння"
 
-#: ../panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/connection-editor/ce-page-details.c:306
 msgid "Remove VPN"
 msgstr "Выдаліць VPN"
 
-#: ../panels/network/connection-editor/ce-page-details.c:280
-#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
+#: shell/cc-window.c:243
 msgid "Details"
 msgstr "Падрабязнасці"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:173
-#: ../panels/network/connection-editor/ce-page-vpn.c:188
-#: ../panels/network/connection-editor/ce-page-wifi.c:194
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "Ідэнтычнасць"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:251
-#: ../panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Выдаліць адрас"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Выдаліць маршрут"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:896
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:827
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:828
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Няма"
 
-#: ../panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP, 40/128-бітны ключ (Hex ці ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP, 128-бітная парольная фраза"
 
-#: ../panels/network/connection-editor/ce-page-security.c:291
-#: ../panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Дынамічны WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: panels/network/connection-editor/details-page.ui:18
+#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "Магутнасць сігналу"
 
-#: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "Хуткасць злучэння"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4-адрас"
 
-#: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/net-device-ethernet.c:159
+#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
+#: panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6-адрас"
 
-#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Апаратны адрас"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Прадвызначаны маршрут"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:10
-#: ../panels/network/connection-editor/ip6-page.ui.h:11
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: 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/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "Апошняе выкарыстанне"
 
-#: ../panels/network/connection-editor/details-page.ui.h:10
+#: panels/network/connection-editor/details-page.ui:324
 msgid "Connect _automatically"
 msgstr "_Злучаць аўтаматычна"
 
-#: ../panels/network/connection-editor/details-page.ui.h:11
+#: panels/network/connection-editor/details-page.ui:343
 msgid "Make available to _other users"
 msgstr "Падзяліцца з іншымі _карыстальнікамі"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:11
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/network/connection-editor/details-page.ui:376
+msgid "Restrict background data usage"
+msgstr "Абмежаваць выкарыстанне даных у фоне"
+
+#: panels/network/connection-editor/details-page.ui:386
+msgid "Appropriate for connections that have data charges or limits."
+msgstr "Датычыцца злучэнняў з аплатай і абмежаваннямі."
+
+#: panels/network/connection-editor/ethernet-page.ui:16
+#: panels/network/connection-editor/ethernet-page.ui:39
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: 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
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "Вітая пара"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Мбіт/с"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Мбіт/с"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Гбіт/с"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Гб/с"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: panels/network/connection-editor/ethernet-page.ui:71
+#: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "_Назва"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "MAC-_адрас"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "_MTU"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:97
 msgid "_Cloned Address"
 msgstr "_Кланіраваны адрас"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "байтаў"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: panels/network/connection-editor/ip4-page.ui:27
 msgid "IPv_4 Method"
 msgstr "IPv_4 спосаб"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:27
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "Аўтаматычна (DHCP)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
 msgid "Link-Local Only"
 msgstr "Толькі лакальна"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
 msgstr "Выключана"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
 msgid "Addresses"
 msgstr "Адрасы"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/printers/details-dialog.ui.h:3
+#: panels/network/connection-editor/ip4-page.ui:129
+#: 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
 msgid "Address"
 msgstr "Адрас"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
 msgid "Netmask"
 msgstr "Сеткавая маска"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:9
-#: ../panels/network/connection-editor/ip6-page.ui.h:10
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Gateway"
 msgstr "Сеткавая брама"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:12
-#: ../panels/network/connection-editor/ip6-page.ui.h:12
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
 msgstr "Аўтаматычны DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:13
-#: ../panels/network/connection-editor/ip6-page.ui.h:13
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
 msgid "Separate IP addresses with commas"
 msgstr "Раздзяляйце IP адрасы коскамі"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:14
-#: ../panels/network/connection-editor/ip6-page.ui.h:14
-#: ../panels/network/network-wifi.ui.h:32
+#: panels/network/connection-editor/ip4-page.ui:265
+#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "Маршруты"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:15
-#: ../panels/network/connection-editor/ip6-page.ui.h:15
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "Аўтаматычныя маршруты"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ip4-page.ui.h:17
-#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
 msgid "Metric"
 msgstr "Метрыка"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:18
-#: ../panels/network/connection-editor/ip6-page.ui.h:18
-#: ../panels/network/network-wifi.ui.h:34
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 msgid "Use this connection _only for resources on its network"
 msgstr "_Ужыць гэта злучэнне толькі для рэсурсаў гэтай сеткі"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: panels/network/connection-editor/ip6-page.ui:27
 msgid "IPv_6 Method"
 msgstr "IPv_6 спосаб"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Automatic, DHCP only"
 msgstr "Аўтаматычна, толькі DHCP"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:9
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
 msgid "Prefix"
 msgstr "Прэфікс"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Не ўдалося адкрыць рэдактар злучэння"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Новы профіль"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:603
-#: ../panels/network/network.ui.h:2
-msgid "VPN"
-msgstr "VPN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Імпартаваць з файла..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Дадаць VPN"
 
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "_Бяспека"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Не ўдалося імпартаваць VPN-злучэнне"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2572,36 +2646,36 @@ msgstr ""
 "\n"
 "Памылка: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Выберыце файл для імпартавання"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:331
+#: panels/sharing/cc-sharing-panel.c:427
+#: panels/user-accounts/um-photo-dialog.c:231
 msgid "_Open"
 msgstr "_Адкрыць"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Файл з назвай \"%s\" ужо існуе."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Замяніць %s новым VPN-злучэннем?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Не ўдалося экспартаваць VPN-злучэнне"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2612,40 +2686,40 @@ msgstr ""
 "\n"
 "Памылка: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Экспартаваць VPN-злучэнне"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: panels/network/connection-editor/vpn-page.ui:58
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Памылка: не ўдалося загрузіць рэдактар VPN-злучэння)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
-msgid "My Home Network"
-msgstr "Мая дамашняя сетка"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
 msgstr "Сетка"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Настройка злучэння з сецівам"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-network-panel.desktop.in.in:7
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
+#. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/network/gnome-network-panel.desktop.in.in:19
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
@@ -2653,38 +2727,42 @@ msgstr ""
 "Сетка;Бесправадная сетка;Wi-Fi;Wifi;IP;LAN;Проксі;WAN;Шырокапалосны доступ;"
 "Мадэм;Bluetooth;vpn;DNS;"
 
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "Настройка злучэння з Wi-Fi сеткамі"
 
-#. Translators: those are keywords for the wi-fi control-center panel
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-wifi-panel.desktop.in.in:7
+msgid "network-wireless"
+msgstr "network-wireless"
+
+#. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: panels/network/gnome-wifi-panel.desktop.in.in:19
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgstr "Сетка;Бесправадная сетка;Wi-Fi;Wifi;IP;LAN;Шырокапалосны доступ;DNS;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:491
+#: panels/network/net-device-ethernet.c:107
+#: panels/network/net-device-wifi.c:553
 msgid "never"
 msgstr "ніколі"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:501
+#: panels/network/net-device-ethernet.c:117
+#: panels/network/net-device-wifi.c:563
 msgid "today"
 msgstr "сёння"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:503
+#: panels/network/net-device-ethernet.c:119
+#: panels/network/net-device-wifi.c:565
 msgid "yesterday"
 msgstr "учора"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
+#: panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP-адрас"
 
-#: ../panels/network/net-device-ethernet.c:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Апошняе выкарыстанне"
 
@@ -2693,30 +2771,28 @@ msgstr "Апошняе выкарыстанне"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:275
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:276
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Правадное злучэнне"
 
-#: ../panels/network/net-device-ethernet.c:343
-#: ../panels/network/net-device-wifi.c:1792
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
+#: panels/network/net-device-ethernet.c:344
+#: panels/network/net-device-wifi.c:1895 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 "Параметры..."
 
-#: ../panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Дадаць новае злучэнне"
 
-#: ../panels/network/net-device-wifi.c:1275
+#: panels/network/net-device-wifi.c:1368
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Уключэнне хотспота патрабуе адлучэння ад <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1279
+#: panels/network/net-device-wifi.c:1372
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2724,11 +2800,11 @@ msgstr ""
 "Вы не можаце атрымаць доступ да бесправаднога сеціва, пакуль уключаны "
 "хотспот."
 
-#: ../panels/network/net-device-wifi.c:1286
+#: panels/network/net-device-wifi.c:1379
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Уключыць Wi-Fi хотспот?"