Dušan Kazik · Piotr Drąg · Jwtiyar Nariman · Dušan Kazik · Ondrej Holy · Ondrej Holy
--- a/NEWS
+++ b/NEWS
+================
+Version 3.36.3
+================
+
+- Updated translations
+
+Users:
+- Show add user button also if no users found
+- Show permissions toolbar also if no users found
+
 ================
 Version 3.36.2
 ================

--- a/debian/changelog
+++ b/debian/changelog
-gnome-control-center (1:3.36.2-1ubuntu2) UNRELEASED; urgency=medium
+gnome-control-center (1:3.36.3-1ubuntu1) groovy; urgency=medium
+
+  * New upstream version rebased on Debian (lp: #1884063)

  [ Gunnar Hjalmarsson ]
  * debian/patches/0030-temporarily-revert-alt-char-key.patch:
@@ -9,7 +11,23 @@ gnome-control-center (1:3.36.2-1ubuntu2) UNRELEASED; urgency=medium
      https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/05f3cb67
      (LP: #1869288)

- -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Tue, 05 May 2020 00:24:00 +0200
+  [ Marco Trevisan (Treviño) ]
+  * d/p/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch:
+    - Ensure dock position is respected in RTL (LP: #1876937)
+    - Add proper matching the dock monitor ID (LP: #1877108)
+  * d/p/0024-display-Allow-fractional-scaling-to-be-enabled.patch:
+    - Improve fractional scaling toggling (LP: #1876891, #1876894)
+    - Look for proper fractional scaling key in Wayland and X11 (LP: #1871864)
+  * d/p/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch:
+    - Don't make flowbox children selectable (LP: #1877441)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 18 Jun 2020 13:44:56 +0200
+
+gnome-control-center (1:3.36.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 18 Jun 2020 13:38:15 +0200

 gnome-control-center (1:3.36.2-1ubuntu1) groovy; urgency=medium


--- a/debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch
+++ b/debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch
@@ -11,19 +11,19 @@ Origin: ubuntu
 Forwarded: not-needed
 ---
 panels/meson.build                             |   1 +
- panels/ubuntu/cc-ubuntu-panel.c                | 571 +++++++++++++++++++++++++
+ panels/ubuntu/cc-ubuntu-panel.c                | 704 +++++++++++++++++++++++++
 panels/ubuntu/cc-ubuntu-panel.h                |  35 ++
- panels/ubuntu/cc-ubuntu-panel.ui               | 392 +++++++++++++++++
+ panels/ubuntu/cc-ubuntu-panel.ui               | 393 ++++++++++++++
 panels/ubuntu/gnome-ubuntu-panel.desktop.in.in |  16 +
 panels/ubuntu/meson.build                      |  43 ++
- panels/ubuntu/theme-dark.svg                   | 174 ++++++++
- panels/ubuntu/theme-light.svg                  | 171 ++++++++
- panels/ubuntu/theme-standard.svg               | 171 ++++++++
+ panels/ubuntu/theme-dark.svg                   | 174 ++++++
+ panels/ubuntu/theme-light.svg                  | 171 ++++++
+ panels/ubuntu/theme-standard.svg               | 171 ++++++
 panels/ubuntu/ubuntu.gresource.xml             |   9 +
 po/POTFILES.in                                 |   3 +
 shell/cc-panel-list.c                          |   1 +
 shell/cc-panel-loader.c                        |   3 +
- 13 files changed, 1590 insertions(+)
+ 13 files changed, 1724 insertions(+)
 create mode 100644 panels/ubuntu/cc-ubuntu-panel.c
 create mode 100644 panels/ubuntu/cc-ubuntu-panel.h
 create mode 100644 panels/ubuntu/cc-ubuntu-panel.ui
@@ -48,10 +48,10 @@ index 2f4fdc5..81ae0b1 100644
   'user-accounts'
 diff --git a/panels/ubuntu/cc-ubuntu-panel.c b/panels/ubuntu/cc-ubuntu-panel.c
 new file mode 100644
-index 0000000..9fa67dd
+index 0000000..b0ac4b9
 --- /dev/null
 +++ b/panels/ubuntu/cc-ubuntu-panel.c
-@@ -0,0 +1,571 @@
+@@ -0,0 +1,704 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 +/*
 + * Copyright (C) 2017-2020 Canonical Ltd
@@ -120,7 +120,6 @@ index 0000000..9fa67dd
 +
 +  GSettings              *dock_settings;
 +  GSettings              *interface_settings;
-+  gint                    dock_placement_primary_index;
 +  CcDisplayConfigManager *display_config_manager;
 +  GDBusProxy             *shell_proxy;
 +};
@@ -128,6 +127,7 @@ index 0000000..9fa67dd
 +CC_PANEL_REGISTER (CcUbuntuPanel, cc_ubuntu_panel);
 +
 +static void monitor_labeler_hide (CcUbuntuPanel *self);
+static void update_dock_placement_combo_selection (CcUbuntuPanel *self);
 +
 +static void
 +cc_ubuntu_panel_dispose (GObject *object)
@@ -254,16 +254,81 @@ index 0000000..9fa67dd
 +  ensure_monitor_labels (self);
 +}
 +
+static GList *
+get_valid_monitors (CcUbuntuPanel   *self,
+                    CcDisplayConfig *config,
+                    gint            *n_monitors,
+                    gint            *primary_index)
+{
+  g_autoptr(CcDisplayConfig) current = NULL;
+  CcDisplayMonitor *primary_monitor;
+  GList *valid_monitors, *l;
+  gint n_valid_monitors;
+
+  if (config == NULL)
+    {
+      current = cc_display_config_manager_get_current (self->display_config_manager);
+      config = current;
+    }
+
+  primary_monitor = NULL;
+  valid_monitors = NULL;
+  n_valid_monitors = 0;
+
+  for (l = cc_display_config_get_monitors (config); l != NULL; l = l->next)
+    {
+      CcDisplayMonitor *monitor = l->data;
+
+      if (!cc_display_monitor_is_active (monitor))
+        continue;
+
+      /* The default monitors list uses reversed order, so prepend to
+       * set it back to mutter order */
+      valid_monitors = g_list_prepend (valid_monitors, monitor);
+
+      if (cc_display_monitor_is_primary (monitor))
+        primary_monitor = monitor;
+
+      n_valid_monitors++;
+    }
+
+  if (n_monitors)
+    *n_monitors = n_valid_monitors;
+
+  if (primary_index)
+    *primary_index = g_list_index (valid_monitors, primary_monitor);
+
+  return valid_monitors;
+}
+
+static int
+cc_monitor_id_to_dock (gint index,
+                       gint primary_monitor,
+                       gint n_monitors)
+{
+  if (index < 0)
+    return -1;
+
+  /* The The dock uses the Gdk index for monitors, where the primary monitor
+   * always has index 0, so let's follow what dash-to-dock does in docking.js
+   * (as part of _createDocks), but using inverted math */
+  index -= primary_monitor;
+
+  if (index < 0)
+    index += n_monitors;
+
+  return index;
+}
+
 +static void
 +on_screen_changed (CcUbuntuPanel *self)
 +{
 +  g_autoptr(CcDisplayConfig) current = NULL;
+  g_autoptr(GList) valid_outputs = NULL;
 +  GtkTreeIter ubuntu_dock_placement_iter;
-+  gboolean ubuntu_dock_on_all_monitors;
-+  gint ubuntu_dock_current_index;
 +  GList *outputs, *l;
 +  gint n_monitors;
-+  gint index;
+  gint primary_monitor;
 +  gboolean is_rtl;
 +
 +  if (self->display_config_manager == NULL)
@@ -273,26 +338,17 @@ index 0000000..9fa67dd
 +  if (current == NULL)
 +    return;
 +
-+  ubuntu_dock_on_all_monitors = g_settings_get_boolean (self->dock_settings, UBUNTU_DOCK_ALL_MONITORS_KEY);
-+  ubuntu_dock_current_index = g_settings_get_int (self->dock_settings, UBUNTU_DOCK_ON_MONITOR_KEY);
-+
 +  gtk_list_store_clear (self->dock_placement_liststore);
 +
 +  outputs = cc_display_config_get_ui_sorted_monitors (current);
+  valid_outputs = get_valid_monitors (self, current, &n_monitors, &primary_monitor);
 +  is_rtl = gtk_widget_get_state_flags (GTK_WIDGET (self->dock_placement_combo)) & GTK_STATE_FLAG_DIR_RTL;
 +
-+  for (l = outputs, n_monitors = 0; l != NULL; l = l->next)
-+    {
-+      CcDisplayMonitor *output = l->data;
-+
-+      if (cc_display_monitor_is_active (output))
-+        n_monitors++;
-+    }
-+
-+  for (l = outputs, index = 0; l != NULL && n_monitors > 0; l = l->next)
+  for (l = outputs; l != NULL && valid_outputs != NULL; l = l->next)
 +    {
 +      g_autofree char *monitor_label = NULL;
 +      CcDisplayMonitor *output = l->data;
+      int monitor_id;
 +
 +      if (!cc_display_monitor_is_active (output))
 +        continue;
@@ -321,30 +377,25 @@ index 0000000..9fa67dd
 +            monitor_label = g_strdup_printf ("%s .%d", old_label, monitor_number);
 +        }
 +
-+      gtk_list_store_append (self->dock_placement_liststore, &ubuntu_dock_placement_iter);
-+      gtk_list_store_set (self->dock_placement_liststore, &ubuntu_dock_placement_iter, 0, monitor_label, -1);
-+
-+      if (cc_display_monitor_is_primary (output))
-+        self->dock_placement_primary_index = index;
+      monitor_id = cc_monitor_id_to_dock (g_list_index (valid_outputs, output),
+                                          primary_monitor, n_monitors);
 +
-+      index++;
+      gtk_list_store_append (self->dock_placement_liststore, &ubuntu_dock_placement_iter);
+      gtk_list_store_set (self->dock_placement_liststore, &ubuntu_dock_placement_iter,
+                          0, monitor_label,
+                          1, monitor_id,
+                          -1);
 +    }
 +
-+  gtk_widget_set_visible (GTK_WIDGET (self->dock_monitor_row), n_monitors > 1);
+  gtk_widget_set_visible (GTK_WIDGET (self->dock_monitor_row), valid_outputs != NULL);
 +
 +  gtk_list_store_prepend (self->dock_placement_liststore, &ubuntu_dock_placement_iter);
-+  gtk_list_store_set (self->dock_placement_liststore, &ubuntu_dock_placement_iter, 0, _("All displays"), -1);
-+
-+  gint selection = 0;
-+  if (ubuntu_dock_on_all_monitors != TRUE)
-+    {
-+      if ((ubuntu_dock_current_index != -1) && (ubuntu_dock_current_index < g_list_length (outputs)))
-+        selection = ubuntu_dock_current_index + 1;
-+      else
-+        selection = self->dock_placement_primary_index + 1;
-+    }
-+  gtk_combo_box_set_active (self->dock_placement_combo, selection);
+  gtk_list_store_set (self->dock_placement_liststore, &ubuntu_dock_placement_iter,
+                      0, _("All displays"),
+                      1, -1,
+                      -1);
 +
+  update_dock_placement_combo_selection (self);
 +  ensure_monitor_labels (self);
 +}
 +
@@ -447,6 +498,7 @@ index 0000000..9fa67dd
 +on_dock_placement_combo_changed (CcUbuntuPanel *self)
 +{
 +  gint active;
+  gint monitor_id;
 +  gboolean ubuntu_dock_on_all_monitors;
 +  gint ubuntu_dock_current_index;
 +
@@ -466,33 +518,69 @@ index 0000000..9fa67dd
 +    }
 +  else
 +    {
+      GtkTreeIter placement_iter;
 +      g_autoptr(GSettings) delayed_settings = g_settings_new (UBUNTU_DOCK_SCHEMA);
-+      active--;
 +      g_settings_delay (delayed_settings);
+
 +      if (ubuntu_dock_on_all_monitors)
 +        g_settings_set_boolean (delayed_settings, UBUNTU_DOCK_ALL_MONITORS_KEY, FALSE);
-+      if (ubuntu_dock_current_index != active)
-+        {
-+          if (!(ubuntu_dock_current_index == -1 && (active == self->dock_placement_primary_index)))
-+            g_settings_set_int (delayed_settings, UBUNTU_DOCK_ON_MONITOR_KEY, active);
-+        }
+
+      gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->dock_placement_liststore),
+                                     &placement_iter, NULL, active);
+      gtk_tree_model_get (GTK_TREE_MODEL (self->dock_placement_liststore),
+                          &placement_iter,
+                          1, &monitor_id, -1);
+
+      if (ubuntu_dock_current_index != monitor_id)
+        g_settings_set_int (delayed_settings, UBUNTU_DOCK_ON_MONITOR_KEY, monitor_id);
+
 +      g_settings_apply (delayed_settings);
 +    }
 +}
 +
+static int
+get_dock_monitor (CcUbuntuPanel *self)
+{
+  g_autoptr(GList) monitors = NULL;
+  int index;
+  int n_monitors;
+  int primary_monitor;
+
+  monitors = get_valid_monitors (self, NULL, &n_monitors, &primary_monitor);
+  index = g_settings_get_int (self->dock_settings, UBUNTU_DOCK_ON_MONITOR_KEY);
+
+  if (index < 0 || index >= n_monitors)
+    return primary_monitor;
+
+  return index;
+}
+
 +static void
-+ext_ubuntu_dock_placement_changed_callback (CcUbuntuPanel *self)
+update_dock_placement_combo_selection (CcUbuntuPanel *self)
 +{
 +  int selection = 0;
 +
 +  if (g_settings_get_boolean (self->dock_settings, UBUNTU_DOCK_ALL_MONITORS_KEY) == FALSE)
 +    {
-+      selection = g_settings_get_int (self->dock_settings, UBUNTU_DOCK_ON_MONITOR_KEY);
-+      if (selection == -1)
-+        selection = self->dock_placement_primary_index;
-+      selection++; // offset in combox
-+    }
+      GtkTreeIter placement_iter;
+      int dock_monitor;
+      int monitor_id;
 +
+      dock_monitor = get_dock_monitor (self);
+      if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->dock_placement_liststore), &placement_iter))
+        {
+          do
+            {
+              gtk_tree_model_get (GTK_TREE_MODEL (self->dock_placement_liststore), &placement_iter,
+                                  1, &monitor_id, -1);
+              if (monitor_id == dock_monitor)
+                break;
+
+              selection++;
+            } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->dock_placement_liststore),
+                                               &placement_iter));
+        }
+    }
 +  gtk_combo_box_set_active (GTK_COMBO_BOX (self->dock_placement_combo), selection);
 +}
 +
