Bug#935265: buster-pu: package gnome-control-center/1:3.30.3-2~deb10u1

Simon McVittie <[email protected]> Wed, 21 Aug 2019 09:56:54 +0100

Newsgroups	gmane.linux.debian.devel.gtk-gnome
Message-ID	<20190821085654.GA4836__12514.4839681283$1566378574$gmane$org@espresso.pseudorandom.co.uk>

Package: release.debian.org
Severity: normal
Tags: buster
User: [email protected]
Usertags: pu

I updated gnome-control-center in unstable a few weeks ago, and I think the
same changes would make sense in buster.

>  * d/patches: Update to upstream gnome-3-30 commit 3.30.3-7-gf41ae4269

This updates to what might have been in upstream release 3.30.4 if there
had been one:

>    - d/p/info-Fix-crashes-when-retrieving-disk-size.patch:
>      Fix crash when the Details -> Overview (info-overview) panel is
>      selected (Closes: #933529)

This reliably crashed with unstable's GLib, but upstream consider it to
have been a gnome-control-center bug (it was just a lot less frequent
with buster's GLib).

>    - d/p/universal-access-Fix-duplicate-settings-call.patch,
>      d/p/universal-access-Fix-leaks-checking-settings.patch:
>      Fix memory leaks in Universal Access panel

Minor memory leak fixes.

>    - d/p/universal-access-Don-t-use-widget-names-for-GSettings-key.patch:
>      Fix a regression that caused the Universal Access -> Zoom
>      mouse tracking options to have no effect

The widget names were not updated when the UI was changed, causing some
of the options to not do anything.

>    - Update translations: is, ja

The obvious change. Note that I have excluded one of the Icelandic updates
from the attached debdiff, because the patch is very large (but it only
touches the Icelandic translation).

>  * Rebuild for Debian 10
>  * d/gbp.conf: Set packaging branch to debian/buster
>  * d/patches: Mark more patches as forwarded upstream
>  * d/patches: Sort non-upstreamable patches to end of patch series

Packaging metadata only.

    smcv

gnome-control-center_3.30.3-2~deb10u1.diff (text/x-diff, 62.4 KB)

diffstat for gnome-control-center-3.30.3 gnome-control-center-3.30.3

 changelog                                                               |   28 
 patches/06_handle_passwd_with_ldap.patch                                |    5 
 patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch           |   10 
 patches/Update-Icelandic-translation-1.patch                            |  152 +++
 patches/Update-Japanese-translation.patch                               |  502 ++++++++++
 patches/datetime-Use-accessible-description-instead-of-name-for-H.patch |    2 
 patches/distro-logo.patch                                               |    8 
 patches/info-Fix-crashes-when-retrieving-disk-size.patch                |   81 +
 patches/mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch        |   11 
 patches/mouse-fix-misplaced-mnemonic-labels.patch                       |    3 
 patches/online-accounts-Set-label-relationship-for-listboxes.patch      |    2 
 patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch    |   12 
 patches/printers-Set-mnemonic-widget-for-labels.patch                   |    2 
 patches/printers-allow-driver-name-to-be-selected-from-details-di.patch |    2 
 patches/series                                                          |   17 
 patches/universal-access-Don-t-use-widget-names-for-GSettings-key.patch |  174 +++
 patches/universal-access-Fix-duplicate-settings-call.patch              |   23 
 patches/universal-access-Fix-leaks-checking-settings.patch              |   49 
 patches/universal-access-Remove-redundant-label-for-relations.patch     |   18 
 19 files changed, 1059 insertions(+), 42 deletions(-)

diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/changelog gnome-control-center-3.30.3/debian/changelog
--- gnome-control-center-3.30.3/debian/changelog	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/changelog	2019-08-21 08:56:24.000000000 +0100
@@ -1,3 +1,31 @@
+gnome-control-center (1:3.30.3-2~deb10u1) buster; urgency=medium
+
+  * Team upload
+  * Rebuild for Debian 10
+  * d/gbp.conf: Set packaging branch to debian/buster
+
+ -- Simon McVittie <[email protected]>  Wed, 21 Aug 2019 08:56:24 +0100
+
+gnome-control-center (1:3.30.3-2) unstable; urgency=medium
+
+  * Team upload
+  * d/patches: Mark more patches as forwarded upstream
+  * d/patches: Sort non-upstreamable patches to end of patch series
+  * d/patches: Update to upstream gnome-3-30 commit 3.30.3-7-gf41ae4269
+    - d/p/info-Fix-crashes-when-retrieving-disk-size.patch:
+      Fix crash when the Details -> Overview (info-overview) panel is
+      selected (Closes: #933529)
+    - d/p/universal-access-Fix-duplicate-settings-call.patch,
+      d/p/universal-access-Fix-leaks-checking-settings.patch:
+      Fix memory leaks in Universal Access panel
+    - d/p/universal-access-Don-t-use-widget-names-for-GSettings-key.patch:
+      Fix a regression that caused the Universal Access -> Zoom
+      mouse tracking options to have no effect
+    - Update translations: is, ja
+  * d/gbp.conf: Set branch to debian/unstable
+
+ -- Simon McVittie <[email protected]>  Wed, 31 Jul 2019 10:32:22 +0100
+
 gnome-control-center (1:3.30.3-1) unstable; urgency=medium
 
   [ Jeremy Bicha ]
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/06_handle_passwd_with_ldap.patch gnome-control-center-3.30.3/debian/patches/06_handle_passwd_with_ldap.patch
--- gnome-control-center-3.30.3/debian/patches/06_handle_passwd_with_ldap.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/06_handle_passwd_with_ldap.patch	2019-08-21 08:56:24.000000000 +0100
@@ -3,10 +3,11 @@
 Subject: Handle the case where passwd re-asks for the current password when
  it was entered incorrectly (when using LDAP)
 
-Based on a patch from Ryan Tandy
+Based on a patch from Ryan Tandy.
+
 Bug-Ubuntu: https:/launchpad.net/bugs/607357
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=786530
-Forwarded: yes
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/483
 ---
  panels/user-accounts/run-passwd.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/datetime-Use-accessible-description-instead-of-name-for-H.patch gnome-control-center-3.30.3/debian/patches/datetime-Use-accessible-description-instead-of-name-for-H.patch
--- gnome-control-center-3.30.3/debian/patches/datetime-Use-accessible-description-instead-of-name-for-H.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/datetime-Use-accessible-description-instead-of-name-for-H.patch	2019-08-21 08:56:24.000000000 +0100
@@ -10,7 +10,7 @@
 This is the only place we used accessible-name in gnome-control-center
 but we use accessible-description in a few other places.
 
-(cherry picked from commit d9212cf3fa6a879ab846975cf8e8cfb879733c24)
+Applied-upstream: 3.31.4, commit:021140d859f82c1ae7b65a0f281c4b6e400e424e
 ---
  panels/datetime/datetime.ui | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/distro-logo.patch gnome-control-center-3.30.3/debian/patches/distro-logo.patch
--- gnome-control-center-3.30.3/debian/patches/distro-logo.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/distro-logo.patch	2019-08-21 08:56:24.000000000 +0100
@@ -1,6 +1,6 @@
 From: Matthias Clasen <[email protected]>
 Date: Sun, 31 Mar 2013 20:28:19 -0400
-Subject: [PATCH] info: Switch around GNOME and distro information
+Subject: info: Switch around GNOME and distro information
 
 This makes the distribution logo prominent, and puts GNOME version
 information in the small print.
@@ -17,10 +17,10 @@
  2 files changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
-index 411c1c9..b3839c4 100644
+index fa9510b..4fbb7e2 100644
 --- a/panels/info/cc-info-overview-panel.c
 +++ b/panels/info/cc-info-overview-panel.c
-@@ -772,7 +772,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
+@@ -795,7 +795,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
    if (res)
      {
        g_autofree gchar *text = NULL;
@@ -30,7 +30,7 @@
      }
  
 diff --git a/panels/info/info-overview.ui b/panels/info/info-overview.ui
-index 219a83c..7d01a22 100644
+index 219a83c..ace1747 100644
 --- a/panels/info/info-overview.ui
 +++ b/panels/info/info-overview.ui
 @@ -12,13 +12,14 @@
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch gnome-control-center-3.30.3/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch
--- gnome-control-center-3.30.3/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch	2019-08-21 08:56:24.000000000 +0100
@@ -38,10 +38,10 @@
  	prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False);
  	prop_tapping_enabled = XInternAtom (display, "libinput Tapping Enabled", False);
 diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
-index 5af1293..3005125 100644
+index 0b56e17..d0a9c58 100644
 --- a/panels/mouse/gnome-mouse-properties.c
 +++ b/panels/mouse/gnome-mouse-properties.c
-@@ -78,7 +78,6 @@ struct _CcMouseProperties
+@@ -79,7 +79,6 @@ struct _CcMouseProperties
  	gboolean have_mouse;
  	gboolean have_touchpad;
  	gboolean have_touchscreen;
@@ -49,7 +49,7 @@
  
  	gboolean left_handed;
  	GtkGesture *left_gesture;
-@@ -98,10 +97,6 @@ setup_touchpad_options (CcMouseProperties *self)
+@@ -99,10 +98,6 @@ setup_touchpad_options (CcMouseProperties *self)
  	gboolean have_edge_scrolling;
  	gboolean have_tap_to_click;
  
@@ -60,7 +60,7 @@
  	gtk_widget_set_visible (self->touchpad_frame, self->have_touchpad);
  	if (!self->have_touchpad)
  		return;
-@@ -312,7 +307,10 @@ device_changed (GsdDeviceManager *device_manager,
+@@ -335,7 +330,10 @@ device_changed (GsdDeviceManager *device_manager,
  		GsdDevice *device,
  		CcMouseProperties *self)
  {
@@ -72,7 +72,7 @@
  
  	setup_touchpad_options (self);
  
-@@ -412,11 +410,11 @@ cc_mouse_properties_init (CcMouseProperties *self)
+@@ -439,11 +437,11 @@ cc_mouse_properties_init (CcMouseProperties *self)
  						 G_CALLBACK (device_changed), self);
  
  	self->have_mouse = mouse_is_present ();
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/info-Fix-crashes-when-retrieving-disk-size.patch gnome-control-center-3.30.3/debian/patches/info-Fix-crashes-when-retrieving-disk-size.patch
--- gnome-control-center-3.30.3/debian/patches/info-Fix-crashes-when-retrieving-disk-size.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/info-Fix-crashes-when-retrieving-disk-size.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,81 @@
+From: Ondrej Holy <[email protected]>
+Date: Wed, 13 Mar 2019 15:49:33 +0100
+Subject: info: Fix crashes when retrieving disk size
+
+Info panel crashes has been fixed by !387 on master branch, however,
+gnome-3-30 is still affected as the same fix can't be used there, because
+its complexity and changed dependencies. The panel crashes because
+GUnixMountPoint is by mistake used as GUnixMountEntry. Let's find
+and use corresponing GUnixMountEntry to simply fix those crashes for
+gnome-3-30.
+
+Bug: #411
+Bug-Debian: https://bugs.debian.org/933529
+Origin: upstream, 3.30.4, commit:26287234bd9152fbe95baa82b9d55b8064d789c2
+---
+ panels/info/cc-info-overview-panel.c | 33 ++++++++++++++++++++++++++++-----
+ 1 file changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
+index 7758271..fa9510b 100644
+--- a/panels/info/cc-info-overview-panel.c
++++ b/panels/info/cc-info-overview-panel.c
+@@ -546,10 +546,30 @@ get_primary_disc_info_start (CcInfoOverviewPanel *self)
+                                       self);
+ }
+ 
++static GList *
++convert_points_to_entries (GList *points)
++{
++  GList *entries = NULL;
++  GList *p;
++
++  for (p = points; p != NULL; p = p->next)
++    {
++      GUnixMountPoint *point = p->data;
++      GUnixMountEntry *mount;
++      const gchar *mount_path = g_unix_mount_point_get_mount_path (point);
++
++      mount = g_unix_mount_at (mount_path, NULL);
++      if (mount)
++        entries = g_list_append (entries, mount);
++    }
++
++  return entries;
++}
++
+ static void
+ get_primary_disc_info (CcInfoOverviewPanel *self)
+ {
+-  GList *points;
++  GList *points, *entries = NULL;
+   GList *p;
+   GHashTable *hash;
+   CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
+@@ -557,11 +577,14 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
+   hash = g_hash_table_new (g_str_hash, g_str_equal);
+   points = g_unix_mount_points_get (NULL);
+ 
++  entries = convert_points_to_entries (points);
++  g_list_free_full (points, (GDestroyNotify) g_unix_mount_point_free);
++
+   /* If we do not have /etc/fstab around, try /etc/mtab */
+-  if (points == NULL)
+-    points = g_unix_mounts_get (NULL);
++  if (entries == NULL)
++    entries = g_unix_mounts_get (NULL);
+ 
+-  for (p = points; p != NULL; p = p->next)
++  for (p = entries; p != NULL; p = p->next)
+     {
+       GUnixMountEntry *mount = p->data;
+       const char *mount_path;
+@@ -586,7 +609,7 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
+       priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount);
+       g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path);
+     }
+-  g_list_free (points);
++  g_list_free (entries);
+   g_hash_table_destroy (hash);
+ 
+   priv->cancellable = g_cancellable_new ();
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch gnome-control-center-3.30.3/debian/patches/mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch
--- gnome-control-center-3.30.3/debian/patches/mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch	2019-08-21 08:56:24.000000000 +0100
@@ -8,14 +8,15 @@
 This eliminates an unnecessary split in the touchpad
 section that is noticeable when navigating with a keyboard.
 
