Zander Brown · Trần Ngọc Quân · Efstathios Iosifidis · Boyuan Yang · Yosef Or Boczko · Yaron Shahrabani
--- a/NEWS
+++ b/NEWS
-40.0 - March 18, 2020
+40.1 - May 1, 2021
+==================
+
+Kai Lüke:
+ * restore: do not wipe disk after error if it's a dismissed auth error
+
+sitting33:
+ * Make SMART attributes view expand vertically
+
+Updated translations:
+ * Boyuan Yang (zh_CN), Efstathios Iosifidis (el), Nathan Follens (nl),
+   Ngọc Quân Trần (vi), Yaron Shahrabani (he), Yosef Or Boczko (he),
+   Zander Brown (en_GB)
+
+40.0 - March 18, 2021
 =====================

 Updated translations:
 * A S Alam (pa), Dušan Kazik (sk), Milo Casagrande (it), Piotr Drąg (pl)

-40.rc - March 13, 2020
+40.rc - March 13, 2021
 ======================

 Updated translations:
@@ -15,7 +29,7 @@ Updated translations:
   Marek Černocký (cs), Matej Urbančič (sl), Rafael Fontenelle (pt_BR),
   Rūdolfs Mazurs (lv), Seong-ho Cho (ko), Марко Костић (sr)

-40.beta - February 11, 2020
+40.beta - February 11, 2021
 ===========================

 Bastien Nocera:
@@ -50,7 +64,7 @@ Updated translations:
   Luna Jernberg (sv), Matej Urbančič (sl), Yuri Chornoivan (uk)


-40.alpha - January 9, 2020
+40.alpha - January 9, 2021
 ==========================

 Christopher Davis:

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-disk-utility', 'c',
-  version: '40.0',
+  version: '40.1',
  license: 'GPL2.0',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.50.0',

--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/src/disks/gdurestorediskimagedialog.c
+++ b/src/disks/gdurestorediskimagedialog.c
@@ -844,6 +844,13 @@ copy_thread_func (gpointer user_data)

  if (error != NULL)
    {
+      gboolean wipe_after_error = TRUE;
+
+      if (error->domain == UDISKS_ERROR && error->code == UDISKS_ERROR_NOT_AUTHORIZED_DISMISSED)
+        {
+          wipe_after_error = FALSE;
+        }
+
      /* show error in GUI */
      if (!(error->domain == G_IO_ERROR && error->code == G_IO_ERROR_CANCELLED))
        {
@@ -853,7 +860,7 @@ copy_thread_func (gpointer user_data)
      g_clear_error (&error);

      /* Wipe the device */
-      if (!udisks_block_call_format_sync (data->block,
+      if (wipe_after_error && !udisks_block_call_format_sync (data->block,
                                          "empty",
                                          g_variant_new ("a{sv}", NULL), /* options */
                                          NULL, /* cancellable */

--- a/src/disks/ui/smart-dialog.ui
+++ b/src/disks/ui/smart-dialog.ui
@@ -86,7 +86,6 @@
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                    <property name="row_spacing">10</property>
                    <property name="column_spacing">10</property>
                    <child>
@@ -335,6 +334,7 @@
                        <property name="can_focus">True</property>
                        <property name="rules_hint">True</property>
                        <property name="enable_search">False</property>
+                        <property name="vexpand">True</property>
                        <child internal-child="selection">
                          <object class="GtkTreeSelection" id="treeview-selection1"/>
                        </child>