@@ -540,6 +628,48 @@ index 0000000..9fa67dd
 +                           G_CONNECT_SWAPPED);
 +}
 +
+static const char *
+get_dock_position_for_direction (CcUbuntuPanel *self,
+                                 const char    *position)
+{
+  if (gtk_widget_get_state_flags (GTK_WIDGET (self)) & GTK_STATE_FLAG_DIR_RTL)
+    {
+      if (g_str_equal (position, "LEFT"))
+        position = "RIGHT";
+      else if (g_str_equal (position, "RIGHT"))
+        position = "LEFT";
+    }
+
+  return position;
+}
+
+static gboolean
+dock_position_get_mapping (GValue   *value,
+                           GVariant *variant,
+                           gpointer  user_data)
+{
+  CcUbuntuPanel *self = user_data;
+  const char *position;
+
+  position = g_variant_get_string (variant, NULL);
+  g_value_set_string (value, get_dock_position_for_direction (self, position));
+
+  return TRUE;
+}
+
+static GVariant *
+dock_position_set_mapping (const GValue       *value,
+                           const GVariantType *type,
+                           gpointer            user_data)
+{
+  CcUbuntuPanel *self = user_data;
+  const char *position;
+
+  position = g_value_get_string (value);
+
+  return g_variant_new_string (get_dock_position_for_direction (self, position));
+}
+
 +static void
 +cc_ubuntu_panel_init (CcUbuntuPanel *self)
 +{
@@ -570,12 +700,15 @@ index 0000000..9fa67dd
 +  g_signal_connect_object (self->dock_settings, "changed::" ICONSIZE_KEY,
 +                           G_CALLBACK (icon_size_widget_refresh), self, G_CONNECT_SWAPPED);
 +  g_signal_connect_object (self->dock_settings, "changed::" UBUNTU_DOCK_ALL_MONITORS_KEY,
-+                           G_CALLBACK (ext_ubuntu_dock_placement_changed_callback), self, G_CONNECT_SWAPPED);
+                           G_CALLBACK (update_dock_placement_combo_selection), self, G_CONNECT_SWAPPED);
 +  g_signal_connect_object (self->dock_settings, "changed::" UBUNTU_DOCK_ON_MONITOR_KEY,
-+                           G_CALLBACK (ext_ubuntu_dock_placement_changed_callback), self, G_CONNECT_SWAPPED);
-+  g_settings_bind (self->dock_settings, "dock-position",
-+                   self->dock_position_combo, "active-id",
-+                   G_SETTINGS_BIND_DEFAULT);
+                           G_CALLBACK (update_dock_placement_combo_selection), self, G_CONNECT_SWAPPED);
+  g_settings_bind_with_mapping (self->dock_settings, "dock-position",
+                                self->dock_position_combo, "active-id",
+                                G_SETTINGS_BIND_DEFAULT,
+                                dock_position_get_mapping,
+                                dock_position_set_mapping,
+                                self, NULL);
 +  g_settings_bind (self->dock_settings, "dock-fixed",
 +                   self->dock_autohide_switch, "active",
 +                   G_SETTINGS_BIND_INVERT_BOOLEAN);
@@ -666,10 +799,10 @@ index 0000000..b13f611
 +#endif /* _CC_EDIT_DIALOG_H_ */
 diff --git a/panels/ubuntu/cc-ubuntu-panel.ui b/panels/ubuntu/cc-ubuntu-panel.ui
 new file mode 100644
-index 0000000..fcea7d6
+index 0000000..239535c
 --- /dev/null
 +++ b/panels/ubuntu/cc-ubuntu-panel.ui
-@@ -0,0 +1,392 @@
+@@ -0,0 +1,393 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- Generated with glade 3.20.0 -->
 +<interface>
@@ -1059,6 +1192,7 @@ index 0000000..fcea7d6
 +    <columns>
 +      <!-- column-name label -->
 +      <column type="gchararray"/>
+      <column type="gint"/>
 +    </columns>
 +  </object>
 +</interface>

--- a/debian/patches/0024-display-Allow-fractional-scaling-to-be-enabled.patch
+++ b/debian/patches/0024-display-Allow-fractional-scaling-to-be-enabled.patch
-From 62a37267d3f96ea46979ef72e0cbb7aa6cd2c8fc Mon Sep 17 00:00:00 2001
 From: Robert Ancell <robert.ancell@canonical.com>
-Date: Sun, 15 Mar 2020 08:07:51 +0000
+Date: Sun, 15 Mar 2020 09:07:51 +0100
 Subject: [PATCH 24/26] display: Allow fractional scaling to be enabled

 ---
- panels/display/cc-display-settings.c  | 64 +++++++++++++++++++++++++++
- panels/display/cc-display-settings.ui | 16 +++++++
- 2 files changed, 80 insertions(+)
+ panels/display/cc-display-config.c    | 218 ++++++++++++++++++++++++++++++++++
+ panels/display/cc-display-config.h    |   4 +
+ panels/display/cc-display-settings.c  |  28 ++++-
+ panels/display/cc-display-settings.ui |  16 +++
+ 4 files changed, 265 insertions(+), 1 deletion(-)

-diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c
-index d793fccaa..c4b754334 100644
--- a/panels/display/cc-display-settings.c
-+++ b/panels/display/cc-display-settings.c
-@@ -29,6 +29,10 @@
- 
- #define MAX_SCALE_BUTTONS 5
+diff --git a/panels/display/cc-display-config.c b/panels/display/cc-display-config.c
+index 2a8907b..441960a 100644
+--- a/panels/display/cc-display-config.c
+++ b/panels/display/cc-display-config.c
+@@ -17,10 +17,23 @@
+  *
+  */
 
 +#define MUTTER_SCHEMA                     "org.gnome.mutter"
 +#define MUTTER_EXPERIMENTAL_FEATURES_KEY  "experimental-features"
-+#define MUTTER_FEATURE_FRACTIONAL_SCALING "x11-randr-fractional-scaling"
+#define MUTTER_FEATURE_FRACTIONAL_SCALING_X11 "x11-randr-fractional-scaling"
+#define MUTTER_FEATURE_FRACTIONAL_SCALING_WAYLAND "scale-monitor-framebuffer"
 +