-Proposed: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/334
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/334
+Applied-upstream: 3.31.90, commit:dde97ecb2ed695088504c1074c8435a4fc37bcaf
 ---
  panels/mouse/gnome-mouse-properties.c  | 37 +++++++++++++++++++++++++++++-----
  panels/mouse/gnome-mouse-properties.ui | 13 ------------
  2 files changed, 32 insertions(+), 18 deletions(-)
 
 diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
-index 3005125..d0a9c58 100644
+index 5af1293..0b56e17 100644
 --- a/panels/mouse/gnome-mouse-properties.c
 +++ b/panels/mouse/gnome-mouse-properties.c
 @@ -60,8 +60,9 @@ struct _CcMouseProperties
@@ -29,7 +30,7 @@
  	GtkWidget *touchpad_speed_scale;
  	GtkWidget *touchpad_toggle_switch;
  	GtkWidget *two_finger_scrolling_row;
-@@ -278,7 +279,31 @@ setup_dialog (CcMouseProperties *self)
+@@ -283,7 +284,31 @@ setup_dialog (CcMouseProperties *self)
  				      touchpad_enabled_set_mapping,
  				      NULL, NULL);
  	g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
@@ -62,7 +63,7 @@
  				      G_SETTINGS_BIND_GET,
  				      touchpad_enabled_get_mapping,
  				      touchpad_enabled_set_mapping,
-@@ -297,8 +322,6 @@ setup_dialog (CcMouseProperties *self)
+@@ -302,8 +327,6 @@ setup_dialog (CcMouseProperties *self)
  			 G_SETTINGS_BIND_DEFAULT);
  
  	setup_touchpad_options (self);
@@ -71,7 +72,7 @@
  }
  
  /* Callback issued when a button is clicked on the dialog */
-@@ -380,8 +403,12 @@ cc_mouse_properties_class_init (CcMousePropertiesClass *klass)
+@@ -382,8 +405,12 @@ cc_mouse_properties_class_init (CcMousePropertiesClass *klass)
  	gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, tap_to_click_switch);
  	gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, touchpad_frame);
  	gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, touchpad_listbox);
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/mouse-fix-misplaced-mnemonic-labels.patch gnome-control-center-3.30.3/debian/patches/mouse-fix-misplaced-mnemonic-labels.patch
--- gnome-control-center-3.30.3/debian/patches/mouse-fix-misplaced-mnemonic-labels.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/mouse-fix-misplaced-mnemonic-labels.patch	2019-08-21 08:56:24.000000000 +0100
@@ -2,7 +2,8 @@
 Date: Thu, 3 Jan 2019 16:35:47 -0500
 Subject: mouse: fix misplaced mnemonic labels
 
-Proposed: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/334
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/334
+Applied-upstream: 3.31.90, commit:783918aaf552111a496fc33fee3fda800a007753
 ---
  panels/mouse/gnome-mouse-properties.ui | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/online-accounts-Set-label-relationship-for-listboxes.patch gnome-control-center-3.30.3/debian/patches/online-accounts-Set-label-relationship-for-listboxes.patch
--- gnome-control-center-3.30.3/debian/patches/online-accounts-Set-label-relationship-for-listboxes.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/online-accounts-Set-label-relationship-for-listboxes.patch	2019-08-21 08:56:24.000000000 +0100
@@ -5,7 +5,7 @@
 Set the label relationships so that screen readers
 read the headers for the listboxes.
 
-(cherry picked from commit 27b476872ed24372ca3e47b88ffb14abe213481e)
+Applied-upstream: 3.31.90, commit:a9d6ed149bc2d169140160b44b8237b0ca893f90
 ---
  panels/online-accounts/online-accounts.ui | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch gnome-control-center-3.30.3/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
--- gnome-control-center-3.30.3/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch	2019-08-21 08:56:24.000000000 +0100
@@ -24,11 +24,11 @@
  po/es.po                      |  7 ++++++-
  po/fur.po                     |  7 ++++++-
  po/it.po                      |  5 +++++
- po/ja.po                      |  7 ++++++-
+ po/ja.po                      |  5 +++++
  po/sl.po                      |  7 ++++++-
  po/sv.po                      |  7 ++++++-
  po/tr.po                      |  8 +++++++-
- 11 files changed, 69 insertions(+), 11 deletions(-)
+ 11 files changed, 68 insertions(+), 10 deletions(-)
 
 diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
 index 9da5a54..ecf046b 100644
@@ -180,15 +180,13 @@
  msgctxt "Battery name"
  msgid "Main"
 diff --git a/po/ja.po b/po/ja.po
-index e7e3cff..927e424 100644
+index 05f6d24..d8a9504 100644
 --- a/po/ja.po
 +++ b/po/ja.po
-@@ -3926,7 +3926,12 @@ msgid "Fully charged"
- msgstr "フル充電"
+@@ -3927,6 +3927,11 @@ msgstr "フル充電"
  
  #. TRANSLATORS: primary battery
--#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
-+#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
+ #: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
 +msgid "Not charging"
 +msgstr "放電中"
 +
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/printers-allow-driver-name-to-be-selected-from-details-di.patch gnome-control-center-3.30.3/debian/patches/printers-allow-driver-name-to-be-selected-from-details-di.patch
--- gnome-control-center-3.30.3/debian/patches/printers-allow-driver-name-to-be-selected-from-details-di.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/printers-allow-driver-name-to-be-selected-from-details-di.patch	2019-08-21 08:56:24.000000000 +0100
@@ -5,7 +5,7 @@
 The field can be copy-and-pasted elsewhere
 and this allows screen readers to read this field.
 
-(cherry picked from commit f4d9b5be84056bddd51ef9d60c1089cb8c0867b7)
+Applied-upstream: 3.31.4, commit:2e250f9dc800188dbc310cf21e5318d7afa224ed
 ---
  panels/printers/details-dialog.ui | 1 +
  1 file changed, 1 insertion(+)
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/printers-Set-mnemonic-widget-for-labels.patch gnome-control-center-3.30.3/debian/patches/printers-Set-mnemonic-widget-for-labels.patch
--- gnome-control-center-3.30.3/debian/patches/printers-Set-mnemonic-widget-for-labels.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/printers-Set-mnemonic-widget-for-labels.patch	2019-08-21 08:56:24.000000000 +0100
@@ -4,7 +4,7 @@
 
 This allows screen readers to read the label for each widget.
 
-(cherry picked from commit cb634107328b546addc373641c5389d78a64a831)
+Applied-upstream: 3.31.4, commit:61470a2a01d72019c7377f4133c3d6b9e82a0edd
 ---
  panels/printers/details-dialog.ui   | 4 ++++
  panels/printers/pp-options-dialog.c | 2 ++
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/series gnome-control-center-3.30.3/debian/patches/series
--- gnome-control-center-3.30.3/debian/patches/series	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/series	2019-08-21 08:56:24.000000000 +0100
@@ -1,8 +1,10 @@
-01_menu_category.patch
-06_handle_passwd_with_ldap.patch
-07_polkit_wheel_sudo_group.patch
-Expose-touchpad-settings-if-synaptics-is-in-use.patch
-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch
+Update-Icelandic-translation.patch
+Update-Icelandic-translation-1.patch
+Update-Japanese-translation.patch
+info-Fix-crashes-when-retrieving-disk-size.patch
+universal-access-Fix-duplicate-settings-call.patch
+universal-access-Fix-leaks-checking-settings.patch
+universal-access-Don-t-use-widget-names-for-GSettings-key.patch
 power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
 datetime-Use-accessible-description-instead-of-name-for-H.patch
 online-accounts-Set-label-relationship-for-listboxes.patch
@@ -11,4 +13,9 @@
 universal-access-Remove-redundant-label-for-relations.patch
 mouse-fix-misplaced-mnemonic-labels.patch
 mouse-Don-t-use-a-separate-box-for-touchpad-switch.patch