- struct _CcDisplaySettings
- {
-   GtkDrawingArea    object;
-@@ -39,6 +43,7 @@ struct _CcDisplaySettings
-   gboolean          has_accelerometer;
-   CcDisplayConfig  *config;
-   CcDisplayMonitor *selected_output;
-+  GSettings        *mutter_settings;
- 
-   GListStore       *orientation_list;
-   GListStore       *refresh_rate_list;
-@@ -49,6 +54,8 @@ struct _CcDisplaySettings
-   GtkWidget        *resolution_row;
-   GtkWidget        *scale_bbox;
-   GtkWidget        *scale_row;
-+  GtkWidget        *scale_fractional_row;
-+  GtkWidget        *scale_fractional_switch;
-   GtkWidget        *underscanning_row;
-   GtkWidget        *underscanning_switch;
+#include <gdk/gdk.h>
+ #include <gio/gio.h>
+ #include <math.h>
+ #include "cc-display-config.h"
+ 
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+ static const double known_diagonals[] = {
+   12.1,
+   13.3,
+@@ -419,6 +432,10 @@ cc_display_monitor_set_ui_info (CcDisplayMonitor *self, gint ui_number, gchar *u
+ 
+ struct _CcDisplayConfigPrivate {
+   GList *ui_sorted_monitors;
+
+  GSettings *mutter_settings;
+  gboolean fractional_scaling;
+  gboolean fractional_scaling_pending_disable;
 };
-@@ -72,6 +79,48 @@ static void on_scale_btn_active_changed_cb (GtkWidget         *widget,
-                                             CcDisplaySettings *self);
+ typedef struct _CcDisplayConfigPrivate CcDisplayConfigPrivate;
 
+@@ -426,12 +443,80 @@ G_DEFINE_TYPE_WITH_PRIVATE (CcDisplayConfig,
+                             cc_display_config,
+                             G_TYPE_OBJECT)
 
+static const char *
+get_fractional_scaling_key (void)
+{
+  GdkDisplay *display;
+
+  display = gdk_display_get_default ();
+
+#if defined(GDK_WINDOWING_X11)
+  if (GDK_IS_X11_DISPLAY (display))
+    return MUTTER_FEATURE_FRACTIONAL_SCALING_X11;
+#endif /* GDK_WINDOWING_X11 */
+#if defined(GDK_WINDOWING_WAYLAND)
+  if (GDK_IS_WAYLAND_DISPLAY (display))
+    return MUTTER_FEATURE_FRACTIONAL_SCALING_WAYLAND;
+#endif /* GDK_WINDOWING_WAYLAND */
+  g_return_val_if_reached (NULL);
+}
+
 +static gboolean
-+get_fractional_scaling_active (GValue *value, GVariant *variant, gpointer user_data)
+get_fractional_scaling_active (CcDisplayConfig *self)
 +{
-+  g_autofree const gchar **features = NULL;
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+  g_auto(GStrv) features = NULL;
+  const char *key = get_fractional_scaling_key ();
 +
-+  features = g_variant_get_strv (variant, NULL);
-+  g_value_set_boolean (value, g_strv_contains (features, MUTTER_FEATURE_FRACTIONAL_SCALING));
-+  return TRUE;
+  g_return_val_if_fail (key, FALSE);
+
+  features = g_settings_get_strv (priv->mutter_settings, MUTTER_EXPERIMENTAL_FEATURES_KEY);
+  return g_strv_contains ((const gchar **) features, key);
 +}
 +
-+static GVariant *
-+set_fractional_scaling_active (const GValue *value, const GVariantType *expected_type, gpointer user_data)
+static void
+set_fractional_scaling_active (CcDisplayConfig *self,
+                               gboolean         enable)
 +{
-+  CcDisplaySettings *self = user_data;
-+  gboolean enable;
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
 +  g_auto(GStrv) existing_features = NULL;
 +  gboolean have_fractional_scaling = FALSE;
 +  g_autoptr(GVariantBuilder) builder = NULL;
-+
-+  enable = g_value_get_boolean (value);
+  const char *key = get_fractional_scaling_key ();
 +
 +  /* Add or remove the fractional scaling feature from mutter */
-+  existing_features = g_settings_get_strv (self->mutter_settings, MUTTER_EXPERIMENTAL_FEATURES_KEY);
+  existing_features = g_settings_get_strv (priv->mutter_settings,
+                                           MUTTER_EXPERIMENTAL_FEATURES_KEY);
 +  builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 +  for (int i = 0; existing_features[i] != NULL; i++)
 +    {
-+      if (strcmp (existing_features[i], MUTTER_FEATURE_FRACTIONAL_SCALING) == 0)
+      if (g_strcmp0 (existing_features[i], key) == 0)
 +        {
 +          if (enable)
 +            have_fractional_scaling = TRUE;
@@ -80,16 +109,245 @@ index d793fccaa..c4b754334 100644
 +
 +      g_variant_builder_add (builder, "s", existing_features[i]);
 +    }
-+  if (enable && !have_fractional_scaling)
-+    g_variant_builder_add (builder, "s", MUTTER_FEATURE_FRACTIONAL_SCALING);
+  if (enable && !have_fractional_scaling && key)
+    g_variant_builder_add (builder, "s", key);
 +
-+  return g_variant_builder_end (builder);
+  g_settings_set_value (priv->mutter_settings, MUTTER_EXPERIMENTAL_FEATURES_KEY,
+                        g_variant_builder_end (builder));
 +}
 +
+ static void
+ cc_display_config_init (CcDisplayConfig *self)
+ {
+   CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+ 
+   priv->ui_sorted_monitors = NULL;
+
+  /* No need to connect to the setting, as we'll get notified by mutter */
+  priv->mutter_settings = g_settings_new (MUTTER_SCHEMA);
+  priv->fractional_scaling = get_fractional_scaling_active (self);
+ }
+ 
+ static void
+@@ -472,6 +557,7 @@ cc_display_config_finalize (GObject *object)
+   CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+ 
+   g_list_free (priv->ui_sorted_monitors);
+  g_clear_object (&priv->mutter_settings);
+ 
+   G_OBJECT_CLASS (cc_display_config_parent_class)->finalize (object);
+ }
+@@ -557,9 +643,16 @@ gboolean
+ cc_display_config_equal (CcDisplayConfig *self,
+                          CcDisplayConfig *other)
+ {
+  CcDisplayConfigPrivate *spriv = cc_display_config_get_instance_private (self);
+  CcDisplayConfigPrivate *opriv = cc_display_config_get_instance_private (other);
+
+   g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (self), FALSE);
+   g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (other), FALSE);
+ 
+  if (spriv->fractional_scaling_pending_disable !=
+      opriv->fractional_scaling_pending_disable)
+    return FALSE;
+
+   return CC_DISPLAY_CONFIG_GET_CLASS (self)->equal (self, other);
+ }
+ 
+@@ -567,6 +660,8 @@ gboolean
+ cc_display_config_apply (CcDisplayConfig *self,
+                          GError **error)
+ {
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+
+   if (!CC_IS_DISPLAY_CONFIG (self))
+     {
+       g_warning ("Cannot apply invalid configuration");
+@@ -577,6 +672,12 @@ cc_display_config_apply (CcDisplayConfig *self,
+       return FALSE;
+     }
+ 
+  if (priv->fractional_scaling_pending_disable)
+    {
+      set_fractional_scaling_active (self, FALSE);
+      priv->fractional_scaling_pending_disable = FALSE;
+    }
+
+   return CC_DISPLAY_CONFIG_GET_CLASS (self)->apply (self, error);
+ }
+ 
+@@ -618,13 +719,25 @@ cc_display_config_set_minimum_size (CcDisplayConfig *self,
+   CC_DISPLAY_CONFIG_GET_CLASS (self)->set_minimum_size (self, width, height);
+ }
+ 
+static gboolean
+scale_value_is_fractional (double scale)
+{
+  return (int) scale != scale;
+}
+
+ gboolean
+ cc_display_config_is_scaled_mode_valid (CcDisplayConfig *self,
+                                         CcDisplayMode   *mode,
+                                         double           scale)
+ {
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+
+   g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (self), FALSE);
+   g_return_val_if_fail (CC_IS_DISPLAY_MODE (mode), FALSE);
+
+  if (priv->fractional_scaling_pending_disable && scale_value_is_fractional (scale))
+    return FALSE;
+
+   return CC_DISPLAY_CONFIG_GET_CLASS (self)->is_scaled_mode_valid (self, mode, scale);
+ }
+ 
+@@ -633,3 +746,108 @@ cc_display_config_layout_use_ui_scale (CcDisplayConfig *self)
+ {
+   return CC_DISPLAY_CONFIG_GET_CLASS (self)->layout_use_ui_scale (self);
+ }
+
+static gboolean
+set_monitors_scaling_to_preferred_integers (CcDisplayConfig *self)
+{
+  GList *l;
+  gboolean any_changed = FALSE;
+
+  for (l = cc_display_config_get_monitors (self); l; l = l->next)
+    {
+      CcDisplayMonitor *monitor = l->data;
+      gdouble monitor_scale = cc_display_monitor_get_scale (monitor);
+
+      if (scale_value_is_fractional (monitor_scale))
+        {
+          CcDisplayMode *preferred_mode;
+          double preferred_scale;
+          double *saved_scale;
+
+          preferred_mode = cc_display_monitor_get_preferred_mode (monitor);
+          preferred_scale = cc_display_mode_get_preferred_scale (preferred_mode);
+          cc_display_monitor_set_scale (monitor, preferred_scale);
+          any_changed = TRUE;
+
+          saved_scale = g_new (double, 1);
+          *saved_scale = monitor_scale;
+          g_object_set_data_full (G_OBJECT (monitor),
+                                  "previous-fractional-scale",
+                                  saved_scale, g_free);
+        }
+      else
+        {
+          g_signal_emit_by_name (monitor, "scale");
+        }
+    }
+
+  return any_changed;
+}
+
+static void
+reset_monitors_scaling_to_selected_values (CcDisplayConfig *self)
+{
+  GList *l;
+
+  for (l = cc_display_config_get_monitors (self); l; l = l->next)
+    {
+      CcDisplayMonitor *monitor = l->data;
+      gdouble *saved_scale;
+
+      saved_scale = g_object_get_data (G_OBJECT (monitor),
+                                       "previous-fractional-scale");
+
+      if (saved_scale)
+        {
+          cc_display_monitor_set_scale (monitor, *saved_scale);
+          g_object_set_data (G_OBJECT (monitor), "previous-fractional-scale", NULL);
+        }
+      else
+        {
+          g_signal_emit_by_name (monitor, "scale");
+        }
+    }
+}
+
+void
+cc_display_config_set_fractional_scaling (CcDisplayConfig *self,
+                                          gboolean         enabled)
+{
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+
+  if (priv->fractional_scaling == enabled)
+    return;
+
+  priv->fractional_scaling = enabled;
+
+  if (priv->fractional_scaling)
+    {
+      if (priv->fractional_scaling_pending_disable)
+        {
+          priv->fractional_scaling_pending_disable = FALSE;
+          reset_monitors_scaling_to_selected_values (self);
+        }
+
+      if (!get_fractional_scaling_active (self))
+        set_fractional_scaling_active (self, enabled);
+    }
+  else
+    {
+      priv->fractional_scaling_pending_disable = TRUE;
+
+      if (!set_monitors_scaling_to_preferred_integers (self))
+        {
+          priv->fractional_scaling_pending_disable = FALSE;
+          reset_monitors_scaling_to_selected_values (self);
+          set_fractional_scaling_active (self, enabled);
+        }
+    }
+}
+
+gboolean
+cc_display_config_get_fractional_scaling (CcDisplayConfig *self)
+{
+  CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self);
+
+  return priv->fractional_scaling;
+}
+diff --git a/panels/display/cc-display-config.h b/panels/display/cc-display-config.h
+index 2f246ff..65719c8 100644
+--- a/panels/display/cc-display-config.h
+++ b/panels/display/cc-display-config.h
+@@ -189,6 +189,10 @@ gboolean          cc_display_config_is_scaled_mode_valid    (CcDisplayConfig
+                                                              double              scale);
+ gboolean          cc_display_config_layout_use_ui_scale     (CcDisplayConfig    *self);
+ 
+void              cc_display_config_set_fractional_scaling  (CcDisplayConfig    *self,
+                                                             gboolean            enabled);
+gboolean          cc_display_config_get_fractional_scaling  (CcDisplayConfig    *self);
+
+ const char*       cc_display_monitor_get_display_name       (CcDisplayMonitor   *monitor);
+ gboolean          cc_display_monitor_is_active              (CcDisplayMonitor   *monitor);
+ void              cc_display_monitor_set_active             (CcDisplayMonitor   *monitor,
+diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c
+index d793fcc..947335a 100644
+--- a/panels/display/cc-display-settings.c
+++ b/panels/display/cc-display-settings.c
+@@ -49,6 +49,8 @@ struct _CcDisplaySettings
+   GtkWidget        *resolution_row;
+   GtkWidget        *scale_bbox;
+   GtkWidget        *scale_row;
+  GtkWidget        *scale_fractional_row;
+  GtkWidget        *scale_fractional_switch;
+   GtkWidget        *underscanning_row;
+   GtkWidget        *underscanning_switch;
+ };
+@@ -71,7 +73,6 @@ static void on_scale_btn_active_changed_cb (GtkWidget         *widget,
+                                             GParamSpec        *pspec,
+                                             CcDisplaySettings *self);
+ 
+-
 static gboolean
 should_show_rotation (CcDisplaySettings *self)
 {
-@@ -242,6 +291,7 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
+@@ -242,6 +243,7 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
       gtk_widget_set_visible (self->refresh_rate_row, FALSE);
       gtk_widget_set_visible (self->resolution_row, FALSE);
       gtk_widget_set_visible (self->scale_row, FALSE);
@@ -97,24 +355,18 @@ index d793fccaa..c4b754334 100644
       gtk_widget_set_visible (self->underscanning_row, FALSE);
 
       return G_SOURCE_REMOVE;
-@@ -429,6 +479,8 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
+@@ -429,6 +431,10 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
 
   gtk_widget_set_visible (self->scale_row, buttons > 1);
 
 +  gtk_widget_set_visible (self->scale_fractional_row, TRUE);
+  gtk_switch_set_active (GTK_SWITCH (self->scale_fractional_switch),
+                         cc_display_config_get_fractional_scaling (self->config));
 +
   gtk_widget_set_visible (self->underscanning_row,
                           cc_display_monitor_supports_underscanning (self->selected_output) &&
                           !cc_display_config_is_cloning (self->config));
-@@ -614,6 +666,7 @@ cc_display_settings_finalize (GObject *object)
-   CcDisplaySettings *self = CC_DISPLAY_SETTINGS (object);
- 
-   g_clear_object (&self->config);
-+  g_clear_object (&self->mutter_settings);
- 
-   g_clear_object (&self->orientation_list);
-   g_clear_object (&self->refresh_rate_list);
-@@ -671,6 +724,8 @@ cc_display_settings_class_init (CcDisplaySettingsClass *klass)
+@@ -671,6 +677,8 @@ cc_display_settings_class_init (CcDisplaySettingsClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, resolution_row);
   gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_bbox);
   gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_row);