+01_menu_category.patch
+06_handle_passwd_with_ldap.patch
+07_polkit_wheel_sudo_group.patch
+Expose-touchpad-settings-if-synaptics-is-in-use.patch
+Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch
 distro-logo.patch
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/universal-access-Don-t-use-widget-names-for-GSettings-key.patch gnome-control-center-3.30.3/debian/patches/universal-access-Don-t-use-widget-names-for-GSettings-key.patch
--- gnome-control-center-3.30.3/debian/patches/universal-access-Don-t-use-widget-names-for-GSettings-key.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/universal-access-Don-t-use-widget-names-for-GSettings-key.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,174 @@
+From: Robert Ancell <[email protected]>
+Date: Tue, 4 Jun 2019 13:45:00 +1200
+Subject: universal-access: Don't use widget names for GSettings keys
+
+The widget were renamed in 6cd94618 and this setting was broken.
+
+Bug: #555
+Origin: upstream, 3.30.4, commit:f41ae4269ea5721448460d85546e6222b44cc99d
+---
+ panels/universal-access/zoom-options.c  | 76 +++++++++++----------------------
+ panels/universal-access/zoom-options.ui |  3 ++
+ 2 files changed, 28 insertions(+), 51 deletions(-)
+
+diff --git a/panels/universal-access/zoom-options.c b/panels/universal-access/zoom-options.c
+index 71ea329..dcfaa44 100644
+--- a/panels/universal-access/zoom-options.c
++++ b/panels/universal-access/zoom-options.c
+@@ -70,7 +70,6 @@ static gchar *contrast_keys[] = {
+ };
+ 
+ static void set_enable_screen_part_ui (GtkWidget *widget, ZoomOptions *self);
+-static void mouse_tracking_notify_cb (GSettings *settings, const gchar *key, ZoomOptions *self);
+ static void scale_label (GtkBin *toggle, PangoAttrList *attrs);
+ static void xhairs_color_opacity_changed (GtkColorButton *button, ZoomOptions *self);
+ static void xhairs_length_add_marks (ZoomOptions *self, GtkScale *scale);
+@@ -80,41 +79,37 @@ static void contrast_slider_notify_cb (GSettings *settings, const gchar *key, Zo
+ static void effects_slider_changed (GtkRange *slider, ZoomOptions *self);
+ 
+ static void
+-mouse_tracking_radio_toggled_cb (GtkWidget *widget, ZoomOptions *self)
++mouse_tracking_radio_toggled_cb (ZoomOptions *self, GtkWidget *widget)
+ {
+-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) == TRUE)
+-	  {
+-        g_settings_set_string (self->settings, "mouse-tracking",
+-	                           gtk_buildable_get_name (GTK_BUILDABLE (widget)));
+-      }
++  if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
++    return;
++
++  if (widget == self->centered_radio)
++      g_settings_set_string (self->settings, "mouse-tracking", "centered");
++  else if (widget == self->proportional_radio)
++      g_settings_set_string (self->settings, "mouse-tracking", "proportional");
++  else if (widget == self->push_radio)
++      g_settings_set_string (self->settings, "mouse-tracking", "push");
+ }
+ 
+ static void
+-init_mouse_mode_radio_group (GSList *mode_group, ZoomOptions *self)
++mouse_tracking_notify_cb (ZoomOptions *self)
+ {
+-    g_autofree gchar *mode = NULL;
+-    gchar *name;
+-
+-    mode = g_settings_get_string (self->settings, "mouse-tracking");
+-	for (; mode_group != NULL; mode_group = mode_group->next)
+-	  {
+-	    name = (gchar *) gtk_buildable_get_name (GTK_BUILDABLE (mode_group->data));
+-	    if (g_strcmp0 (name, mode) == 0)
+-	      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mode_group->data), TRUE);
+-	    else
+-	      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mode_group->data), FALSE);
+-
+-	    g_signal_connect (G_OBJECT (mode_group->data), "toggled",
+-                          G_CALLBACK(mouse_tracking_radio_toggled_cb),
+-                          self);
+-	  }
++    g_autofree gchar *tracking = NULL;
++
++    tracking = g_settings_get_string (self->settings, "mouse-tracking");
++    if (g_strcmp0 (tracking, "centered") == 0)
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->centered_radio), TRUE);
++    else if (g_strcmp0 (tracking, "proportional") == 0)
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->proportional_radio), TRUE);
++    else
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->push_radio), TRUE);
+ }
+ 
+ static void
+ init_screen_part_section (ZoomOptions *self, PangoAttrList *pango_attrs)
+ {
+   gboolean lens_mode;
+-  GSList *mouse_mode_group;
+ 
+   /* Scale the labels of the toggles */
+   scale_label (GTK_BIN (self->follow_mouse_radio), pango_attrs);
+@@ -128,8 +123,6 @@ init_screen_part_section (ZoomOptions *self, PangoAttrList *pango_attrs)
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->follow_mouse_radio), lens_mode);
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->screen_part_radio), !lens_mode);
+ 
+-  mouse_mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (self->centered_radio));
+-  init_mouse_mode_radio_group (mouse_mode_group, self);
+   set_enable_screen_part_ui (self->screen_part_radio, self);
+ 
+   g_settings_bind (self->settings, "lens-mode",
+@@ -143,8 +136,9 @@ init_screen_part_section (ZoomOptions *self, PangoAttrList *pango_attrs)
+   g_signal_connect (G_OBJECT (self->screen_part_radio), "toggled",
+                     G_CALLBACK (set_enable_screen_part_ui), self);
+ 
+-  g_signal_connect (G_OBJECT (self->settings), "changed::mouse-tracking",
+-                    G_CALLBACK (mouse_tracking_notify_cb), self);
++  mouse_tracking_notify_cb (self);
++  g_signal_connect_object (G_OBJECT (self->settings), "changed::mouse-tracking",
++                           G_CALLBACK (mouse_tracking_notify_cb), self, G_CONNECT_SWAPPED);
+ }
+ 
+ static void
+@@ -168,28 +162,6 @@ set_enable_screen_part_ui (GtkWidget *widget, ZoomOptions *self)
+     gtk_widget_set_sensitive (self->extend_beyond_checkbox, screen_part);
+ }
+ 
+-static void
+-mouse_tracking_notify_cb (GSettings   *settings,
+-                          const gchar *key,
+-                          ZoomOptions *self)
+-{
+-  g_autofree gchar *tracking = NULL;
+-
+-  tracking = g_settings_get_string (settings, key);
+-  if (g_strcmp0 (tracking, "proportional") == 0)
+-    {
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->proportional_radio), TRUE);
+-    }
+-  else if (g_strcmp0 (tracking, "centered") == 0)
+-    {
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->centered_radio), TRUE);
+-    }
+-  else
+-    {
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->push_radio), TRUE);
+-    }
+-}
+-
+ static void
+ scale_label (GtkBin *toggle, PangoAttrList *attrs)
+ {
+@@ -549,6 +521,8 @@ zoom_options_class_init (ZoomOptionsClass *klass)
+   gtk_widget_class_bind_template_child (widget_class, ZoomOptions, screen_part_radio);
+   gtk_widget_class_bind_template_child (widget_class, ZoomOptions, screen_position_combobox);
+   gtk_widget_class_bind_template_child (widget_class, ZoomOptions, seeing_zoom_switch);
++
++  gtk_widget_class_bind_template_callback (widget_class, mouse_tracking_radio_toggled_cb);
+ }
+ 
+ static void
+diff --git a/panels/universal-access/zoom-options.ui b/panels/universal-access/zoom-options.ui
+index 37db882..85723e0 100644
+--- a/panels/universal-access/zoom-options.ui
++++ b/panels/universal-access/zoom-options.ui
+@@ -360,6 +360,7 @@
+                                         <property name="active">True</property>
+                                         <property name="draw_indicator">True</property>
+                                         <property name="use_underline">True</property>
++                                        <signal name="toggled" handler="mouse_tracking_radio_toggled_cb" object="ZoomOptions" swapped="yes"/>
+                                       </object>
+                                       <packing>
+                                         <property name="expand">False</property>
+@@ -379,6 +380,7 @@
+                                         <property name="draw_indicator">True</property>
+                                         <property name="group">centered_radio</property>
+                                         <property name="use_underline">True</property>
++                                        <signal name="toggled" handler="mouse_tracking_radio_toggled_cb" object="ZoomOptions" swapped="yes"/>
+                                       </object>
+                                       <packing>
+                                         <property name="expand">False</property>
+@@ -398,6 +400,7 @@
+                                         <property name="draw_indicator">True</property>
+                                         <property name="group">centered_radio</property>
+                                         <property name="use_underline">True</property>
++                                        <signal name="toggled" handler="mouse_tracking_radio_toggled_cb" object="ZoomOptions" swapped="yes"/>
+                                       </object>
+                                       <packing>
+                                         <property name="expand">False</property>
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/universal-access-Fix-duplicate-settings-call.patch gnome-control-center-3.30.3/debian/patches/universal-access-Fix-duplicate-settings-call.patch
--- gnome-control-center-3.30.3/debian/patches/universal-access-Fix-duplicate-settings-call.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/universal-access-Fix-duplicate-settings-call.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,23 @@
+From: Robert Ancell <[email protected]>
+Date: Tue, 4 Jun 2019 13:48:00 +1200
+Subject: universal-access: Fix duplicate settings call
+
+This would leak the value of the first setting.
+
+Origin: upstream, 3.30.4, commit:a7bd54016000ab864ae1760890102e866a8f994a
+---
+ panels/universal-access/zoom-options.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/panels/universal-access/zoom-options.c b/panels/universal-access/zoom-options.c
+index 7266aaa..6286147 100644
+--- a/panels/universal-access/zoom-options.c
++++ b/panels/universal-access/zoom-options.c
+@@ -228,7 +228,6 @@ screen_position_notify_cb (GSettings *settings,
+   GtkComboBox *combobox;
+   gboolean valid;
+ 
+-  position = g_settings_get_string (settings, key);
+   position = g_settings_get_string (self->settings, key);
+   combobox = GTK_COMBO_BOX (self->screen_position_combobox);
+   model = gtk_combo_box_get_model (combobox);
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/universal-access-Fix-leaks-checking-settings.patch gnome-control-center-3.30.3/debian/patches/universal-access-Fix-leaks-checking-settings.patch
--- gnome-control-center-3.30.3/debian/patches/universal-access-Fix-leaks-checking-settings.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/universal-access-Fix-leaks-checking-settings.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,49 @@
+From: Robert Ancell <[email protected]>
+Date: Tue, 4 Jun 2019 13:48:42 +1200
+Subject: universal-access: Fix leaks checking settings
+
+Origin: upstream, 3.30.4, commit:d8766d2545e06a3cd7c15cad5709c5d5e3f566d1
+---
+ panels/universal-access/zoom-options.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/panels/universal-access/zoom-options.c b/panels/universal-access/zoom-options.c
+index 6286147..71ea329 100644
+--- a/panels/universal-access/zoom-options.c
++++ b/panels/universal-access/zoom-options.c
+@@ -92,7 +92,7 @@ mouse_tracking_radio_toggled_cb (GtkWidget *widget, ZoomOptions *self)
+ static void
+ init_mouse_mode_radio_group (GSList *mode_group, ZoomOptions *self)
+ {
+-    gchar *mode;
++    g_autofree gchar *mode = NULL;
+     gchar *name;
+ 
+     mode = g_settings_get_string (self->settings, "mouse-tracking");
+@@ -173,7 +173,7 @@ mouse_tracking_notify_cb (GSettings   *settings,
+                           const gchar *key,
+                           ZoomOptions *self)
+ {
+-  gchar *tracking;
++  g_autofree gchar *tracking = NULL;
+ 
+   tracking = g_settings_get_string (settings, key);
+   if (g_strcmp0 (tracking, "proportional") == 0)
+@@ -222,7 +222,7 @@ screen_position_notify_cb (GSettings *settings,
+                            const gchar *key,
+                            ZoomOptions *self)
+ {
+-  gchar *position;
++  g_autofree gchar *position = NULL;
+   GtkTreeIter iter;
+   GtkTreeModel *model;
+   GtkComboBox *combobox;
+@@ -258,7 +258,7 @@ screen_position_notify_cb (GSettings *settings,
+ static void
+ init_xhairs_color_opacity (GtkColorButton *color_button, GSettings *settings)
+ {
+-    gchar *color_setting;
++    g_autofree gchar *color_setting = NULL;
+     GdkRGBA rgba;
+ 
+     color_setting = g_settings_get_string (settings, "cross-hairs-color");
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/universal-access-Remove-redundant-label-for-relations.patch gnome-control-center-3.30.3/debian/patches/universal-access-Remove-redundant-label-for-relations.patch
--- gnome-control-center-3.30.3/debian/patches/universal-access-Remove-redundant-label-for-relations.patch	2019-02-10 23:35:05.000000000 +0000
+++ gnome-control-center-3.30.3/debian/patches/universal-access-Remove-redundant-label-for-relations.patch	2019-08-21 08:56:24.000000000 +0100
@@ -8,13 +8,13 @@
 emit "Crosshairs" every time a new tab was entered in the Zoom dialog
 because of some incorrect labelled-by relations.
 
-(cherry picked from commit 56703258220105101d68a7b2c9f09a907aef59e9)
+Applied-upstream: 3.31.90, commit:0f92ffb01afa3fb9337c9fa98f359bef499c4c9a
 ---
  panels/universal-access/zoom-options.ui | 24 ------------------------
  1 file changed, 24 deletions(-)
 
 diff --git a/panels/universal-access/zoom-options.ui b/panels/universal-access/zoom-options.ui
-index 37db882..b8a2ab9 100644
+index 85723e0..baeec2f 100644
 --- a/panels/universal-access/zoom-options.ui
 +++ b/panels/universal-access/zoom-options.ui
 @@ -131,9 +131,6 @@
@@ -27,7 +27,7 @@
                </object>
                <packing>
                  <property name="expand">False</property>
-@@ -579,9 +576,6 @@
+@@ -582,9 +579,6 @@
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">crosshair_length_slider</property>
                                      <property name="width_chars">12</property>
@@ -37,7 +37,7 @@
                                      <attributes>
                                        <attribute name="scale" value="1.25"/>
                                      </attributes>
-@@ -719,9 +713,6 @@
+@@ -722,9 +716,6 @@
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
                                  <property name="use_action_appearance">False</property>
@@ -47,7 +47,7 @@
                                </object>
                                <packing>
                                  <property name="expand">False</property>
-@@ -832,9 +823,6 @@
+@@ -835,9 +826,6 @@
                                      <property name="justify">right</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">inverse_enabled_switch</property>
@@ -57,7 +57,7 @@
                                      <attributes>
                                        <attribute name="scale" value="1.25"/>
                                      </attributes>
-@@ -856,9 +844,6 @@
+@@ -859,9 +847,6 @@
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">brightness_slider</property>
                                      <property name="width_chars">12</property>
@@ -67,7 +67,7 @@
                                      <attributes>
                                        <attribute name="scale" value="1.25"/>
                                      </attributes>
-@@ -879,9 +864,6 @@
+@@ -882,9 +867,6 @@
                                      <property name="justify">right</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">contrast_slider</property>
@@ -77,7 +77,7 @@
                                      <attributes>
                                        <attribute name="scale" value="1.25"/>
                                      </attributes>
-@@ -902,9 +884,6 @@
+@@ -905,9 +887,6 @@
                                      <property name="justify">right</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">grayscale_slider</property>
@@ -87,7 +87,7 @@
                                      <attributes>
                                        <attribute name="scale" value="1.25"/>
                                      </attributes>
-@@ -993,9 +972,6 @@
+@@ -996,9 +975,6 @@
                                          <property name="visible">True</property>
                                          <property name="can_focus">True</property>
                                          <property name="use_action_appearance">False</property>
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/Update-Icelandic-translation-1.patch gnome-control-center-3.30.3/debian/patches/Update-Icelandic-translation-1.patch
--- gnome-control-center-3.30.3/debian/patches/Update-Icelandic-translation-1.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/Update-Icelandic-translation-1.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,152 @@
+From: =?utf-8?q?Sveinn_=C3=AD_Felli?= <[email protected]>
+Date: Fri, 22 Feb 2019 11:16:50 +0000
+Subject: Update Icelandic translation
+
+Origin: upstream, 3.30.4, commit:19deec23261b666ce4881e413995c72c7702af80
+---
+ po/is.po | 38 ++++++++++++++++++++++++++++----------
+ 1 file changed, 28 insertions(+), 10 deletions(-)
+
+diff --git a/po/is.po b/po/is.po
+index 117eb3b..5117782 100644
+--- a/po/is.po
++++ b/po/is.po
+@@ -10,7 +10,7 @@ msgstr ""
+ "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/issu"
+ "es\n"
+ "POT-Creation-Date: 2018-11-07 22:33+0000\n"
+-"PO-Revision-Date: 2019-02-21 12:09+0000\n"
++"PO-Revision-Date: 2019-02-22 11:15+0000\n"
+ "Last-Translator: Sveinn í Felli <[email protected]>\n"
+ "Language-Team: Icelandic <[email protected]>\n"
+ "Language: is\n"
+@@ -1202,7 +1202,7 @@ msgstr "Ekki var hægt að framkvæma breytingar"
+ 
+ #: panels/display/cc-display-panel.c:1973
+ msgid "This could be due to hardware limitations."
+-msgstr ""
++msgstr "Þetta gæti verið vegna takmarkana í vélbúnaði."
+ 
+ #: panels/display/cc-display-panel.c:2104
+ #, c-format
+@@ -2441,11 +2441,11 @@ msgstr "Gera aðgengilegt öðrum n_otendum"
+ 
+ #: panels/network/connection-editor/details-page.ui:376
+ msgid "Restrict background data usage"
+-msgstr ""
++msgstr "Takmarka gagnanotkun í bakgrunnsvinnslu"
+ 
+ #: panels/network/connection-editor/details-page.ui:386
+ msgid "Appropriate for connections that have data charges or limits."
+-msgstr ""
++msgstr "Tilvalið fyrir tengingar þar sem takmörk eða gjöld eru á gagnanotkun."
+ 
+ #: panels/network/connection-editor/ethernet-page.ui:16
+ #: panels/network/connection-editor/ethernet-page.ui:39
+@@ -3985,7 +3985,7 @@ msgstr "Tölva"
+ #. TRANSLATORS: secondary battery
+ #: panels/power/cc-power-panel.c:559
+ msgid "Gaming input device"
+-msgstr ""
++msgstr "Leikjainntakstæki"
+ 
+ #. TRANSLATORS: secondary battery, misc
+ #: panels/power/cc-power-panel.c:562 panels/power/cc-power-panel.c:814
+@@ -5204,6 +5204,9 @@ msgid ""
+ "Uses Mozilla Location Service: <a href='https://location.services.mozilla."
+ "com/privacy'>Privacy Policy</a>"
+ msgstr ""
++"Notar Mozilla staðsetningarþjónustu: <a href='https://location.services.mozill"
++"a."
++"com/privacy'>Persónuverndarstefna</a>"
+ 
+ #: panels/privacy/privacy.ui:828
+ msgid "_Location Services"
+@@ -5959,6 +5962,8 @@ msgstr "Auðkennt"
+ msgid ""
+ "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
+ msgstr ""
++"Thunderbolt undirkerfið (boltd) er ekki uppsett eða að uppsetningin er ekki"
++" rétt."
+ 
+ #: panels/thunderbolt/cc-bolt-panel.c:460
+ msgid ""
+@@ -5966,19 +5971,23 @@ msgid ""
+ "Either the system lacks Thunderbolt support, it has been disabled in the "
+ "BIOS or is set to an unsupported security level in the BIOS."
+ msgstr ""
++"Thunderbolt fannst ekki.\n"
++"Annað hvort vantar stuðning við Thunderbolt í kerfið, hann hefur verið gerður"
++" óvirkur í BIOS-stillingum eða að hann er stilltur á óstutt öryggisstig í"
++" BIOS."
+ 
+ #: panels/thunderbolt/cc-bolt-panel.c:504
+ msgid "Thunderbolt support has been disabled in the BIOS."
+-msgstr ""
++msgstr "Stuðningur við Thunderbolt hefur verið gerður óvirkur í BIOS."
+ 
+ #: panels/thunderbolt/cc-bolt-panel.c:613
+ #, c-format
+ msgid "Error switching direct mode: %s"
+-msgstr ""
++msgstr "Villa við að skipta í beinan ham: %s"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:143
+ msgid "No Thunderbolt support"
+-msgstr ""
++msgstr "Enginn stuðningur við Thunderbolt"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:246
+ #| msgid "Universal Access"
+@@ -5988,10 +5997,12 @@ msgstr "Beinn aðgangur"
+ #: panels/thunderbolt/cc-bolt-panel.ui:269
+ msgid "Allow direct access to devices such as docks and external GPUs."
+ msgstr ""
++"Leyfir beinan aðgang að tækjum eins og tengikvíum (dock) og utanáliggjandi"
++" GPU-skjákortsörgjörvum."
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:289
+ msgid "Only USB and Display Port devices can attach."
+-msgstr ""
++msgstr "Aðeins USB og Display Port tæki geta tengst."
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:397
+ #| msgid "Add Device"
+@@ -7673,6 +7684,9 @@ msgid ""
+ "may experience incorrect system behavior, data loss, and other unexpected "
+ "issues. "
+ msgstr ""
++"Þessa útgáfu af Settings-stillingaforritinu ætti einungis að nota í"
++" þróunartilgangi. Þú gætir fundið fyrir rangri kerfishegðun, gagnatapi og"
++" öðrum óvæntum vandamálum. "
+ 
+ #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+ #: shell/gnome-control-center.desktop.in.in:5
+@@ -7718,22 +7732,26 @@ msgstr "Hætta við leit"
+ 
+ #: shell/org.gnome.ControlCenter.gschema.xml:5
+ msgid "The identifier for the last Settings panel to be opened"
+-msgstr ""
++msgstr "Auðkenni síðast opnaða stillingaspjaldsins"
+ 
+ #: shell/org.gnome.ControlCenter.gschema.xml:6
+ msgid ""
+ "The identifier for the last Settings panel to be opened. Unrecognised values "
+ "will be ignored and the first panel in the list selected."
+ msgstr ""
++"Auðkenni síðast opnaða stillingaspjaldsins. Óþekkt gildi verða hunsuð og"
++" fyrsta spjaldið í listanum verður valið."
+ 
+ #: shell/org.gnome.ControlCenter.gschema.xml:13
+ msgid "Show warning when running a development build of Settings"
+ msgstr ""
++"Birta aðvörun þegar verið er að keyra þróunarútgáfu af Settings-stillingunum"
+ 
+ #: shell/org.gnome.ControlCenter.gschema.xml:14
+ msgid ""
+ "Whether Settings should show a warning when running a development build."
+ msgstr ""
++"Hvort Settings eigi að birta aðvörun þegar verið er að keyra þróunarútgáfu."
+ 
+ #. translators:
+ #. * The number of sound outputs on a particular device
diff -Nru --exclude Update-Icelandic-translation.patch gnome-control-center-3.30.3/debian/patches/Update-Japanese-translation.patch gnome-control-center-3.30.3/debian/patches/Update-Japanese-translation.patch
--- gnome-control-center-3.30.3/debian/patches/Update-Japanese-translation.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-control-center-3.30.3/debian/patches/Update-Japanese-translation.patch	2019-08-21 08:56:24.000000000 +0100
@@ -0,0 +1,502 @@
+From: Ryuta Fujii <[email protected]>
+Date: Sat, 23 Feb 2019 08:15:37 +0000
+Subject: Update Japanese translation
+
+Origin: upstream, 3.30.4, commit:7b2fdbcaf2393c67538b171f2f78937c625e3fee
+---
+ po/ja.po | 171 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 86 insertions(+), 85 deletions(-)
+
+diff --git a/po/ja.po b/po/ja.po
+index e7e3cff..05f6d24 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -15,15 +15,17 @@
+ # Ikuya Awashiro <[email protected]>, 2014.
+ # Hajime Taira <[email protected]>, 2015-2017
+ # Jiro Matsuzawa <[email protected]>, 2010-2017.
++# sujiniku <[email protected]>, 2018.
++# sicklylife <[email protected]>, 2019.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
+ "issues\n"
+-"POT-Creation-Date: 2018-11-21 11:28+0000\n"
+-"PO-Revision-Date: 2018-09-27 00:15+0900\n"
+-"Last-Translator: sujiniku <[email protected]>\n"
++"POT-Creation-Date: 2019-02-22 11:18+0000\n"
++"PO-Revision-Date: 2019-02-12 18:30+0900\n"
++"Last-Translator: sicklylife <[email protected]>\n"
+ "Language-Team: Japanese <[email protected]>\n"
+ "Language: ja\n"
+ "MIME-Version: 1.0\n"
+@@ -116,7 +118,7 @@ msgstr "画像を %s フォルダーに追加すると、その画像がここ
+ #: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
+ #: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
+ #: panels/common/cc-language-chooser.ui:23
+-#: panels/display/cc-display-panel.c:1935
++#: panels/display/cc-display-panel.c:1939
+ #: panels/network/connection-editor/connection-editor.ui:15
+ #: panels/network/connection-editor/vpn-helpers.c:181
+ #: panels/network/connection-editor/vpn-helpers.c:310
+@@ -1149,32 +1151,32 @@ msgstr "横方向 (逆向き)"
+ msgid "Orientation"
+ msgstr "向き"
+ 
+-#: panels/display/cc-display-panel.c:690 panels/display/cc-display-panel.c:1461
++#: panels/display/cc-display-panel.c:694 panels/display/cc-display-panel.c:1465
+ #: panels/printers/pp-options-dialog.c:87
+ msgid "Resolution"
+ msgstr "解像度"
+ 
+-#: panels/display/cc-display-panel.c:777
++#: panels/display/cc-display-panel.c:781
+ msgid "Refresh Rate"
+ msgstr "リフレッシュレート"
+ 
+-#: panels/display/cc-display-panel.c:919
++#: panels/display/cc-display-panel.c:923
+ msgid "Scale"
+ msgstr "スケール"
+ 
+-#: panels/display/cc-display-panel.c:970
++#: panels/display/cc-display-panel.c:974
+ msgid "Adjust for TV"
+ msgstr "TV 向けに調整"
+ 
+-#: panels/display/cc-display-panel.c:1205
++#: panels/display/cc-display-panel.c:1209
+ msgid "Primary Display"
+ msgstr "プライマリディスプレイ"
+ 
+-#: panels/display/cc-display-panel.c:1233
++#: panels/display/cc-display-panel.c:1237
+ msgid "Display Arrangement"
+ msgstr "ディスプレイの配置"
+ 
+-#: panels/display/cc-display-panel.c:1234
++#: panels/display/cc-display-panel.c:1238
+ msgid ""
+ "Drag displays to match your setup. The top bar is placed on the primary "
+ "display."
+@@ -1182,47 +1184,47 @@ msgstr ""
+ "あなたの調整に合うようにディスプレイをドラッグしてください。トップバーはプラ"
+ "イマリディスプレイに配置されます。"
+ 
+-#: panels/display/cc-display-panel.c:1648
++#: panels/display/cc-display-panel.c:1652
+ msgid "Display Mode"
+ msgstr "ディスプレイモード"
+ 
+-#: panels/display/cc-display-panel.c:1664
++#: panels/display/cc-display-panel.c:1668
+ msgid "Join Displays"
+ msgstr "画面を拡張"
+ 
+-#: panels/display/cc-display-panel.c:1667
++#: panels/display/cc-display-panel.c:1671
+ msgid "Mirror"
+ msgstr "ミラー"
+ 
+-#: panels/display/cc-display-panel.c:1670
++#: panels/display/cc-display-panel.c:1674
+ msgid "Single Display"
+ msgstr "シングルディスプレイ"
+ 
+-#: panels/display/cc-display-panel.c:1945
++#: panels/display/cc-display-panel.c:1949
+ #: panels/network/connection-editor/connection-editor.ui:24
+ #: panels/network/network-wifi.ui:38
+ msgid "_Apply"
+ msgstr "適用(_A)"
+ 
+-#: panels/display/cc-display-panel.c:1967
++#: panels/display/cc-display-panel.c:1971
+ msgid "Apply Changes?"
+ msgstr "変更を適用しますか?"
+ 
+-#: panels/display/cc-display-panel.c:1972
++#: panels/display/cc-display-panel.c:1976
+ msgid "Changes Cannot be Applied"
+-msgstr ""
++msgstr "変更を適用できません"
+ 
+-#: panels/display/cc-display-panel.c:1973
++#: panels/display/cc-display-panel.c:1977
+ msgid "This could be due to hardware limitations."
+-msgstr ""
++msgstr "この原因はハードウェアの制限にある可能性があります。"
+ 
+-#: panels/display/cc-display-panel.c:2104
++#: panels/display/cc-display-panel.c:2108
+ #, c-format
+ msgid "%.2lf Hz"
+ msgstr "%.2lf Hz"
+ 
+ #. TRANSLATORS: the state of the night light setting
+-#: panels/display/cc-display-panel.c:2276
++#: panels/display/cc-display-panel.c:2280
+ #: panels/notifications/cc-notifications-panel.c:288
+ #: panels/power/cc-power-panel.c:2047 panels/power/cc-power-panel.c:2054
+ #: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+@@ -1234,7 +1236,7 @@ msgstr "%.2lf Hz"
+ msgid "On"
+ msgstr "オン"
+ 
+-#: panels/display/cc-display-panel.c:2276 panels/network/net-proxy.c:54
++#: panels/display/cc-display-panel.c:2280 panels/network/net-proxy.c:54
+ #: panels/notifications/cc-notifications-panel.c:288
+ #: panels/power/cc-power-panel.c:2041 panels/power/cc-power-panel.c:2052
+ #: panels/privacy/cc-privacy-panel.c:192 panels/privacy/cc-privacy-panel.c:259
+@@ -1250,11 +1252,11 @@ msgstr "オン"
+ msgid "Off"
+ msgstr "オフ"
+ 
+-#: panels/display/cc-display-panel.c:2296
++#: panels/display/cc-display-panel.c:2300
+ msgid "_Night Light"
+ msgstr "夜間モード(_N)"
+ 
+-#: panels/display/cc-display-panel.c:2357
++#: panels/display/cc-display-panel.c:2361
+ msgid "Could not get screen information"
+ msgstr "スクリーンの情報を取得できませんでした"
+ 
+@@ -3069,8 +3071,6 @@ msgid "Security type"
+ msgstr "セキュリティタイプ"
+ 
+ #: panels/network/network-wifi.ui:1679
+-#, fuzzy
+-#| msgid "Password"
+ msgctxt "Wi-Fi passkey"
+ msgid "Password"
+ msgstr "パスワード"
+@@ -5190,6 +5190,8 @@ msgid ""
+ "Uses Mozilla Location Service: <a href='https://location.services.mozilla."
+ "com/privacy'>Privacy Policy</a>"
+ msgstr ""
++"Mozilla Location Service を使用します: <a href='https://location.services."
++"mozilla.com/privacy'>プライバシーポリシー</a>"
+ 
+ #: panels/privacy/privacy.ui:828
+ msgid "_Location Services"
+@@ -5471,14 +5473,14 @@ msgid "Choose a Folder"
+ msgstr "フォルダーの選択"
+ 
+ #: panels/sharing/cc-sharing-panel.c:721
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "File Sharing allows you to share your Public folder with others on your "
+ "current network using: <a href=\"dav://%s\">dav://%s</a>"
+ msgstr ""
+-"ファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に"
+-"接続し、あなたの公開フォルダーを共有できるようにします: <a href=\"dav://%s"
+-"\">dav://%s</a>"
++"ファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に接続し、あ"
++"なたの公開フォルダーを共有できるようにします: <a href=\"dav://%s\">dav://%s</"
++"a>"
+ 
+ #: panels/sharing/cc-sharing-panel.c:723
+ #, c-format
+@@ -5878,7 +5880,6 @@ msgstr "認証済み:"
+ 
+ #. Translators: The time point the device was connected.
+ #: panels/thunderbolt/cc-bolt-device-dialog.c:175
+-
+ msgid "Connected at:"
+ msgstr "接続済み:"
+ 
+@@ -5939,6 +5940,10 @@ msgid ""
+ "Either the system lacks Thunderbolt support, it has been disabled in the "
+ "BIOS or is set to an unsupported security level in the BIOS."
+ msgstr ""
++"Thunderbolt を検出できませんでした。\n"
++"システムが Thunderbolt に対応していないか、または BIOS で Thunderbolt が無効"
++"になっているか、もしくは BIOS で Thunderbolt のセキュリティレベルが対応してい"
++"ない設定になっているかのいずれかです。"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.c:504
+ msgid "Thunderbolt support has been disabled in the BIOS."
+@@ -5954,14 +5959,12 @@ msgid "No Thunderbolt support"
+ msgstr "Thunderbolt サポートがありません"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:246
+-#, fuzzy
+-#| msgid "Universal Access"
+ msgid "Direct Access"
+ msgstr "直接アクセス"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:269
+ msgid "Allow direct access to devices such as docks and external GPUs."
+-msgstr ""
++msgstr "ドックや外付け GPU などのデバイスへの直接アクセスを許可します。"
+ 
+ #: panels/thunderbolt/cc-bolt-panel.ui:289
+ msgid "Only USB and Display Port devices can attach."
+@@ -6193,179 +6196,179 @@ msgstr "リピートキー"
+ msgid "Key presses repeat when key is held down."
+ msgstr "キーを長押しすると繰り返しキー入力を行う"
+ 
+-#: panels/universal-access/uap.ui:1544
++#: panels/universal-access/uap.ui:1545
+ msgid "Repeat keys delay"
+ msgstr "リピートキーが行われるまでの時間です"
+ 
+-#: panels/universal-access/uap.ui:1592 panels/universal-access/uap.ui:1725
++#: panels/universal-access/uap.ui:1593 panels/universal-access/uap.ui:1728
+ msgid "Speed"
+ msgstr "速度"
+ 
+-#: panels/universal-access/uap.ui:1629
++#: panels/universal-access/uap.ui:1632
+ msgid "Repeat keys speed"
+ msgstr "押したキーをリピートする際の速さです"
+ 
+-#: panels/universal-access/uap.ui:1653
++#: panels/universal-access/uap.ui:1656
+ msgid "Cursor Blinking"
+ msgstr "カーソルの点滅"
+ 
+-#: panels/universal-access/uap.ui:1683
++#: panels/universal-access/uap.ui:1686
+ msgid "Cursor blinks in text fields."
+ msgstr "テキストフィールドでカーソルを点滅させる"
+ 
+-#: panels/universal-access/uap.ui:1762
++#: panels/universal-access/uap.ui:1765
+ msgid "Cursor blinking speed"
+ msgstr "カーソルが点滅する速さです"
+ 
+-#: panels/universal-access/uap.ui:1798
++#: panels/universal-access/uap.ui:1801
+ msgid "Typing Assist"
+ msgstr "タイピング支援"
+ 
+-#: panels/universal-access/uap.ui:1837
++#: panels/universal-access/uap.ui:1840
+ msgid "_Sticky Keys"
+ msgstr "固定キー(_S)"
+ 
+-#: panels/universal-access/uap.ui:1854
++#: panels/universal-access/uap.ui:1857
+ msgid "Treats a sequence of modifier keys as a key combination"
+ msgstr ""
+ "修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
+ 
+-#: panels/universal-access/uap.ui:1878
++#: panels/universal-access/uap.ui:1881
+ msgid "_Disable if two keys are pressed together"
+ msgstr "同時に 2 つのキーを押したら無効にする(_D)"
+ 
+-#: panels/universal-access/uap.ui:1896
++#: panels/universal-access/uap.ui:1899
+ msgid "Beep when a _modifier key is pressed"
+ msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
+ 
+-#: panels/universal-access/uap.ui:1944
++#: panels/universal-access/uap.ui:1947
+ msgid "S_low Keys"
+ msgstr "スローキー(_L)"
+ 
+-#: panels/universal-access/uap.ui:1961
++#: panels/universal-access/uap.ui:1964
+ msgid "Puts a delay between when a key is pressed and when it is accepted"
+ msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
+ 
+-#: panels/universal-access/uap.ui:1994 panels/universal-access/uap.ui:2207
+-#: panels/universal-access/uap.ui:2544
++#: panels/universal-access/uap.ui:1997 panels/universal-access/uap.ui:2210
++#: panels/universal-access/uap.ui:2547
+ msgid "A_cceptance delay:"
+ msgstr "認識するまでの間隔(_C):"
+ 
+-#: panels/universal-access/uap.ui:2016
++#: panels/universal-access/uap.ui:2019
+ msgctxt "slow keys delay"
+ msgid "Short"
+ msgstr "短い"
+ 
+-#: panels/universal-access/uap.ui:2035
++#: panels/universal-access/uap.ui:2038
+ msgid "Slow keys typing delay"
+ msgstr "スローキーの入力間隔"
+ 
+-#: panels/universal-access/uap.ui:2050
++#: panels/universal-access/uap.ui:2053
+ msgctxt "slow keys delay"
+ msgid "Long"
+ msgstr "長い"
+ 
+-#: panels/universal-access/uap.ui:2077
++#: panels/universal-access/uap.ui:2080
+ msgid "Beep when a key is pr_essed"
+ msgstr "キーが押されたらビープ音を鳴らす(_E)"
+ 
+-#: panels/universal-access/uap.ui:2094
++#: panels/universal-access/uap.ui:2097
+ msgid "Beep when a key is _accepted"
+ msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
+ 
+-#: panels/universal-access/uap.ui:2111 panels/universal-access/uap.ui:2290
++#: panels/universal-access/uap.ui:2114 panels/universal-access/uap.ui:2293
+ msgid "Beep when a key is _rejected"
+ msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
+ 
+-#: panels/universal-access/uap.ui:2157
++#: panels/universal-access/uap.ui:2160
+ msgid "_Bounce Keys"
+ msgstr "バウンスキー(_B)"
+ 
+-#: panels/universal-access/uap.ui:2174
++#: panels/universal-access/uap.ui:2177
+ msgid "Ignores fast duplicate keypresses"
+ msgstr "同じキーを繰り返し押した場合は無視する"
+ 
+-#: panels/universal-access/uap.ui:2229
++#: panels/universal-access/uap.ui:2232
+ msgctxt "bounce keys delay"
+ msgid "Short"
+ msgstr "短い"
+ 
+-#: panels/universal-access/uap.ui:2248
++#: panels/universal-access/uap.ui:2251
+ msgid "Bounce keys typing delay"
+ msgstr "バウンスキーの入力間隔"
+ 
+-#: panels/universal-access/uap.ui:2263
++#: panels/universal-access/uap.ui:2266
+ msgctxt "bounce keys delay"
+ msgid "Long"
+ msgstr "長い"
+ 
+-#: panels/universal-access/uap.ui:2376
++#: panels/universal-access/uap.ui:2379
+ msgid "_Enable by Keyboard"
+ msgstr "キーボードから有効化できるようにする(_E)"
+ 
+-#: panels/universal-access/uap.ui:2393
++#: panels/universal-access/uap.ui:2396
+ msgid "Turn accessibility features on and off using the keyboard"
+ msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
+ 
+-#: panels/universal-access/uap.ui:2457
++#: panels/universal-access/uap.ui:2460
+ msgid "Click Assist"
+ msgstr "クリック支援"
+ 
+-#: panels/universal-access/uap.ui:2493
++#: panels/universal-access/uap.ui:2496
+ msgid "_Simulated Secondary Click"
+ msgstr "副ボタンのクリックの代替(_S)"
+ 
+-#: panels/universal-access/uap.ui:2511
++#: panels/universal-access/uap.ui:2514
+ msgid "Trigger a secondary click by holding down the primary button"
+ msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
+ 
+-#: panels/universal-access/uap.ui:2565
++#: panels/universal-access/uap.ui:2568
+ msgctxt "secondary click"
+ msgid "Short"
+ msgstr "短い"
+ 
+-#: panels/universal-access/uap.ui:2584
++#: panels/universal-access/uap.ui:2587
+ msgid "Secondary click delay"
+ msgstr "副ボタンのクリックの間隔"
+ 
+-#: panels/universal-access/uap.ui:2599
++#: panels/universal-access/uap.ui:2602
+ msgctxt "secondary click delay"
+ msgid "Long"
+ msgstr "長い"
+ 
+ # See also ja.po of mousetweak
+-#: panels/universal-access/uap.ui:2656
++#: panels/universal-access/uap.ui:2659
+ msgid "_Hover Click"
+ msgstr "ホバークリック(_H)"
+ 
+-#: panels/universal-access/uap.ui:2674
++#: panels/universal-access/uap.ui:2677
+ msgid "Trigger a click when the pointer hovers"
+ msgstr "ポインターの移動を停止したらクリック動作を行う"
+ 
+-#: panels/universal-access/uap.ui:2707
++#: panels/universal-access/uap.ui:2710
+ msgid "D_elay:"
+ msgstr "認識するまでの間隔(_E):"
+ 
+-#: panels/universal-access/uap.ui:2729
++#: panels/universal-access/uap.ui:2732
+ msgctxt "dwell click delay"
+ msgid "Short"
+ msgstr "短い"
+ 
+-#: panels/universal-access/uap.ui:2760
++#: panels/universal-access/uap.ui:2763
+ msgctxt "dwell click delay"
+ msgid "Long"
+ msgstr "長い"
+ 
+-#: panels/universal-access/uap.ui:2796
++#: panels/universal-access/uap.ui:2799
+ msgid "Motion _threshold:"
+ msgstr "ジェスチャーのしきい値(_T):"
+ 
+-#: panels/universal-access/uap.ui:2818
++#: panels/universal-access/uap.ui:2821
+ msgctxt "dwell click threshold"
+ msgid "Small"
+ msgstr "小"
+ 
+-#: panels/universal-access/uap.ui:2849
++#: panels/universal-access/uap.ui:2852
+ msgctxt "dwell click threshold"
+ msgid "Large"
+ msgstr "大"
+@@ -6677,10 +6680,8 @@ msgid "Take a Picture…"
+ msgstr "写真を撮る…"
+ 
+ #: panels/user-accounts/data/avatar-chooser.ui:34
+-#, fuzzy
+-#| msgid "Select PPD File"
+ msgid "Select a File…"
+-msgstr "PPDファイルの選択"
++msgstr "ファイルの選択…"
+ 
+ #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
+ msgid "Users"
+@@ -7582,10 +7583,8 @@ msgid "Lower Button"
+ msgstr "下のサイドスイッチ"
+ 
+ #: panels/wacom/wacom-stylus-page.ui:291
+-#, fuzzy
+-#| msgid "Lower Button"
+ msgid "Lowest Button"
+-msgstr "下のサイドスイッチ"
++msgstr "一番下のボタン"
+ 
+ #: panels/wacom/wacom-stylus-page.ui:320
+ msgid "Tip Pressure Feel"
+@@ -7653,7 +7652,7 @@ msgstr "すべての設定"
+ 
+ #: shell/cc-window.ui:234
+ msgid "Warning: Development Version"
+-msgstr ""
++msgstr "警告: 開発版です"
+ 
+ #: shell/cc-window.ui:235
+ msgid ""
+@@ -7661,6 +7660,8 @@ msgid ""
+ "may experience incorrect system behavior, data loss, and other unexpected "
+ "issues. "
+ msgstr ""
++"このバージョンの“設定”は、開発目的の場合にのみ使用してください。システムの不"
++"正動作、データ消失、その他の予期せぬ不具合が発生する可能性があります。"
+ 
+ #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+ #: shell/gnome-control-center.desktop.in.in:5