@@ -123,24 +375,38 @@ index d793fccaa..c4b754334 100644
   gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, underscanning_row);
   gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, underscanning_switch);
 
-@@ -685,6 +740,15 @@ cc_display_settings_init (CcDisplaySettings *self)
+@@ -680,11 +688,29 @@ cc_display_settings_class_init (CcDisplaySettingsClass *klass)
+   gtk_widget_class_bind_template_callback (widget_class, on_underscanning_switch_active_changed_cb);
+ }
+ 
+static void
+on_scale_fractional_toggled (CcDisplaySettings *self)
+{
+  gboolean active;
+
+  active = gtk_switch_get_active (GTK_SWITCH (self->scale_fractional_switch));
+
+  if (self->config)
+    cc_display_config_set_fractional_scaling (self->config, active);
+
+  g_signal_emit_by_name (G_OBJECT (self), "updated", self->selected_output);
+}
+
+ static void
+ cc_display_settings_init (CcDisplaySettings *self)
 {
   gtk_widget_init_template (GTK_WIDGET (self));
 
-+  self->mutter_settings = g_settings_new (MUTTER_SCHEMA);
-+  g_settings_bind_with_mapping (self->mutter_settings, MUTTER_EXPERIMENTAL_FEATURES_KEY,
-+                                self->scale_fractional_switch, "active",
-+                                G_SETTINGS_BIND_DEFAULT,
-+                                get_fractional_scaling_active,
-+                                set_fractional_scaling_active,
-+                                self,
-+                                NULL);
+  g_signal_connect_object (self->scale_fractional_switch,
+                           "notify::active",
+                           G_CALLBACK (on_scale_fractional_toggled),
+                           self, G_CONNECT_SWAPPED);
 +
   gtk_list_box_set_header_func (GTK_LIST_BOX (self),
                                 cc_list_box_update_header_func,
                                 NULL, NULL);
 diff --git a/panels/display/cc-display-settings.ui b/panels/display/cc-display-settings.ui
-index 50ef951b4..cf8ca0af9 100644
+index 50ef951..cf8ca0a 100644
 --- a/panels/display/cc-display-settings.ui
 +++ b/panels/display/cc-display-settings.ui
 @@ -68,5 +68,21 @@
@@ -165,6 +431,3 @@ index 50ef951b4..cf8ca0af9 100644
 +    </child>
   </template>
 </interface>
-- 
-2.25.1
-
--- a/debian/patches/0028-user-panel-Add-reference-to-selected-user-and-clear-.patch
+++ b/debian/patches/0028-user-panel-Add-reference-to-selected-user-and-clear-.patch
@@ -12,11 +12,11 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/
 panels/user-accounts/cc-user-panel.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
-index 92d7988..7cd3413 100644
--- a/panels/user-accounts/cc-user-panel.c
-+++ b/panels/user-accounts/cc-user-panel.c
-@@ -174,10 +174,9 @@ set_selected_user (CcUserPanel *self, CcCarouselItem *item)
+Index: gnome-control-center-3.36.3/panels/user-accounts/cc-user-panel.c
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/user-accounts/cc-user-panel.c
+++ gnome-control-center-3.36.3/panels/user-accounts/cc-user-panel.c
+@@ -174,10 +174,9 @@ set_selected_user (CcUserPanel *self, Cc
 {
         uid_t uid;
 
@@ -29,7 +29,7 @@ index 92d7988..7cd3413 100644
 
         if (self->selected_user != NULL) {
                 show_user (self->selected_user, self);
-@@ -1481,6 +1480,8 @@ cc_user_panel_dispose (GObject *object)
+@@ -1480,6 +1479,8 @@ cc_user_panel_dispose (GObject *object)
 {
         CcUserPanel *self = CC_USER_PANEL (object);
 

--- a/debian/patches/0029-user-panel-Don-t-wait-for-fprintd-on-initialization.patch
+++ b/debian/patches/0029-user-panel-Don-t-wait-for-fprintd-on-initialization.patch
@@ -21,10 +21,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/
 panels/user-accounts/um-fingerprint-dialog.h |  12 +-
 3 files changed, 173 insertions(+), 53 deletions(-)

-diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
-index 7cd3413..18b70e9 100644
--- a/panels/user-accounts/cc-user-panel.c
-+++ b/panels/user-accounts/cc-user-panel.c
+Index: gnome-control-center-3.36.3/panels/user-accounts/cc-user-panel.c
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/user-accounts/cc-user-panel.c
+++ gnome-control-center-3.36.3/panels/user-accounts/cc-user-panel.c
 @@ -103,6 +103,9 @@ struct _CcUserPanel {
 
         CcAvatarChooser *avatar_chooser;
@@ -35,7 +35,7 @@ index 7cd3413..18b70e9 100644
         gint other_accounts;
 };
 
-@@ -851,9 +854,26 @@ show_user (ActUser *user, CcUserPanel *self)
+@@ -851,9 +854,26 @@ show_user (ActUser *user, CcUserPanel *s
         show = (act_user_get_uid (user) == getuid() &&
                 act_user_is_local_account (user) &&
                 (self->login_screen_settings &&
@@ -83,7 +83,7 @@ index 7cd3413..18b70e9 100644
 }
 
 static void
-@@ -1461,6 +1490,7 @@ cc_user_panel_init (CcUserPanel *self)
+@@ -1460,6 +1489,7 @@ cc_user_panel_init (CcUserPanel *self)
         gtk_widget_init_template (GTK_WIDGET (self));
 
         self->um = act_user_manager_get_default ();
@@ -91,7 +91,7 @@ index 7cd3413..18b70e9 100644
 
         provider = gtk_css_provider_new ();
         gtk_css_provider_load_from_resource (provider, "/org/gnome/control-center/user-accounts/user-accounts-dialog.css");
-@@ -1484,6 +1514,9 @@ cc_user_panel_dispose (GObject *object)
+@@ -1483,6 +1513,9 @@ cc_user_panel_dispose (GObject *object)
 
         g_clear_object (&self->login_screen_settings);
 
@@ -101,10 +101,10 @@ index 7cd3413..18b70e9 100644
         g_clear_pointer ((GtkWidget **)&self->language_chooser, gtk_widget_destroy);
         g_clear_object (&self->permission);
         G_OBJECT_CLASS (cc_user_panel_parent_class)->dispose (object);
-diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c
-index ccbec54..d27aa3b 100644
--- a/panels/user-accounts/um-fingerprint-dialog.c
-+++ b/panels/user-accounts/um-fingerprint-dialog.c
+Index: gnome-control-center-3.36.3/panels/user-accounts/um-fingerprint-dialog.c
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/user-accounts/um-fingerprint-dialog.c
+++ gnome-control-center-3.36.3/panels/user-accounts/um-fingerprint-dialog.c
 @@ -45,12 +45,14 @@ enum {
 };
 
@@ -278,7 +278,7 @@ index ccbec54..d27aa3b 100644
                 }
         }
 
-@@ -206,12 +265,13 @@ set_fingerprint_label (GtkLabel *state_label)
+@@ -206,12 +265,13 @@ set_fingerprint_label (GtkLabel *state_l
         else
                 fingers = NULL;
 
@@ -296,7 +296,7 @@ index ccbec54..d27aa3b 100644
         }
 
         if (result != NULL)
-@@ -219,25 +279,35 @@ set_fingerprint_label (GtkLabel *state_label)
+@@ -219,25 +279,35 @@ set_fingerprint_label (GtkLabel *state_l
         if (fingers != NULL)
                 g_variant_iter_free (fingers);
         g_object_unref (device);
@@ -352,7 +352,7 @@ index ccbec54..d27aa3b 100644
 {
         GtkWidget *question;
         GtkWidget *button;
-@@ -270,8 +342,8 @@ delete_fingerprints_question (GtkWindow *parent,
+@@ -270,8 +342,8 @@ delete_fingerprints_question (GtkWindow
         gtk_dialog_set_default_response (GTK_DIALOG (question), GTK_RESPONSE_OK);
 
         if (gtk_dialog_run (GTK_DIALOG (question)) == GTK_RESPONSE_OK) {
@@ -371,7 +371,7 @@ index ccbec54..d27aa3b 100644
                 gtk_widget_destroy (data->ass);
 
                 g_free (data);
-@@ -413,10 +486,12 @@ finger_combobox_changed (GtkComboBox *combobox, EnrollData *data)
+@@ -413,10 +486,12 @@ finger_combobox_changed (GtkComboBox *co
 static void
 assistant_cancelled (GtkAssistant *ass, EnrollData *data)
 {
@@ -385,7 +385,7 @@ index ccbec54..d27aa3b 100644
 }
 
 static void
-@@ -605,9 +680,11 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
+@@ -605,9 +680,11 @@ assistant_prepare (GtkAssistant *ass, Gt
 }
 
 static void
@@ -457,10 +457,10 @@ index ccbec54..d27aa3b 100644
         }
 }
 
-diff --git a/panels/user-accounts/um-fingerprint-dialog.h b/panels/user-accounts/um-fingerprint-dialog.h
-index a1f6afc..09dbf51 100644
--- a/panels/user-accounts/um-fingerprint-dialog.h
-+++ b/panels/user-accounts/um-fingerprint-dialog.h
+Index: gnome-control-center-3.36.3/panels/user-accounts/um-fingerprint-dialog.h
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/user-accounts/um-fingerprint-dialog.h
+++ gnome-control-center-3.36.3/panels/user-accounts/um-fingerprint-dialog.h
 @@ -20,7 +20,11 @@
 #include <gtk/gtk.h>
 #include <act/act.h>

--- a/debian/patches/0030-temporarily-revert-alt-char-key.patch
+++ b/debian/patches/0030-temporarily-revert-alt-char-key.patch
@@ -12,9 +12,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/1867548
 Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/918
 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>

-diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.c b/panels/keyboard/cc-alt-chars-key-dialog.c
--- a/panels/keyboard/cc-alt-chars-key-dialog.c	2020-04-12 06:11:37.445159800 +0200
-+++ b/panels/keyboard/cc-alt-chars-key-dialog.c	1970-01-01 01:00:00.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/cc-alt-chars-key-dialog.c
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/cc-alt-chars-key-dialog.c
+++ /dev/null
 @@ -1,211 +0,0 @@
 -/* cc-alt-chars-key-dialog.c
 - *
@@ -227,9 +228,10 @@ diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.c b/panels/keyboard/cc-alt-c
 -
 -  return self;
 -}
-diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.h b/panels/keyboard/cc-alt-chars-key-dialog.h
--- a/panels/keyboard/cc-alt-chars-key-dialog.h	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/cc-alt-chars-key-dialog.h	1970-01-01 01:00:00.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/cc-alt-chars-key-dialog.h
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/cc-alt-chars-key-dialog.h
+++ /dev/null
 @@ -1,32 +0,0 @@
 -/* cc-alt-chars-key-dialog.h
 - *
@@ -263,9 +265,10 @@ diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.h b/panels/keyboard/cc-alt-c
 -CcAltCharsKeyDialog *cc_alt_chars_key_dialog_new (GSettings *input_settings);
 -
 -G_END_DECLS
-diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.ui b/panels/keyboard/cc-alt-chars-key-dialog.ui
--- a/panels/keyboard/cc-alt-chars-key-dialog.ui	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/cc-alt-chars-key-dialog.ui	1970-01-01 01:00:00.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/cc-alt-chars-key-dialog.ui
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/cc-alt-chars-key-dialog.ui
+++ /dev/null
 @@ -1,155 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<interface>
@@ -422,9 +425,10 @@ diff -Nru a/panels/keyboard/cc-alt-chars-key-dialog.ui b/panels/keyboard/cc-alt-
 -    </child>
 -  </template>
 -</interface>
-diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-panel.c
--- a/panels/keyboard/cc-keyboard-panel.c	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/cc-keyboard-panel.c	2019-11-11 04:19:41.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/cc-keyboard-panel.c
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/cc-keyboard-panel.c
+++ gnome-control-center-3.36.3/panels/keyboard/cc-keyboard-panel.c
 @@ -22,7 +22,6 @@
 
 #include <glib/gi18n.h>
@@ -433,7 +437,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
 #include "cc-keyboard-item.h"
 #include "cc-keyboard-manager.h"
 #include "cc-keyboard-option.h"
-@@ -59,11 +58,6 @@
+@@ -59,11 +58,6 @@ struct _CcKeyboardPanel
   GtkListBoxRow      *add_shortcut_row;
   GtkSizeGroup       *accelerator_sizegroup;
 
@@ -445,7 +449,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
   /* Custom shortcut dialog */
   GtkWidget          *shortcut_editor;
 
-@@ -84,21 +78,6 @@
+@@ -84,21 +78,6 @@ static const gchar* custom_css =
 "    padding: 0;"
 "}";
 
@@ -467,7 +471,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
 /* RowData functions */
 static RowData *
 row_data_new (CcKeyboardItem *item,
-@@ -286,7 +265,7 @@
+@@ -286,7 +265,7 @@ add_item (CcKeyboardPanel *self,
                                "binding",
                                label,
                               "label",
@@ -476,7 +480,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
                                transform_binding_to_accel,
                                NULL, NULL, NULL);
 
-@@ -621,55 +600,6 @@
+@@ -621,55 +600,6 @@ shortcut_row_activated (GtkWidget
 }
 
 static void
@@ -532,7 +536,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
 cc_keyboard_panel_set_property (GObject      *object,
                                guint         property_id,
                                const GValue *value,
-@@ -699,7 +629,6 @@
+@@ -699,7 +629,6 @@ cc_keyboard_panel_finalize (GObject *obj
 
   g_clear_pointer (&self->pictures_regex, g_regex_unref);
   g_clear_object (&self->accelerator_sizegroup);
@@ -540,7 +544,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
 
   cc_keyboard_option_clear_all ();
 
-@@ -760,11 +689,9 @@
+@@ -760,11 +689,9 @@ cc_keyboard_panel_class_init (CcKeyboard
   gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, search_button);
   gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, search_entry);
   gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, shortcuts_listbox);
@@ -552,7 +556,7 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
 }
 
 static void
-@@ -786,20 +713,6 @@
+@@ -786,20 +713,6 @@ cc_keyboard_panel_init (CcKeyboardPanel
 
   g_object_unref (provider);
 
@@ -573,9 +577,10 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-pa
   /* Shortcut manager */
   self->manager = cc_keyboard_manager_new ();
 
-diff -Nru a/panels/keyboard/cc-keyboard-panel.ui b/panels/keyboard/cc-keyboard-panel.ui
--- a/panels/keyboard/cc-keyboard-panel.ui	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/cc-keyboard-panel.ui	2019-11-11 04:19:41.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/cc-keyboard-panel.ui
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/cc-keyboard-panel.ui
+++ gnome-control-center-3.36.3/panels/keyboard/cc-keyboard-panel.ui
 @@ -58,37 +58,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -614,9 +619,10 @@ diff -Nru a/panels/keyboard/cc-keyboard-panel.ui b/panels/keyboard/cc-keyboard-p
                       <object class="GtkListBox" id="shortcuts_listbox">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-diff -Nru a/panels/keyboard/keyboard.gresource.xml b/panels/keyboard/keyboard.gresource.xml
--- a/panels/keyboard/keyboard.gresource.xml	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/keyboard.gresource.xml	2019-11-11 04:19:41.000000000 +0100
+Index: gnome-control-center-3.36.3/panels/keyboard/keyboard.gresource.xml
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/keyboard.gresource.xml
+++ gnome-control-center-3.36.3/panels/keyboard/keyboard.gresource.xml
 @@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/control-center/keyboard">
@@ -625,10 +631,11 @@ diff -Nru a/panels/keyboard/keyboard.gresource.xml b/panels/keyboard/keyboard.gr
     <file preprocess="xml-stripblanks">cc-keyboard-panel.ui</file>
     <file preprocess="xml-stripblanks">cc-keyboard-shortcut-editor.ui</file>
   </gresource>
-diff -Nru a/panels/keyboard/meson.build b/panels/keyboard/meson.build
--- a/panels/keyboard/meson.build	2019-11-11 04:19:50.000000000 +0100
-+++ b/panels/keyboard/meson.build	2019-11-11 04:19:41.000000000 +0100
-@@ -56,7 +56,6 @@
+Index: gnome-control-center-3.36.3/panels/keyboard/meson.build
+===================================================================
+--- gnome-control-center-3.36.3.orig/panels/keyboard/meson.build
+++ gnome-control-center-3.36.3/panels/keyboard/meson.build
+@@ -56,7 +56,6 @@ foreach file: xml_files
 endforeach
 
 sources = files(
@@ -636,10 +643,11 @@ diff -Nru a/panels/keyboard/meson.build b/panels/keyboard/meson.build
   'cc-keyboard-panel.c',
   'cc-keyboard-item.c',
   'cc-keyboard-manager.c',
-diff -ru a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -59,7 +59,6 @@
+Index: gnome-control-center-3.36.3/po/POTFILES.in
+===================================================================
+--- gnome-control-center-3.36.3.orig/po/POTFILES.in
+++ gnome-control-center-3.36.3/po/POTFILES.in
+@@ -60,7 +60,6 @@ panels/keyboard/01-launchers.xml.in
 panels/keyboard/01-screenshot.xml.in
 panels/keyboard/01-system.xml.in
 panels/keyboard/50-accessibility.xml.in

--- a/debian/patches/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch
+++ b/debian/patches/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch
@@ -9,15 +9,15 @@ using a flowbox
 Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/727
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1865845
 ---
- panels/user-accounts/data/account-fingerprint.ui | 123 ++---------------------
- panels/user-accounts/um-fingerprint-dialog.c     |  45 +++++----
- 2 files changed, 35 insertions(+), 133 deletions(-)
+ panels/user-accounts/data/account-fingerprint.ui | 124 ++---------------------
+ panels/user-accounts/um-fingerprint-dialog.c     |  48 +++++----
+ 2 files changed, 39 insertions(+), 133 deletions(-)

 diff --git a/panels/user-accounts/data/account-fingerprint.ui b/panels/user-accounts/data/account-fingerprint.ui
-index 969f7ca..02ae182 100644
+index 969f7ca..1756877 100644
 --- a/panels/user-accounts/data/account-fingerprint.ui
 +++ b/panels/user-accounts/data/account-fingerprint.ui
-@@ -182,60 +182,19 @@
+@@ -182,60 +182,20 @@
           </packing>
         </child>
         <child>
@@ -85,10 +85,11 @@ index 969f7ca..02ae182 100644
 +            <property name="max-children-per-line">5</property>
 +            <property name="selection-mode">none</property>
 +            <property name="focus-on-click">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
-@@ -243,68 +202,6 @@
+@@ -243,68 +203,6 @@
             <property name="position">1</property>
           </packing>
         </child>
@@ -158,7 +159,7 @@ index 969f7ca..02ae182 100644
           <object class="GtkLabel" id="status-label">
             <property name="visible">True</property>
 diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c
-index 5ae8f27..05a809c 100644
+index 5ae8f27..bc90c83 100644
 --- a/panels/user-accounts/um-fingerprint-dialog.c
 +++ b/panels/user-accounts/um-fingerprint-dialog.c
 @@ -31,9 +31,6 @@
@@ -203,7 +204,7 @@ index 5ae8f27..05a809c 100644
                 char *path;
                 guint i;
                 GVariant *result;
-@@ -637,27 +638,30 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
+@@ -637,27 +638,33 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
                 }
 
                 data->num_enroll_stages = num_enroll_stages;
@@ -234,9 +235,12 @@ index 5ae8f27..05a809c 100644
 +                                image = gtk_bin_get_child (GTK_BIN (child));
 +                                gtk_image_set_from_resource (GTK_IMAGE (image), path);
 +                        } else {
+                                child = GTK_FLOW_BOX_CHILD (gtk_flow_box_child_new ());
 +                                image = gtk_image_new_from_resource (path);
-+                                gtk_container_add (GTK_CONTAINER (enroll_flowbox), image);
-+                                gtk_widget_set_visible (image, TRUE);
+                                gtk_widget_set_can_focus (GTK_WIDGET (child), FALSE);
+                                gtk_container_add (GTK_CONTAINER (child), image);
+                                gtk_container_add (GTK_CONTAINER (enroll_flowbox), GTK_WIDGET (child));
+                                gtk_widget_show_all (GTK_WIDGET (child));
 +                        }
                 }
                 g_free (path);
@@ -245,7 +249,7 @@ index 5ae8f27..05a809c 100644
                 g_signal_connect (data->device, "g-signal", G_CALLBACK (device_signal_cb), data);
 
                 if (!enroll_start (data, &error)) {
-@@ -678,6 +682,7 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
+@@ -678,6 +685,7 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
 
                         return;
                 }

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-control-center', 'c',
-        version : '3.36.2',
+        version : '3.36.3',
        license : 'GPL2+',
  meson_version : '>= 0.51.0'
 )

--- a/panels/user-accounts/cc-user-panel.c
+++ b/panels/user-accounts/cc-user-panel.c
@@ -1229,16 +1229,9 @@ on_permission_changed (CcUserPanel *self)
        gboolean self_selected;
        ActUser *user;

-        user = get_selected_user (self);
-        if (!user) {
-                return;
-        }
-
        is_authorized = g_permission_get_allowed (G_PERMISSION (self->permission));
-        self_selected = act_user_get_uid (user) == geteuid ();

        gtk_widget_set_visible (GTK_WIDGET (self->add_user_button), is_authorized);
-
        gtk_widget_set_sensitive (GTK_WIDGET (self->add_user_button), is_authorized);
        if (is_authorized) {
                setup_tooltip_with_embedded_icon (GTK_WIDGET (self->add_user_button), _("Create a user account"), NULL, NULL);
@@ -1258,6 +1251,12 @@ on_permission_changed (CcUserPanel *self)
                g_object_unref (icon);
        }

+        user = get_selected_user (self);
+        if (!user) {
+                return;
+        }
+
+        self_selected = act_user_get_uid (user) == geteuid ();
        gtk_widget_set_sensitive (GTK_WIDGET (self->remove_user_button), is_authorized && !self_selected
                                  && !would_demote_only_admin (user));
        if (is_authorized) {

--- a/panels/user-accounts/cc-user-panel.ui
+++ b/panels/user-accounts/cc-user-panel.ui
@@ -25,6 +25,15 @@
  </object>
  <template class="CcUserPanel" parent="CcPanel">
    <property name="visible">True</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+    <child>
+      <object class="CcPermissionInfobar" id="permission_infobar">
+        <property name="visible">True</property>
+      </object>
+    </child>
    <child>
      <object class="GtkStack" id="stack">
        <property name="visible">True</property>
@@ -86,11 +95,6 @@
                <property name="visible">True</property>
                <property name="orientation">vertical</property>
                <property name="border_width">0</property>
-                <child>
-                  <object class="CcPermissionInfobar" id="permission_infobar">
-                    <property name="visible">True</property>
-                  </object>
-                </child>

                <child>
                  <object class="CcCarousel" id="carousel">
@@ -594,6 +598,8 @@
        </child>
      </object>
    </child>
+      </object>
+    </child>
  </template>
  <object class="GtkSizeGroup">
    <property name="mode">both</property>

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -14,6 +14,7 @@ br
 bs
 ca
 ca@valencia
+ckb
 crh
 cs
 cy

--- a/po/ca.po
+++ b/po/ca.po
@@ -6659,7 +6659,7 @@ msgstr "Fes un avís sonor quan es _rebutgi una tecla"

 #: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
-msgstr "_Omet tecles"
+msgstr "_Repetició de tecles"

 #: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
@@ -6672,7 +6672,7 @@ msgstr "Curt"

 #: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
-msgstr "Retard d'escriptura en ometre tecles"
+msgstr "Retard d'escriptura en la repetició de tecles"

 #: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"

--- a/po/ckb.po
+++ b/po/ckb.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
 "issues\n"
-"POT-Creation-Date: 2020-02-19 10:58+0000\n"
-"PO-Revision-Date: 2020-02-29 14:18+0100\n"
+"POT-Creation-Date: 2020-05-02 06:15+0000\n"
+"PO-Revision-Date: 2020-05-02 21:49+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -25,71 +25,71 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"

-#: panels/applications/cc-applications-panel.c:737
+#: panels/applications/cc-applications-panel.c:741
 msgid "System Bus"
 msgstr "Magistrala systemowa"

-#: panels/applications/cc-applications-panel.c:737
-#: panels/applications/cc-applications-panel.c:739
-#: panels/applications/cc-applications-panel.c:752
-#: panels/applications/cc-applications-panel.c:757
+#: panels/applications/cc-applications-panel.c:741
+#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:756
+#: panels/applications/cc-applications-panel.c:761
 msgid "Full access"
 msgstr "Pełny dostęp"

-#: panels/applications/cc-applications-panel.c:739
+#: panels/applications/cc-applications-panel.c:743
 msgid "Session Bus"
 msgstr "Magistrala sesji"

-#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:747
 #: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466
 #: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "Urządzenia"

-#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:747
 msgid "Full access to /dev"
 msgstr "Pełny dostęp do katalogu /dev"

-#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-applications-panel.c:751
 #: panels/network/gnome-network-panel.desktop.in.in:3
 #: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "Sieć"

-#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-applications-panel.c:751
 #: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "Ma dostęp do sieci"

-#: panels/applications/cc-applications-panel.c:752
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:756
+#: panels/applications/cc-applications-panel.c:758
 #: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "Katalog domowy"

-#: panels/applications/cc-applications-panel.c:754
-#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:758
+#: panels/applications/cc-applications-panel.c:763
 msgid "Read-only"
 msgstr "Tylko do odczytu"

-#: panels/applications/cc-applications-panel.c:757
-#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:761
+#: panels/applications/cc-applications-panel.c:763
 msgid "File System"
 msgstr "System plików"

-#: panels/applications/cc-applications-panel.c:763
+#: panels/applications/cc-applications-panel.c:767
 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
 #: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "Ustawienia"

-#: panels/applications/cc-applications-panel.c:763
+#: panels/applications/cc-applications-panel.c:767
 #: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "Może zmieniać ustawienia"

-#: panels/applications/cc-applications-panel.c:765
+#: panels/applications/cc-applications-panel.c:769
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -98,66 +98,66 @@ msgstr ""
 "%s ma poniższe wbudowane uprawnienia. Nie można ich zmieniać. W razie obaw "
 "dotyczących tych uprawień można usunąć ten program."

-#: panels/applications/cc-applications-panel.c:926
+#: panels/applications/cc-applications-panel.c:930
 msgid "Web Links"
 msgstr "Odnośniki WWW"

-#: panels/applications/cc-applications-panel.c:936
+#: panels/applications/cc-applications-panel.c:940
 msgid "Git Links"
 msgstr "Odnośniki do systemu git"

-#: panels/applications/cc-applications-panel.c:942
+#: panels/applications/cc-applications-panel.c:946
 #, c-format
 msgid "%s Links"
 msgstr "Odnośniki %s"

-#: panels/applications/cc-applications-panel.c:950
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:954
+#: panels/applications/cc-applications-panel.c:990
 msgid "Unset"
 msgstr "Usuń"

-#: panels/applications/cc-applications-panel.c:1041
+#: panels/applications/cc-applications-panel.c:1045
 msgid "Links"
 msgstr "Odnośniki"

-#: panels/applications/cc-applications-panel.c:1049
+#: panels/applications/cc-applications-panel.c:1053
 msgid "Hypertext Files"
 msgstr "Pliki HTML"

-#: panels/applications/cc-applications-panel.c:1063
+#: panels/applications/cc-applications-panel.c:1067
 msgid "Text Files"
 msgstr "Pliki tekstowe"

-#: panels/applications/cc-applications-panel.c:1077
+#: panels/applications/cc-applications-panel.c:1081
 msgid "Image Files"
 msgstr "Pliki obrazów"

-#: panels/applications/cc-applications-panel.c:1093
+#: panels/applications/cc-applications-panel.c:1097
 msgid "Font Files"
 msgstr "Pliki czcionek"

-#: panels/applications/cc-applications-panel.c:1154
+#: panels/applications/cc-applications-panel.c:1158
 msgid "Archive Files"
 msgstr "Pliki archiwów"

-#: panels/applications/cc-applications-panel.c:1174
+#: panels/applications/cc-applications-panel.c:1178
 msgid "Package Files"
 msgstr "Pliki pakietów"

-#: panels/applications/cc-applications-panel.c:1197
+#: panels/applications/cc-applications-panel.c:1201
 msgid "Audio Files"
 msgstr "Pliki dźwiękowe"

-#: panels/applications/cc-applications-panel.c:1214
+#: panels/applications/cc-applications-panel.c:1218
 msgid "Video Files"
 msgstr "Pliki wideo"

-#: panels/applications/cc-applications-panel.c:1222
+#: panels/applications/cc-applications-panel.c:1226
 msgid "Other Files"
 msgstr "Inne pliki"

 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1564
+#: panels/applications/cc-applications-panel.c:1568
 #: panels/applications/cc-applications-panel.ui:418
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
@@ -573,16 +573,16 @@ msgstr ""
 "programy;aplikacja;aplikacje;flatpak;flatpack;uprawnienie;uprawnienia;"
 "pozwolenie;zezwolenie;ustawienie;ustawienia;opcje;"

-#: panels/background/cc-background-chooser.c:340
+#: panels/background/cc-background-chooser.c:346
 msgid "Select a picture"
 msgstr "Wybór obrazu"

-#: panels/background/cc-background-chooser.c:343
+#: panels/background/cc-background-chooser.c:349
 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240
 #: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
 #: panels/display/cc-display-panel.c:947
-#: panels/info-overview/cc-info-overview-panel.ui:235
+#: panels/info-overview/cc-info-overview-panel.ui:236
 #: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: panels/network/connection-editor/connection-editor.ui:17
 #: panels/network/connection-editor/vpn-helpers.c:176
@@ -604,7 +604,7 @@ msgstr "Wybór obrazu"
 msgid "_Cancel"
 msgstr "_Anuluj"

-#: panels/background/cc-background-chooser.c:344
+#: panels/background/cc-background-chooser.c:350
 #: panels/network/connection-editor/vpn-helpers.c:177
 #: panels/printers/pp-details-dialog.c:253
 #: panels/sharing/cc-sharing-panel.c:411
@@ -1417,7 +1417,7 @@ msgstr "_Wybierz"

 #: panels/common/cc-permission-infobar.ui:20
 msgid "Unlock…"
-msgstr "_Odblokuj…"
+msgstr "Odblokuj…"

 #: panels/common/cc-permission-infobar.ui:45
 msgid "Unlock to Change Settings"
@@ -1964,11 +1964,11 @@ msgstr ""
 "Niebieski;Przesunięcie ku czerwieni;Poczerwienienie;Redshift;Kolory;Kolorów;"
 "Wschód;Zachód;słońca;Słońce;"

-#: panels/info-overview/cc-info-overview-panel.c:406
-#: panels/info-overview/cc-info-overview-panel.c:421
-#: panels/info-overview/cc-info-overview-panel.c:433
-#: panels/info-overview/cc-info-overview-panel.c:479
-#: panels/info-overview/cc-info-overview-panel.c:509
+#: panels/info-overview/cc-info-overview-panel.c:416
+#: panels/info-overview/cc-info-overview-panel.c:431
+#: panels/info-overview/cc-info-overview-panel.c:443
+#: panels/info-overview/cc-info-overview-panel.c:489
+#: panels/info-overview/cc-info-overview-panel.c:519
 msgid "Unknown"
 msgstr "Nieznany"

@@ -1976,32 +1976,32 @@ msgstr "Nieznany"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info-overview/cc-info-overview-panel.c:441
+#: panels/info-overview/cc-info-overview-panel.c:451
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s, identyfikator: %s"

 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:456
+#: panels/info-overview/cc-info-overview-panel.c:466
 #, c-format
 msgid "64-bit"
 msgstr "64-bitowy"

 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:459
+#: panels/info-overview/cc-info-overview-panel.c:469
 #, c-format
 msgid "32-bit"
 msgstr "32-bitowy"

-#: panels/info-overview/cc-info-overview-panel.c:665
+#: panels/info-overview/cc-info-overview-panel.c:675
 msgid "X11"
 msgstr "X11"

-#: panels/info-overview/cc-info-overview-panel.c:669
+#: panels/info-overview/cc-info-overview-panel.c:679
 msgid "Wayland"
 msgstr "Wayland"

-#: panels/info-overview/cc-info-overview-panel.c:671
+#: panels/info-overview/cc-info-overview-panel.c:681
 msgctxt "Windowing system (Wayland, X11, or Unknown)"
 msgid "Unknown"
 msgstr "Nieznany"
@@ -2067,7 +2067,7 @@ msgstr ""
 "Nazwa komputera jest używana do identyfikowania go przez sieć lub podczas "
 "łączenia urządzeń Bluetooth."

-#: panels/info-overview/cc-info-overview-panel.ui:226
+#: panels/info-overview/cc-info-overview-panel.ui:227
 msgid "_Rename"
 msgstr "_Zmień nazwę"

@@ -2877,7 +2877,7 @@ msgstr "Zabezpieczona sieć"
 #: panels/network/net-device-ethernet.c:318
 #: panels/network/network-bluetooth.ui:76
 #: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
-#: panels/network/network-vpn.ui:78
+#: panels/network/network-vpn.ui:75
 msgid "Options…"
 msgstr "Opcje…"

@@ -4471,7 +4471,7 @@ msgstr ""
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;Flickr;Windows;Live;Microsoft;Exchange;"

 #. Translators: This is the button which allows undoing the removal of the printer.
-#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61
 msgid "Undo"
 msgstr "Cofnij"

@@ -4891,18 +4891,18 @@ msgid "Authentication Required"
 msgstr "Wymagane jest uwierzytelnienie"

 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:699
+#: panels/printers/cc-printers-panel.c:695
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Usunięto drukarkę „%s”"

 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:922
+#: panels/printers/cc-printers-panel.c:918
 msgid "Failed to add new printer."
 msgstr "Dodanie nowej drukarki się nie powiodło."

 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1216
+#: panels/printers/cc-printers-panel.c:1212
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Nie można wczytać interfejsu użytkownika: %s"
@@ -5517,21 +5517,21 @@ msgid "Restart"
 msgstr "Uruchom ponownie"

 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:8
+#: panels/printers/printers.ui:12
 msgid "Add…"
 msgstr "Dodaj…"

-#: panels/printers/printers.ui:174
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "Brak drukarek"

 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:188
+#: panels/printers/printers.ui:200
 msgid "Add a Printer…"
 msgstr "Dodaj drukarkę…"

 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:220
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -6043,44 +6043,44 @@ msgid "Remote Login"
 msgstr "Zdalne logowanie"

 #: panels/sharing/cc-sharing-panel.ui:517
-#: panels/sharing/cc-sharing-panel.ui:763
+#: panels/sharing/cc-sharing-panel.ui:739
 msgid "Screen Sharing"
 msgstr "Udostępnianie ekranu"

-#: panels/sharing/cc-sharing-panel.ui:575
+#: panels/sharing/cc-sharing-panel.ui:571
 msgid "_Allow connections to control the screen"
 msgstr "_Połączenia mogą sterować ekranem"

-#: panels/sharing/cc-sharing-panel.ui:620
+#: panels/sharing/cc-sharing-panel.ui:596
 msgid "_Password:"
 msgstr "_Hasło:"

-#: panels/sharing/cc-sharing-panel.ui:650
+#: panels/sharing/cc-sharing-panel.ui:626
 msgid "_Show Password"
 msgstr "_Wyświetlanie hasła"

-#: panels/sharing/cc-sharing-panel.ui:681
+#: panels/sharing/cc-sharing-panel.ui:657
 msgid "Access Options"
 msgstr "Opcje dostępu"

-#: panels/sharing/cc-sharing-panel.ui:695
+#: panels/sharing/cc-sharing-panel.ui:671
 msgid "_New connections must ask for access"
 msgstr "_Nowe połączenia muszą prosić o dostęp"

-#: panels/sharing/cc-sharing-panel.ui:713
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "_Require a password"
 msgstr "Wy_maganie hasła"

-#: panels/sharing/cc-sharing-panel.ui:774
-#: panels/sharing/cc-sharing-panel.ui:868
+#: panels/sharing/cc-sharing-panel.ui:750
+#: panels/sharing/cc-sharing-panel.ui:844
 msgid "Media Sharing"
 msgstr "Udostępnianie multimediów"

-#: panels/sharing/cc-sharing-panel.ui:807
+#: panels/sharing/cc-sharing-panel.ui:783
 msgid "Share music, photos and videos over the network."
 msgstr "Udostępnianie muzyki, zdjęć i filmów przez sieć."

-#: panels/sharing/cc-sharing-panel.ui:822
+#: panels/sharing/cc-sharing-panel.ui:798
 msgid "Folders"
 msgstr "Katalogi"

@@ -6112,19 +6112,19 @@ msgstr ""
 msgid "Custom"
 msgstr "Niestandardowy"

-#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
+#: panels/sound/cc-alert-chooser.ui:12
 msgid "Bark"
 msgstr "Szczeknięcie"

-#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
+#: panels/sound/cc-alert-chooser.ui:19
 msgid "Drip"
 msgstr "Kropla"

-#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
+#: panels/sound/cc-alert-chooser.ui:26
 msgid "Glass"
 msgstr "Szkło"

-#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
+#: panels/sound/cc-alert-chooser.ui:33
 msgid "Sonar"
 msgstr "Sonar"


--- a/po/ro.po
+++ b/po/ro.po
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,97 +6,97 @@
 # Peter Tuhársky <tuharsky@misbb.sk>, 2007.
 # Pavol Šimo <palo.simo@gmail.com>, 2007-2011.
 # Pavol Klačanský <pavol@klacansky.com>, 2012, 2013.
-# Dušan Kazik <prescott66@gmail.com>, 2013, 2014, 2015.
+# Dušan Kazik <prescott66@gmail.com>, 2013-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
 "issues\n"
-"POT-Creation-Date: 2020-03-13 07:07+0000\n"
-"PO-Revision-Date: 2020-03-18 16:43+0100\n"
+"POT-Creation-Date: 2020-05-05 09:22+0000\n"
+"PO-Revision-Date: 2020-05-05 19:38+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0\n"
 "X-Launchpad-Export-Date: 2012-10-06 09:48+0000\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Gtranslator 3.36.0\n"

-#: panels/applications/cc-applications-panel.c:737
+#: panels/applications/cc-applications-panel.c:741
 msgid "System Bus"
 msgstr "Zbernica systému"

 # GtkLabel
-#: panels/applications/cc-applications-panel.c:737
-#: panels/applications/cc-applications-panel.c:739
-#: panels/applications/cc-applications-panel.c:752
-#: panels/applications/cc-applications-panel.c:757
+#: panels/applications/cc-applications-panel.c:741
+#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:756
+#: panels/applications/cc-applications-panel.c:761
 msgid "Full access"
 msgstr "Plný prístup"

 # DK: zaznam v historii relacie
-#: panels/applications/cc-applications-panel.c:739
+#: panels/applications/cc-applications-panel.c:743
 msgid "Session Bus"
 msgstr "Zbernica relácie"

 # label
-#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:747
 #: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466
 #: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "Zariadenia"

-#: panels/applications/cc-applications-panel.c:743
+#: panels/applications/cc-applications-panel.c:747
 msgid "Full access to /dev"
 msgstr "Plný prístup k adresáru /dev"

 # desktop entry name
-#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-applications-panel.c:751
 #: panels/network/gnome-network-panel.desktop.in.in:3
 #: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "Sieť"

 # GtkLabel label
-#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-applications-panel.c:751
 #: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "Má prístup k sieti"

-#: panels/applications/cc-applications-panel.c:752
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:756
+#: panels/applications/cc-applications-panel.c:758
 #: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "Domov"

-#: panels/applications/cc-applications-panel.c:754
-#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:758
+#: panels/applications/cc-applications-panel.c:763
 msgid "Read-only"
 msgstr "Iba na čítanie"

 # Overenie totožnosti
 # GtkListStore item
-#: panels/applications/cc-applications-panel.c:757
-#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:761
+#: panels/applications/cc-applications-panel.c:763
 msgid "File System"
 msgstr "Systém súborov"

-#: panels/applications/cc-applications-panel.c:763
+#: panels/applications/cc-applications-panel.c:767
 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
 #: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "Nastavenia"

-#: panels/applications/cc-applications-panel.c:763
+#: panels/applications/cc-applications-panel.c:767
 #: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "Môže meniť nastavenia"

-#: panels/applications/cc-applications-panel.c:765
+#: panels/applications/cc-applications-panel.c:769
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -106,74 +106,74 @@ msgstr ""
 "zmenené. Ak vás tieto oprávnenia znepokojujú, zvážte odstránenie tejto "
 "aplikácie."

-#: panels/applications/cc-applications-panel.c:926
+#: panels/applications/cc-applications-panel.c:930
 msgid "Web Links"
 msgstr "Webové odkazy"

-#: panels/applications/cc-applications-panel.c:936
+#: panels/applications/cc-applications-panel.c:940
 msgid "Git Links"
 msgstr "Odkazy Git"

-#: panels/applications/cc-applications-panel.c:942
+#: panels/applications/cc-applications-panel.c:946
 #, c-format
 msgid "%s Links"
 msgstr "Odkazy %s"

-#: panels/applications/cc-applications-panel.c:950
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:954
+#: panels/applications/cc-applications-panel.c:990
 msgid "Unset"
 msgstr "Zrušiť nastavenie"

 # GtkLabel label
-#: panels/applications/cc-applications-panel.c:1041
+#: panels/applications/cc-applications-panel.c:1045
 msgid "Links"
 msgstr "Odkazy"

 # button
-#: panels/applications/cc-applications-panel.c:1049
+#: panels/applications/cc-applications-panel.c:1053
 msgid "Hypertext Files"
 msgstr "Hypertextové súbory"

 # button
-#: panels/applications/cc-applications-panel.c:1063
+#: panels/applications/cc-applications-panel.c:1067
 msgid "Text Files"
 msgstr "Textové súbory"

 # button
-#: panels/applications/cc-applications-panel.c:1077
+#: panels/applications/cc-applications-panel.c:1081
 msgid "Image Files"
 msgstr "Súbory obrázkov"

 # button
-#: panels/applications/cc-applications-panel.c:1093
+#: panels/applications/cc-applications-panel.c:1097
 msgid "Font Files"
 msgstr "Súbory písiem"

-#: panels/applications/cc-applications-panel.c:1154
+#: panels/applications/cc-applications-panel.c:1158
 msgid "Archive Files"
 msgstr "Súbory archívov"

-#: panels/applications/cc-applications-panel.c:1174
+#: panels/applications/cc-applications-panel.c:1178
 msgid "Package Files"
 msgstr "Súbory balíkov"

-#: panels/applications/cc-applications-panel.c:1197
+#: panels/applications/cc-applications-panel.c:1201
 msgid "Audio Files"
 msgstr "Zvukové súbory"

 # button
-#: panels/applications/cc-applications-panel.c:1214
+#: panels/applications/cc-applications-panel.c:1218
 msgid "Video Files"
 msgstr "Video súbory"

 # button
-#: panels/applications/cc-applications-panel.c:1222
+#: panels/applications/cc-applications-panel.c:1226
 msgid "Other Files"
 msgstr "Ostatné súbory"

 # tab
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1564
+#: panels/applications/cc-applications-panel.c:1568
 #: panels/applications/cc-applications-panel.ui:418
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
@@ -607,12 +607,12 @@ msgid "application;flatpak;permission;setting;"
 msgstr "aplikácia;flatpak;oprávnenie;nastavenie;"

 # file chooser dialog title
-#: panels/background/cc-background-chooser.c:340
+#: panels/background/cc-background-chooser.c:346
 msgid "Select a picture"
 msgstr "Výber obrázka"

 # GtkButton label
-#: panels/background/cc-background-chooser.c:343
+#: panels/background/cc-background-chooser.c:349
 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240
 #: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
@@ -639,7 +639,7 @@ msgstr "Výber obrázka"
 msgid "_Cancel"
 msgstr "_Zrušiť"

-#: panels/background/cc-background-chooser.c:344
+#: panels/background/cc-background-chooser.c:350
 #: panels/network/connection-editor/vpn-helpers.c:177
 #: panels/printers/pp-details-dialog.c:253
 #: panels/sharing/cc-sharing-panel.c:411
@@ -2090,7 +2090,7 @@ msgstr "Plánovanie"

 #: panels/display/cc-night-light-page.ui:136
 msgid "Sunset to Sunrise"
-msgstr "Od západu slnka po východ slnka"
+msgstr "Od západu slnka do východu slnka"

 #: panels/display/cc-night-light-page.ui:137
 msgid "Manual Schedule"
@@ -2147,11 +2147,11 @@ msgstr ""

 # * https://bugzilla.gnome.org/show_bug.cgi?id=695517
 # grafika, AP typ
-#: panels/info-overview/cc-info-overview-panel.c:407
-#: panels/info-overview/cc-info-overview-panel.c:422
-#: panels/info-overview/cc-info-overview-panel.c:434
-#: panels/info-overview/cc-info-overview-panel.c:480
-#: panels/info-overview/cc-info-overview-panel.c:510
+#: panels/info-overview/cc-info-overview-panel.c:416
+#: panels/info-overview/cc-info-overview-panel.c:431
+#: panels/info-overview/cc-info-overview-panel.c:443
+#: panels/info-overview/cc-info-overview-panel.c:489
+#: panels/info-overview/cc-info-overview-panel.c:519
 msgid "Unknown"
 msgstr "Neznámy"

@@ -2159,36 +2159,36 @@ msgstr "Neznámy"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info-overview/cc-info-overview-panel.c:442
+#: panels/info-overview/cc-info-overview-panel.c:451
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s; ID zostavy: %s"

 # Typ OS
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:457
+#: panels/info-overview/cc-info-overview-panel.c:466
 #, c-format
 msgid "64-bit"
 msgstr "64-bitový"

 # Typ OS
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:469
 #, c-format
 msgid "32-bit"
 msgstr "32-bitový"

-#: panels/info-overview/cc-info-overview-panel.c:666
+#: panels/info-overview/cc-info-overview-panel.c:675
 msgid "X11"
 msgstr "X11"

-#: panels/info-overview/cc-info-overview-panel.c:670
+#: panels/info-overview/cc-info-overview-panel.c:679
 msgid "Wayland"
 msgstr "Wayland"

 # * https://bugzilla.gnome.org/show_bug.cgi?id=695517
 # grafika, AP typ
-#: panels/info-overview/cc-info-overview-panel.c:672
+#: panels/info-overview/cc-info-overview-panel.c:681
 msgctxt "Windowing system (Wayland, X11, or Unknown)"
 msgid "Unknown"
 msgstr "Neznámy"
@@ -2250,7 +2250,7 @@ msgstr "Virtualizácia"
 # GtkLabel label
 #: panels/info-overview/cc-info-overview-panel.ui:171
 msgid "Software Updates"
-msgstr "Aktualizácie softrvéru"
+msgstr "Aktualizácie softvéru"

 # GtkToolButton label
 #: panels/info-overview/cc-info-overview-panel.ui:192
@@ -5018,7 +5018,7 @@ msgstr ""
 "email;pošta;kontakt;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;"

 #. Translators: This is the button which allows undoing the removal of the printer.
-#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61
 msgid "Undo"
 msgstr "Vrátiť späť"

@@ -5442,7 +5442,7 @@ msgstr "Automatické uspanie"
 # GtkLabel label
 #: panels/power/cc-power-panel.ui:172
 msgid "_Plugged In"
-msgstr "Z_astrčený do zásuvky"
+msgstr "_Pripojený k sieti"

 # GtkLabel label
 #: panels/power/cc-power-panel.ui:188
@@ -5500,18 +5500,18 @@ msgid "Authentication Required"
 msgstr "Vyžaduje sa overenie totožnosti"

 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:699
+#: panels/printers/cc-printers-panel.c:695
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Tlačiareň „%s“ bola odstránená"

 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:922
+#: panels/printers/cc-printers-panel.c:918
 msgid "Failed to add new printer."
 msgstr "Pridávanie novej tlačiarne zlyhalo."

 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1216
+#: panels/printers/cc-printers-panel.c:1212
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Nepodarilo sa načítať súbor používateľského rozhrania: %s"
@@ -6157,23 +6157,23 @@ msgid "Restart"
 msgstr "Reštartovať"

 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:8
+#: panels/printers/printers.ui:12
 msgid "Add…"
 msgstr "Pridať…"

 # desktop entry name
-#: panels/printers/printers.ui:179
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "Žiadne tlačiarne"

 # GtkToolButton label
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:193
+#: panels/printers/printers.ui:200
 msgid "Add a Printer…"
 msgstr "Pridať tlačiareň…"

 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:225
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -6775,51 +6775,51 @@ msgstr "Vzdialené prihlásenie"

 # GtkDialog title
 #: panels/sharing/cc-sharing-panel.ui:517
-#: panels/sharing/cc-sharing-panel.ui:763
+#: panels/sharing/cc-sharing-panel.ui:739
 msgid "Screen Sharing"
 msgstr "Sprístupnenie obrazovky"

-#: panels/sharing/cc-sharing-panel.ui:575
+#: panels/sharing/cc-sharing-panel.ui:571
 msgid "_Allow connections to control the screen"
 msgstr "_Umožniť pripojeniam ovládať obrazovku"

 # GtkLabel label
-#: panels/sharing/cc-sharing-panel.ui:620
+#: panels/sharing/cc-sharing-panel.ui:596
 msgid "_Password:"
 msgstr "_Heslo:"

 # GtkCheckButton label
-#: panels/sharing/cc-sharing-panel.ui:650
+#: panels/sharing/cc-sharing-panel.ui:626
 msgid "_Show Password"
 msgstr "Zobraziť hes_lo"

 # GtkButton label
-#: panels/sharing/cc-sharing-panel.ui:681
+#: panels/sharing/cc-sharing-panel.ui:657
 msgid "Access Options"
 msgstr "Voľby prístupu"

-#: panels/sharing/cc-sharing-panel.ui:695
+#: panels/sharing/cc-sharing-panel.ui:671
 msgid "_New connections must ask for access"
 msgstr "_Nové spojenia musia vyžadovať prístup"

 # GtkLabel label
-#: panels/sharing/cc-sharing-panel.ui:713
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "_Require a password"
 msgstr "Vyžadu_je heslo"

 # GtkDialog title
-#: panels/sharing/cc-sharing-panel.ui:774
-#: panels/sharing/cc-sharing-panel.ui:868
+#: panels/sharing/cc-sharing-panel.ui:750
+#: panels/sharing/cc-sharing-panel.ui:844
 msgid "Media Sharing"
 msgstr "Spoločné používanie multimédií"

 # GtkLabel label
-#: panels/sharing/cc-sharing-panel.ui:807
+#: panels/sharing/cc-sharing-panel.ui:783
 msgid "Share music, photos and videos over the network."
 msgstr "Sprístupnite hudbu, fotografie a videá cez sieť."

 # GtkToolButton label
-#: panels/sharing/cc-sharing-panel.ui:822
+#: panels/sharing/cc-sharing-panel.ui:798
 msgid "Folders"
 msgstr "Priečinky"

@@ -6855,19 +6855,19 @@ msgstr ""
 msgid "Custom"
 msgstr "Vlastná"

-#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
+#: panels/sound/cc-alert-chooser.ui:12
 msgid "Bark"
 msgstr "Brechanie"

-#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
+#: panels/sound/cc-alert-chooser.ui:19
 msgid "Drip"
 msgstr "Kvapkanie vody"

-#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
+#: panels/sound/cc-alert-chooser.ui:26
 msgid "Glass"
 msgstr "Ťukanie na sklo"

-#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
+#: panels/sound/cc-alert-chooser.ui:33
 msgid "Sonar"
 msgstr "Sonar"


--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/issu"
 "es\n"
-"POT-Creation-Date: 2020-04-16 17:23+0000\n"
-"PO-Revision-Date: 2020-04-22 12:33+0300\n"
+"POT-Creation-Date: 2020-05-05 17:44+0000\n"
+"PO-Revision-Date: 2020-05-06 12:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -1464,8 +1464,6 @@ msgstr[2] "%d секунд"
 #. 5 hours 2 minutes 12 seconds
 #: panels/common/cc-util.c:172
 #, c-format
-#| msgctxt "hours minutes seconds"
-#| msgid "%s %s %s"
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -1473,8 +1471,6 @@ msgstr "%s %s %s"
 #. 2 minutes 12 seconds
 #: panels/common/cc-util.c:177
 #, c-format
-#| msgctxt "hours minutes"
-#| msgid "%s %s"
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
@@ -2066,7 +2062,7 @@ msgstr "Перей_менувати"

 #: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
 msgid "About"
-msgstr "Про програму"
+msgstr "Про систему"

 #: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
@@ -3728,7 +3724,7 @@ msgstr "З'єднання"
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:59
 msgid "Authentication required"
-msgstr "Потрібна автентифікація"
+msgstr "Слід пройти розпізнавання"

 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:63
@@ -4064,7 +4060,7 @@ msgstr "_Користувач"
 #: panels/sharing/cc-sharing-panel.ui:351
 #: panels/user-accounts/cc-add-user-dialog.ui:310
 #: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:385
+#: panels/user-accounts/cc-user-panel.ui:389
 msgid "_Password"
 msgstr "_Пароль"

@@ -4692,7 +4688,7 @@ msgstr "Пр_итлумлювати яскравість екрана, якщо

 #: panels/power/cc-power-panel.c:1926
 msgid "_Blank Screen"
-msgstr "С_порожнити екран"
+msgstr "По_гасити екран"

 #: panels/power/cc-power-panel.c:1949
 msgid "_Wi-Fi"
@@ -5612,7 +5608,7 @@ msgid "Login _Screen"
 msgstr "Вікно в_ходу"

 #: panels/region/cc-region-panel.ui:64
-#: panels/user-accounts/cc-user-panel.ui:313
+#: panels/user-accounts/cc-user-panel.ui:317
 msgid "_Language"
 msgstr "_Мова"

@@ -7440,12 +7436,12 @@ msgstr ""
 "Щоб унести зміни,\n"
 "натисніть спочатку на піктограму *"

-#: panels/user-accounts/cc-user-panel.c:1244
+#: panels/user-accounts/cc-user-panel.c:1237
 msgid "Create a user account"
 msgstr "Створити обліковий запис користувача"

-#: panels/user-accounts/cc-user-panel.c:1255
-#: panels/user-accounts/cc-user-panel.c:1383
+#: panels/user-accounts/cc-user-panel.c:1248
+#: panels/user-accounts/cc-user-panel.c:1382
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7453,12 +7449,12 @@ msgstr ""
 "Щоб створити обліковий запис користувача,\n"
 "натисніть спочатку на піктограму *"

-#: panels/user-accounts/cc-user-panel.c:1264
+#: panels/user-accounts/cc-user-panel.c:1263
 msgid "Delete the selected user account"
 msgstr "Вилучити вибраний обліковий запис користувача"

-#: panels/user-accounts/cc-user-panel.c:1276
-#: panels/user-accounts/cc-user-panel.c:1387
+#: panels/user-accounts/cc-user-panel.c:1275
+#: panels/user-accounts/cc-user-panel.c:1386
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7470,28 +7466,28 @@ msgstr ""
 msgid "_Add User…"
 msgstr "_Додати користувача…"

-#: panels/user-accounts/cc-user-panel.ui:52
+#: panels/user-accounts/cc-user-panel.ui:61
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "Щоб зміни набрали чинності, потрібно перезапустити ваш сеанс"

-#: panels/user-accounts/cc-user-panel.ui:60
+#: panels/user-accounts/cc-user-panel.ui:69
 msgid "Restart Now"
 msgstr "Перезапустити зараз"

-#: panels/user-accounts/cc-user-panel.ui:146
-#: panels/user-accounts/cc-user-panel.ui:162
+#: panels/user-accounts/cc-user-panel.ui:150
+#: panels/user-accounts/cc-user-panel.ui:166
 msgid "User Icon"
 msgstr "Піктограма користувача"

-#: panels/user-accounts/cc-user-panel.ui:238
+#: panels/user-accounts/cc-user-panel.ui:242
 msgid "Account Settings"
 msgstr "Параметри облікового запису"

-#: panels/user-accounts/cc-user-panel.ui:265
+#: panels/user-accounts/cc-user-panel.ui:269
 msgid "_Administrator"
 msgstr "_Адміністратор"

-#: panels/user-accounts/cc-user-panel.ui:285
+#: panels/user-accounts/cc-user-panel.ui:289
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users."
@@ -7499,32 +7495,32 @@ msgstr ""
 "Адміністратори можуть додавати або вилучати інших користувачів, а також "
 "змінювати параметри для усіх користувачів."

-#: panels/user-accounts/cc-user-panel.ui:359
+#: panels/user-accounts/cc-user-panel.ui:363
 msgid "Authentication & Login"
 msgstr "Автентифікація та вхід"

-#: panels/user-accounts/cc-user-panel.ui:428
+#: panels/user-accounts/cc-user-panel.ui:432
 msgid "_Fingerprint Login"
 msgstr "Вхід через відбитки _пальців"

-#: panels/user-accounts/cc-user-panel.ui:470
+#: panels/user-accounts/cc-user-panel.ui:474
 msgid "A_utomatic Login"
 msgstr "_Автоматичний вхід"

-#: panels/user-accounts/cc-user-panel.ui:500
+#: panels/user-accounts/cc-user-panel.ui:504
 msgid "Account Activity"
 msgstr "Активність облікового запису"

-#: panels/user-accounts/cc-user-panel.ui:541
+#: panels/user-accounts/cc-user-panel.ui:545
 msgid "Remove User…"
 msgstr "Вилучити користувача…"

 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:580
+#: panels/user-accounts/cc-user-panel.ui:584
 msgid "No Users Found"
 msgstr "Не знайдено жодного користувача"

-#: panels/user-accounts/cc-user-panel.ui:590
+#: panels/user-accounts/cc-user-panel.ui:594
 msgid "Unlock to add a user account."
 msgstr "Розблокуйте, щоб додати обліковий запис користувача."


--- a/po/zh_TW.po
+++ b/po/zh_TW.po