diff -Nru file-roller-3.38.1/data/meson.build file-roller-3.40.0/data/meson.build
--- file-roller-3.38.1/data/meson.build	2021-04-11 15:45:18.127801000 +0000
+++ file-roller-3.40.0/data/meson.build	2021-05-01 19:02:13.823334700 +0000
@@ -41,8 +41,8 @@
 )
 
 configure_file(
-  input : 'org.gnome.FileRoller.ArchiveManager1.service.in',
-  output : 'org.gnome.FileRoller.ArchiveManager1.service',
+  input : 'org.gnome.ArchiveManager1.service.in',
+  output : 'org.gnome.ArchiveManager1.service',
   configuration : service_data,
   install : true,
   install_dir : join_paths(datadir, 'dbus-1/services')
diff -Nru file-roller-3.38.1/data/org.gnome.ArchiveManager1.service.in file-roller-3.40.0/data/org.gnome.ArchiveManager1.service.in
--- file-roller-3.38.1/data/org.gnome.ArchiveManager1.service.in	1970-01-01 00:00:00.000000000 +0000
+++ file-roller-3.40.0/data/org.gnome.ArchiveManager1.service.in	2021-05-01 19:02:13.823334700 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.ArchiveManager1
+Exec=@bindir@/file-roller --service
diff -Nru file-roller-3.38.1/data/org.gnome.FileRoller.ArchiveManager1.service.in file-roller-3.40.0/data/org.gnome.FileRoller.ArchiveManager1.service.in
--- file-roller-3.38.1/data/org.gnome.FileRoller.ArchiveManager1.service.in	2021-04-11 15:45:18.127801000 +0000
+++ file-roller-3.40.0/data/org.gnome.FileRoller.ArchiveManager1.service.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.ArchiveManager1
-Exec=@bindir@/file-roller --service
diff -Nru file-roller-3.38.1/data/org.gnome.FileRoller.gschema.xml file-roller-3.40.0/data/org.gnome.FileRoller.gschema.xml
--- file-roller-3.38.1/data/org.gnome.FileRoller.gschema.xml	2021-04-11 15:45:18.127801000 +0000
+++ file-roller-3.40.0/data/org.gnome.FileRoller.gschema.xml	2021-05-01 19:02:13.823334700 +0000
@@ -172,6 +172,11 @@
       <summary>Encrypt the archive header</summary>
       <description>Whether to encrypt the archive header.  If the header is encrypted the password will be required to list the archive content as well.</description>
     </key>
+    <key name="expand-options" type="b">
+      <default>false</default>
+      <summary>Show/hide the extra options</summary>
+      <description>Whether to show other options.  If set the extra options will be shown.</description>
+    </key>
     <key name="volume-size" type="i">
       <default>0</default>
       <summary>Default volume size</summary>
diff -Nru file-roller-3.38.1/debian/changelog file-roller-3.40.0/debian/changelog
--- file-roller-3.38.1/debian/changelog	2021-04-12 09:45:26.000000000 +0000
+++ file-roller-3.40.0/debian/changelog	2021-06-02 11:42:28.000000000 +0000
@@ -1,3 +1,11 @@
+file-roller (3.40.0-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control.in:
+    - updated libarchive requirement
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 02 Jun 2021 13:42:28 +0200
+
 file-roller (3.38.1-1) unstable; urgency=medium
 
   * New upstream release including a fix for CVE-2020-36314
diff -Nru file-roller-3.38.1/debian/control file-roller-3.40.0/debian/control
--- file-roller-3.38.1/debian/control	2021-04-12 09:45:26.000000000 +0000
+++ file-roller-3.40.0/debian/control	2021-06-02 11:42:28.000000000 +0000
@@ -10,7 +10,7 @@
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome,
                itstool,
-               libarchive-dev (>= 3),
+               libarchive-dev (>= 3.2),
                libglib2.0-dev (>= 2.36.0),
                libgtk-3-dev (>= 3.13.2),
                libjson-glib-dev (>= 0.14),
diff -Nru file-roller-3.38.1/debian/control.in file-roller-3.40.0/debian/control.in
--- file-roller-3.38.1/debian/control.in	2021-04-12 09:45:26.000000000 +0000
+++ file-roller-3.40.0/debian/control.in	2021-06-02 11:42:28.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome,
                itstool,
-               libarchive-dev (>= 3),
+               libarchive-dev (>= 3.2),
                libglib2.0-dev (>= 2.36.0),
                libgtk-3-dev (>= 3.13.2),
                libjson-glib-dev (>= 0.14),
diff -Nru file-roller-3.38.1/help/tr/tr.po file-roller-3.40.0/help/tr/tr.po
--- file-roller-3.38.1/help/tr/tr.po	2021-04-11 15:45:18.214467500 +0000
+++ file-roller-3.40.0/help/tr/tr.po	2021-05-01 19:02:13.830001400 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: file-roller master\n"
-"POT-Creation-Date: 2021-04-04 08:33+0000\n"
+"POT-Creation-Date: 2020-08-02 11:48+0000\n"
 "PO-Revision-Date: 2020-08-02 18:37+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -29,7 +29,7 @@
 #. (itstool) path: credit/name
 #: C/archive-create.page:16 C/archive-edit.page:17 C/archive-extract.page:19
 #: C/archive-extract-advanced-options.page:16 C/archive-open.page:16
-#: C/archive-view.page:15 C/index.page:15 C/introduction.page:16
+#: C/archive-view.page:15 C/index.page:14 C/introduction.page:16
 #: C/keyboard-shortcuts.page:13 C/password-protection.page:17
 #: C/supported-formats.page:15 C/test-integrity.page:15
 #: C/troubleshooting-archive-open.page:17 C/troubleshooting-password.page:16
@@ -39,7 +39,7 @@
 #. (itstool) path: credit/name
 #: C/archive-create.page:20 C/archive-edit.page:21 C/archive-extract.page:23
 #: C/archive-extract-advanced-options.page:20 C/archive-open.page:20
-#: C/archive-view.page:19 C/index.page:19 C/introduction.page:20
+#: C/archive-view.page:19 C/index.page:18 C/introduction.page:20
 #: C/keyboard-shortcuts.page:17 C/password-protection.page:21
 #: C/supported-formats.page:19 C/test-integrity.page:19
 #: C/troubleshooting-archive-open.page:21 C/troubleshooting-password.page:20
@@ -567,45 +567,39 @@
 
 #. (itstool) path: info/title
 #: C/index.page:7
-msgctxt "link:trail"
-msgid "Archive Manager"
-msgstr "Arşiv Yöneticisi"
-
-#. (itstool) path: info/title
-#: C/index.page:8
 msgctxt "link"
 msgid "Archive Manager Help"
 msgstr "Arşiv Yöneticisi Yardımı"
 
 #. (itstool) path: info/title
-#: C/index.page:9
+#: C/index.page:8
 msgctxt "text"
 msgid "Archive Manager Help"
 msgstr "Arşiv Yöneticisi Yardımı"
 
 #. (itstool) path: info/desc
-#: C/index.page:25
+#: C/index.page:24
 msgid "Learn to use and manage compressed archives of files and folders."
 msgstr ""
 "Sıkıştırılmış dosya ve klasör arşivlerini kullanmayı ve yönetmeyi öğren."
 
 #. (itstool) path: page/title
-#: C/index.page:29
+#: C/index.page:28
 msgid "<_:media-1/> Archive Manager"
 msgstr "<_:media-1/> Arşiv Yöneticisi"
 
 #. (itstool) path: section/title
-#: C/index.page:36
+#: C/index.page:34
 msgid "Managing archives"
 msgstr "Arşivleri yönetmek"
 
 #. (itstool) path: section/title
-#: C/index.page:40
+#: C/index.page:38
 msgid "Advanced options"
 msgstr "Gelişmiş seçenekler"
 
 #. (itstool) path: section/title
-#: C/index.page:44
+#: C/index.page:42
 msgid "Troubleshooting"
 msgstr "Sorun giderme"
 
@@ -1225,3 +1219,43 @@
 "bir arşivler çalışırken yalnızca yeni eklenen dosyalara parola "
 "belirleyebilirsiniz. Bunu yapmak için <link xref=\"password-protection"
 "\">Parola koruması</link> sayfasındaki yönergeleri izleyin."
+
+#~ msgctxt "sort"
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "Name your new archive file and choose the location where it will be "
+#~ "saved, then click <gui>Create</gui> to continue."
+#~ msgstr ""
+#~ "Yeni arşiv dosyanızı adlandırın ve kaydedileceği konumu seçin, ardından "
+#~ "devam etmek için <gui>Oluştur</gui>'a tıklayın."
+
+#~ msgctxt "sort"
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgctxt "sort"
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgctxt "sort"
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgctxt "sort"
+#~ msgid "4"
+#~ msgstr "4"
+
+# At the bottom of the file chooser dialog kısmı sürümden sürüme değişiklik gösteriyor olabilir. Elimdeki sürüme göre ad ve format kısımları yanyana.
+#~ msgid ""
+#~ "At the bottom of the file chooser dialog you can choose a <gui>File "
+#~ "Format</gui> and enter a password into the <gui style=\"input\">Password</"
+#~ "gui> field in <gui>Other Options</gui>."
+#~ msgstr ""
+#~ "Dosya seçim ekranından <gui>Dosya biçimini</gui> seçebilir ve <gui>Diğer "
+#~ "Seçenekler</gui> alanından <gui style=\"input\">Parola</gui> "
+#~ "belirleyebilirsiniz."
+
+#~ msgid "<gui>Quit</gui> to close <app>Archive Manager</app>."
+#~ msgstr "<app>Arşiv Yöneticisi</app>'nden <gui>Çıkış</gui> yapın."
diff -Nru file-roller-3.38.1/meson.build file-roller-3.40.0/meson.build
--- file-roller-3.38.1/meson.build	2021-04-11 15:45:18.231134200 +0000
+++ file-roller-3.40.0/meson.build	2021-05-01 19:02:13.830001400 +0000
@@ -1,6 +1,6 @@
 project('file-roller', 'c',
   license : 'GPL2+',
-  version : '3.38.1',
+  version : '3.40.0',
   meson_version : '>=0.50'
 )
 
@@ -9,7 +9,7 @@
 nautilus_version = '>=3.28.0'
 json_glib_version = '>=0.14.0'
 libnotify_version = '>=0.4.3'
-libarchive_version = '>=3.0.0'
+libarchive_version = '>=3.1.900a'
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -31,29 +31,17 @@
 
 # Optional dependencies
 
-if get_option('nautilus-actions')
-  libnautilus_extension_dep = dependency('libnautilus-extension', version : nautilus_version, required : false)
-  build_nautilus_actions = libnautilus_extension_dep.found()
-else
-  build_nautilus_actions = false
-endif
+libnautilus_extension_dep = dependency('libnautilus-extension', version : nautilus_version, required : get_option('nautilus-actions'))
+build_nautilus_actions = libnautilus_extension_dep.found()
 
 libjson_glib_dep = dependency('json-glib-1.0', version : json_glib_version, required : false)
 use_json_glib = libjson_glib_dep.found()
  
-if get_option('notification')
-  libnotify_dep = dependency('libnotify', version : libnotify_version, required : false)
-  use_libnotify = libnotify_dep.found()
-else
-  use_libnotify = false
-endif
+libnotify_dep = dependency('libnotify', version : libnotify_version, required : get_option('notification'))
+use_libnotify = libnotify_dep.found()
 
-if get_option('libarchive')
-  libarchive_dep = dependency('libarchive', version : libarchive_version, required : false)
-  use_libarchive = libarchive_dep.found()
-else
-  use_libarchive = false
-endif
+libarchive_dep = dependency('libarchive', version : libarchive_version, required : get_option('libarchive'))
+use_libarchive = libarchive_dep.found()
 
 have_mkdtemp = c_comp.has_function('mkdtemp')
 
@@ -107,7 +95,7 @@
 
 # C args
 
-c_args = []
+c_args = [ '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38' ]
 if get_option('buildtype').contains('debug')
   test_args = [ 
     '-Wall', 
diff -Nru file-roller-3.38.1/meson_options.txt file-roller-3.40.0/meson_options.txt
--- file-roller-3.38.1/meson_options.txt	2021-04-11 15:45:18.231134200 +0000
+++ file-roller-3.40.0/meson_options.txt	2021-05-01 19:02:13.830001400 +0000
@@ -5,14 +5,14 @@
 )
 
 option('nautilus-actions',
-  type : 'boolean', 
-  value : true, 
+  type : 'feature',
+  value : 'auto',
   description : 'Build the nautilus context menu actions'
 )
 
 option('notification',
-  type : 'boolean', 
-  value : true, 
+  type : 'feature',
+  value : 'auto',
   description : 'Enable operation completion notification'
 )
 
@@ -23,8 +23,8 @@
 )
 
 option('libarchive',
-  type : 'boolean', 
-  value : true, 
+  type : 'feature',
+  value : 'auto',
   description : 'Enable code that requires libarchive'
 )
 
diff -Nru file-roller-3.38.1/nautilus/nautilus-fileroller.c file-roller-3.40.0/nautilus/nautilus-fileroller.c
--- file-roller-3.38.1/nautilus/nautilus-fileroller.c	2021-04-11 15:45:18.231134200 +0000
+++ file-roller-3.40.0/nautilus/nautilus-fileroller.c	2021-05-01 19:02:13.830001400 +0000
@@ -128,8 +128,6 @@
 		{ "application/x-lhz", TRUE },
 		{ "application/x-lzop", TRUE },
 		{ "application/x-ms-wim", TRUE },
-		{ "application/x-rar", TRUE },
-		{ "application/x-rar-compressed", TRUE },
 		{ "application/x-rpm", TRUE },
 		{ "application/x-rzip", TRUE },
 		{ "application/x-stuffit", TRUE },
diff -Nru file-roller-3.38.1/NEWS file-roller-3.40.0/NEWS
--- file-roller-3.38.1/NEWS	2021-04-11 15:45:18.127801000 +0000
+++ file-roller-3.40.0/NEWS	2021-05-01 19:02:13.820001400 +0000
@@ -1,10 +1,32 @@
-version 3.38.1
+version 3.40.0
 --------------
 
  Bugs fixed:
 
+  * Error when creating an archive with no extension (!99)
+  * Fixed encrypted files emblem (!120)
+  * Open destination: fixed when using junk_paths (!112)
+
+ New or updated application translations:
+
+  * Romanian (Florentina Mușat)
+  * Ukrainian (Yuri Chornoivan)
+
+version 3.39.1
+--------------
+ New features and user visibile changes:
+
+  * Let nautilus handle properly rar files. (Simental Magana, Marcos)
+    (!1813)
+  * Remember If Showing Other Options. (programmer-ceds)
+  * Action Enter key in password field. (programmer-ceds)
+  * libarchive: multicore xz compression. (Julian Groß)
+
+ Bugs fixed:
+
   * libarchive: Skip files with symlinks in parents. (Ondrej Holy) (!108)
   * Fix use-after-free in error message reporting. (Badel2)
+  * Install D-Bus service file to correct location. (Jan Alexander Steffens)
 
  New or updated application translations:
 
diff -Nru file-roller-3.38.1/po/ro.po file-roller-3.40.0/po/ro.po
--- file-roller-3.38.1/po/ro.po	2021-04-11 15:45:18.361134000 +0000
+++ file-roller-3.40.0/po/ro.po	2021-05-01 19:02:13.846668000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: file-roller\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/file-roller/issues\n"
-"POT-Creation-Date: 2020-07-19 11:13+0000\n"
-"PO-Revision-Date: 2020-07-19 14:55+0300\n"
+"POT-Creation-Date: 2021-04-11 16:09+0000\n"
+"PO-Revision-Date: 2021-04-25 19:50+0200\n"
 "Last-Translator: Florentina Mușat <florentina.musat.28@gmail.com>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
@@ -21,7 +21,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.FileRoller.appdata.xml.in:9
@@ -210,27 +210,37 @@
 msgstr "Recreează dosarele stocate în arhivă"
 
 #: data/org.gnome.FileRoller.gschema.xml:177
+msgid "Show/hide the extra options"
+msgstr "Arată/ascunde opțiunile extra"
+
+#: data/org.gnome.FileRoller.gschema.xml:178
+msgid "Whether to show other options. If set the extra options will be shown."
+msgstr ""
+"Dacă să se afișeze alte opțiuni. Dacă este stabilit opțiuni extra vor fi "
+"afișate."
+
+#: data/org.gnome.FileRoller.gschema.xml:182
 msgid "Default volume size"
 msgstr "Mărimea volumului implicită"
 
-#: data/org.gnome.FileRoller.gschema.xml:178
+#: data/org.gnome.FileRoller.gschema.xml:183
 msgid "The default size for volumes."
 msgstr "Dimensiunea implicită pentru volume."
 
-#: nautilus/nautilus-fileroller.c:264
+#: nautilus/nautilus-fileroller.c:262
 msgid "Extract Here"
 msgstr "Dezarhivează aici"
 
 #. Translators: the current position is the current folder
-#: nautilus/nautilus-fileroller.c:266
+#: nautilus/nautilus-fileroller.c:264
 msgid "Extract the selected archive to the current position"
 msgstr "Dezarhivează arhiva selectată în poziția curentă"
 
-#: nautilus/nautilus-fileroller.c:283
+#: nautilus/nautilus-fileroller.c:281
 msgid "Extract To…"
 msgstr "Dezarhivează în…"
 
-#: nautilus/nautilus-fileroller.c:284
+#: nautilus/nautilus-fileroller.c:282
 msgid "Extract the selected archive"
 msgstr "Dezarhivează arhiva selectată"
 
@@ -310,7 +320,7 @@
 msgid "Compress"
 msgstr "Comprimă"
 
-#: src/dlg-extract.c:95 src/fr-window.c:6920
+#: src/dlg-extract.c:95 src/fr-window.c:6921
 #, c-format
 msgid ""
 "Destination folder “%s” does not exist.\n"
@@ -321,17 +331,17 @@
 "\n"
 "Doriți să-l creați?"
 
-#: src/dlg-extract.c:103 src/fr-window.c:6928
+#: src/dlg-extract.c:103 src/fr-window.c:6929
 msgid "Create _Folder"
 msgstr "Creează _dosar"
 
 #: src/dlg-extract.c:122 src/dlg-extract.c:139 src/dlg-extract.c:166
-#: src/fr-window.c:4410 src/fr-window.c:6844 src/fr-window.c:6849
-#: src/fr-window.c:6949 src/fr-window.c:6968 src/fr-window.c:6973
+#: src/fr-window.c:4410 src/fr-window.c:6845 src/fr-window.c:6850
+#: src/fr-window.c:6950 src/fr-window.c:6969 src/fr-window.c:6974
 msgid "Extraction not performed"
 msgstr "Dezarhivarea nu a avut loc"
 
-#: src/dlg-extract.c:123 src/fr-window.c:6945
+#: src/dlg-extract.c:123 src/fr-window.c:6946
 #, c-format
 msgid "Could not create the destination folder: %s."
 msgstr "Nu s-a putut crea dosarul destinație: %s."
@@ -354,7 +364,7 @@
 
 #: src/dlg-package-installer.c:292 src/dlg-package-installer.c:301
 #: src/dlg-package-installer.c:328 src/fr-archive.c:747 src/fr-window.c:4077
-#: src/fr-window.c:7651 src/fr-window.c:8008 src/fr-window.c:9523
+#: src/fr-window.c:7652 src/fr-window.c:8009 src/fr-window.c:9524
 msgid "Archive type not supported."
 msgstr "Tip nesuportat de arhivă."
 
@@ -436,7 +446,7 @@
 "Mișu Moldovan <dumol@gnome.ro>\n"
 "Mugurel Tudor <mugurelu@gnome.ro>\n"
 "Bogdan Mințoi <mintoi.bogdan@gmail.com>\n"
-"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
+"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2021\n"
 "Florentina Mușat <florentina [dot] musat [dot] 28 [at] gmail [dot] com>, "
 "2019-2020\n"
 "\n"
@@ -517,7 +527,7 @@
 msgid "This archive type cannot be modified"
 msgstr "Tipul arhivei nu poate fi modificat"
 
-#: src/fr-archive.c:1862 src/fr-new-archive-dialog.c:478
+#: src/fr-archive.c:1862 src/fr-new-archive-dialog.c:480
 msgid "You can’t add an archive to itself."
 msgstr "Nu puteți adăuga o arhivă la ea însăși."
 
@@ -565,42 +575,42 @@
 msgid "Could not load the location"
 msgstr "Nu s-a putut încărca locația"
 
-#: src/fr-new-archive-dialog.c:352 src/fr-new-archive-dialog.c:371
-#: src/fr-new-archive-dialog.c:387 src/fr-new-archive-dialog.c:436
-#: src/fr-new-archive-dialog.c:454 src/fr-new-archive-dialog.c:476
+#: src/fr-new-archive-dialog.c:354 src/fr-new-archive-dialog.c:373
+#: src/fr-new-archive-dialog.c:389 src/fr-new-archive-dialog.c:438
+#: src/fr-new-archive-dialog.c:456 src/fr-new-archive-dialog.c:478
 #: src/fr-window.c:3034
 msgid "Could not create the archive"
 msgstr "Nu s-a putut creea arhiva"
 
-#: src/fr-new-archive-dialog.c:354 src/fr-new-archive-dialog.c:373
+#: src/fr-new-archive-dialog.c:356 src/fr-new-archive-dialog.c:375
 msgid "You have to specify an archive name."
 msgstr "Trebuie să specificați un nume pentru arhivă."
 
-#: src/fr-new-archive-dialog.c:438
+#: src/fr-new-archive-dialog.c:440
 msgid "You don’t have permission to create an archive in this folder"
 msgstr "Nu aveți drepturile necesare creării unei arhive în acest dosar"
 
 #. Translators: the name references to a filename.  This message can appear when renaming a file.
-#: src/fr-new-archive-dialog.c:456 src/fr-window.c:8322
+#: src/fr-new-archive-dialog.c:458 src/fr-window.c:8323
 msgid "New name is the same as old one, please type other name."
 msgstr "Noul nume este identic cu cel vechi, alegeți un alt nume."
 
-#: src/fr-new-archive-dialog.c:499
+#: src/fr-new-archive-dialog.c:501
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Un fișier cu numele „%s” există deja.  Doriți să-l înlocuiți?"
 
-#: src/fr-new-archive-dialog.c:500
+#: src/fr-new-archive-dialog.c:502
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "Fișierul există deja în „%s”.  Înlocuirea sa va suprascrie conținutul."
 
-#: src/fr-new-archive-dialog.c:506 src/fr-window.c:6764
+#: src/fr-new-archive-dialog.c:508 src/fr-window.c:6765
 msgid "_Replace"
 msgstr "Înlo_cuiește"
 
-#: src/fr-new-archive-dialog.c:521
+#: src/fr-new-archive-dialog.c:523
 msgid "Could not delete the old archive."
 msgstr "Nu s-a putut șterge vechea arhivă."
 
@@ -791,8 +801,8 @@
 msgid "Test Result"
 msgstr "Rezultatul testului"
 
-#: src/fr-window.c:4202 src/fr-window.c:9006 src/fr-window.c:9040
-#: src/fr-window.c:9320
+#: src/fr-window.c:4202 src/fr-window.c:9007 src/fr-window.c:9041
+#: src/fr-window.c:9321
 msgid "Could not perform the operation"
 msgstr "Nu s-a putut efectua operațiunea"
 
@@ -812,7 +822,7 @@
 msgid "Create _Archive"
 msgstr "Creează _arhivă"
 
-#: src/fr-window.c:4288 src/fr-window.c:7459
+#: src/fr-window.c:4288 src/fr-window.c:7460
 msgid "New Archive"
 msgstr "Arhivă nouă"
 
@@ -882,48 +892,48 @@
 msgid "Open"
 msgstr "Deschide"
 
-#: src/fr-window.c:6752
+#: src/fr-window.c:6753
 #, c-format
 msgid "Replace file “%s”?"
 msgstr "Înlocuiesc fișierul „%s”?"
 
-#: src/fr-window.c:6755
+#: src/fr-window.c:6756
 #, c-format
 msgid "Another file with the same name already exists in “%s”."
 msgstr "Există deja un fișier cu același nume în „%s”."
 
-#: src/fr-window.c:6761
+#: src/fr-window.c:6762
 msgid "Replace _All"
 msgstr "Înl_ocuiește tot"
 
-#: src/fr-window.c:6762
+#: src/fr-window.c:6763
 msgid "Replace _Nothing"
 msgstr "Nu înlocui _nimic"
 
-#: src/fr-window.c:6763
+#: src/fr-window.c:6764
 msgid "_Skip"
 msgstr "_Omite"
 
-#: src/fr-window.c:7643 src/fr-window.c:8000
+#: src/fr-window.c:7644 src/fr-window.c:8001
 #, c-format
 msgid "Could not save the archive “%s”"
 msgstr "Nu s-a putut salva arhiva „%s”"
 
-#: src/fr-window.c:7770
+#: src/fr-window.c:7771
 msgid "Save"
 msgstr "Salvează"
 
-#: src/fr-window.c:8094
+#: src/fr-window.c:8095
 msgid "Last Output"
 msgstr "Ultima ieșire"
 
 #. Translators: the name references to a filename.  This message can appear when renaming a file.
-#: src/fr-window.c:8317
+#: src/fr-window.c:8318
 msgid "New name is void, please type a name."
 msgstr "Noul nume este gol, alegeți un nume."
 
 #. Translators: the %s references to a filename.  This message can appear when renaming a file.
-#: src/fr-window.c:8327
+#: src/fr-window.c:8328
 #, c-format
 msgid ""
 "Name “%s” is not valid because it contains at least one of the following "
@@ -932,7 +942,7 @@
 "Numele „%s” nu este valid deoarece conține cel puțin unul din următoarele "
 "caracterele: %s, introduceți alt nume."
 
-#: src/fr-window.c:8363
+#: src/fr-window.c:8364
 #, c-format
 msgid ""
 "A folder named “%s” already exists.\n"
@@ -943,11 +953,11 @@
 "\n"
 "%s"
 
-#: src/fr-window.c:8363 src/fr-window.c:8365
+#: src/fr-window.c:8364 src/fr-window.c:8366
 msgid "Please use a different name."
 msgstr "Folosiți un nume diferit."
 
-#: src/fr-window.c:8365
+#: src/fr-window.c:8366
 #, c-format
 msgid ""
 "A file named “%s” already exists.\n"
@@ -958,51 +968,51 @@
 "\n"
 "%s"
 
-#: src/fr-window.c:8435
+#: src/fr-window.c:8436
 msgid "Rename"
 msgstr "Redenumește"
 
-#: src/fr-window.c:8436
+#: src/fr-window.c:8437
 msgid "_New folder name:"
 msgstr "_Nume dosar nou:"
 
-#: src/fr-window.c:8436
+#: src/fr-window.c:8437
 msgid "_New file name:"
 msgstr "_Nume fișier nou:"
 
-#: src/fr-window.c:8440
+#: src/fr-window.c:8441
 msgid "_Rename"
 msgstr "_Redenumește"
 
-#: src/fr-window.c:8457 src/fr-window.c:8475
+#: src/fr-window.c:8458 src/fr-window.c:8476
 msgid "Could not rename the folder"
 msgstr "Nu s-a putut redenumi dosarul"
 
-#: src/fr-window.c:8457 src/fr-window.c:8475
+#: src/fr-window.c:8458 src/fr-window.c:8476
 msgid "Could not rename the file"
 msgstr "Nu s-a putut redenumi fișierul"
 
 #. Translators: %s are archive filenames
-#: src/fr-window.c:8913
+#: src/fr-window.c:8914
 #, c-format
 msgid "Moving the files from “%s” to “%s”"
 msgstr "Se mută fișierele de la „%s” la „%s”"
 
 #. Translators: %s are archive filenames
-#: src/fr-window.c:8916
+#: src/fr-window.c:8917
 #, c-format
 msgid "Copying the files from “%s” to “%s”"
 msgstr "Se copiază fișierele de la „%s” la „%s”"
 
-#: src/fr-window.c:8967
+#: src/fr-window.c:8968
 msgid "Paste Selection"
 msgstr "Lipește selecția"
 
-#: src/fr-window.c:8968
+#: src/fr-window.c:8969
 msgid "_Destination folder:"
 msgstr "_Dosarul destinație:"
 
-#: src/fr-window.c:8972 src/ui/app-menubar.ui:61
+#: src/fr-window.c:8973 src/ui/app-menubar.ui:61
 msgid "_Paste"
 msgstr "Li_pește"
 
@@ -1398,25 +1408,25 @@
 msgid "Location"
 msgstr "Locație"
 
-#: src/ui/new-archive-dialog.ui:193
+#: src/ui/new-archive-dialog.ui:194
 msgid "_Encrypt the file list too"
 msgstr "Cript_ează și lista de fișiere"
 
 #. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte.
-#: src/ui/new-archive-dialog.ui:215
+#: src/ui/new-archive-dialog.ui:216
 msgid "Split into _volumes of"
 msgstr "Împarte în _volume de"
 
-#: src/ui/new-archive-dialog.ui:236
+#: src/ui/new-archive-dialog.ui:237
 msgid "10,0"
 msgstr "10,0"
 
 #. MB means megabytes
-#: src/ui/new-archive-dialog.ui:253
+#: src/ui/new-archive-dialog.ui:254
 msgid "MB"
 msgstr "MB"
 
-#: src/ui/new-archive-dialog.ui:276
+#: src/ui/new-archive-dialog.ui:277
 msgid "_Other Options"
 msgstr "Alte _opțiuni"
 
diff -Nru file-roller-3.38.1/po/uk.po file-roller-3.40.0/po/uk.po
--- file-roller-3.38.1/po/uk.po	2021-04-11 15:45:18.391134000 +0000
+++ file-roller-3.40.0/po/uk.po	2021-05-01 19:02:13.850001300 +0000
@@ -4,22 +4,21 @@
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2004-2008.
 # wanderlust <wanderlust@ukr.net>, 2009.
 # Daniel Korostil <ted.korostiled@gmail.com>, 2013, 2014, 2015, 2016.
-# Yuri Chornoivan <yurchor@ukr.net>, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: file-roller\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/file-roller/issues\n"
-"POT-Creation-Date: 2020-08-09 19:38+0000\n"
-"PO-Revision-Date: 2020-08-22 11:52+0300\n"
+"POT-Creation-Date: 2021-04-11 16:09+0000\n"
+"PO-Revision-Date: 2021-04-18 10:26+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 20.11.70\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 20.12.0\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.FileRoller.appdata.xml.in:9
@@ -206,27 +205,38 @@
 msgstr "Відновити теки, збережені в архіві"
 
 #: data/org.gnome.FileRoller.gschema.xml:177
+#| msgctxt "shortcut window"
+#| msgid "Stop the operation"
+msgid "Show/hide the extra options"
+msgstr "Показати/приховати додаткові пункти"
+
+#: data/org.gnome.FileRoller.gschema.xml:178
+msgid "Whether to show other options. If set the extra options will be shown."
+msgstr ""
+"Чи показувати інші пункти. Якщо встановлено, інші пункти не буде показано."
+
+#: data/org.gnome.FileRoller.gschema.xml:182
 msgid "Default volume size"
 msgstr "Типовий розмір тому"
 
-#: data/org.gnome.FileRoller.gschema.xml:178
+#: data/org.gnome.FileRoller.gschema.xml:183
 msgid "The default size for volumes."
 msgstr "Типовий розмір для томів."
 
-#: nautilus/nautilus-fileroller.c:264
+#: nautilus/nautilus-fileroller.c:262
 msgid "Extract Here"
 msgstr "Розпакувати сюди"
 
 #. Translators: the current position is the current folder
-#: nautilus/nautilus-fileroller.c:266
+#: nautilus/nautilus-fileroller.c:264
 msgid "Extract the selected archive to the current position"
 msgstr "Розпакувати вибраній архів у поточній позиції"
 
-#: nautilus/nautilus-fileroller.c:283
+#: nautilus/nautilus-fileroller.c:281
 msgid "Extract To…"
 msgstr "Розпакувати до…"
 
-#: nautilus/nautilus-fileroller.c:284
+#: nautilus/nautilus-fileroller.c:282
 msgid "Extract the selected archive"
 msgstr "Розпакувати виділений архів"
 
@@ -500,7 +510,7 @@
 msgid "This archive type cannot be modified"
 msgstr "Тип архіву не може бути змінений"
 
-#: src/fr-archive.c:1862 src/fr-new-archive-dialog.c:478
+#: src/fr-archive.c:1862 src/fr-new-archive-dialog.c:480
 msgid "You can’t add an archive to itself."
 msgstr "Не можна додавати архів до самого себе."
 
@@ -548,42 +558,42 @@
 msgid "Could not load the location"
 msgstr "Неможливо завантажити цю адресу"
 
-#: src/fr-new-archive-dialog.c:352 src/fr-new-archive-dialog.c:371
-#: src/fr-new-archive-dialog.c:387 src/fr-new-archive-dialog.c:436
-#: src/fr-new-archive-dialog.c:454 src/fr-new-archive-dialog.c:476
+#: src/fr-new-archive-dialog.c:354 src/fr-new-archive-dialog.c:373
+#: src/fr-new-archive-dialog.c:389 src/fr-new-archive-dialog.c:438
+#: src/fr-new-archive-dialog.c:456 src/fr-new-archive-dialog.c:478
 #: src/fr-window.c:3034
 msgid "Could not create the archive"
 msgstr "Не вдалось створити архів"
 
-#: src/fr-new-archive-dialog.c:354 src/fr-new-archive-dialog.c:373
+#: src/fr-new-archive-dialog.c:356 src/fr-new-archive-dialog.c:375
 msgid "You have to specify an archive name."
 msgstr "Необхідно вказати назву архіву."
 
-#: src/fr-new-archive-dialog.c:438
+#: src/fr-new-archive-dialog.c:440
 msgid "You don’t have permission to create an archive in this folder"
 msgstr "У вас недостатньо прав для створення архівів у цій теці"
 
 #. Translators: the name references to a filename.  This message can appear when renaming a file.
-#: src/fr-new-archive-dialog.c:456 src/fr-window.c:8323
+#: src/fr-new-archive-dialog.c:458 src/fr-window.c:8323
 msgid "New name is the same as old one, please type other name."
 msgstr "Нова назва така ж як і стара, введіть інакшу."
 
-#: src/fr-new-archive-dialog.c:499
+#: src/fr-new-archive-dialog.c:501
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Файл з назвою «%s» вже існує. Замінити його?"
 
-#: src/fr-new-archive-dialog.c:500
+#: src/fr-new-archive-dialog.c:502
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "Файл уже існує в «%s». Замінювання призведе до втрати вмісту."
 
-#: src/fr-new-archive-dialog.c:506 src/fr-window.c:6765
+#: src/fr-new-archive-dialog.c:508 src/fr-window.c:6765
 msgid "_Replace"
 msgstr "_Замінити"
 
-#: src/fr-new-archive-dialog.c:521
+#: src/fr-new-archive-dialog.c:523
 msgid "Could not delete the old archive."
 msgstr "Не вдалось видалити старий архів."
 
@@ -1379,25 +1389,25 @@
 msgid "Location"
 msgstr "Шлях"
 
-#: src/ui/new-archive-dialog.ui:193
+#: src/ui/new-archive-dialog.ui:194
 msgid "_Encrypt the file list too"
 msgstr "_Шифрувати також список файлів"
 
 #. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte.
-#: src/ui/new-archive-dialog.ui:215
+#: src/ui/new-archive-dialog.ui:216
 msgid "Split into _volumes of"
 msgstr "Розділити на _томи розміром"
 
-#: src/ui/new-archive-dialog.ui:236
+#: src/ui/new-archive-dialog.ui:237
 msgid "10,0"
 msgstr "10,0"
 
 #. MB means megabytes
-#: src/ui/new-archive-dialog.ui:253
+#: src/ui/new-archive-dialog.ui:254
 msgid "MB"
 msgstr "МБ"
 
-#: src/ui/new-archive-dialog.ui:276
+#: src/ui/new-archive-dialog.ui:277
 msgid "_Other Options"
 msgstr "_Інші параметри"
 
diff -Nru file-roller-3.38.1/README.md file-roller-3.40.0/README.md
--- file-roller-3.38.1/README.md	2021-04-11 15:45:18.127801000 +0000
+++ file-roller-3.40.0/README.md	2021-05-01 19:02:13.820001400 +0000
@@ -76,7 +76,7 @@
 * glib >= 2.38
 * gtk+ >= 3.22.0
 * libnautilus-extension >= 3.28.0 (optional)
-* libarchive >= 3.0.0 (optional)
+* libarchive >= 3.1.900a (optional)
 
 ## Install
 
diff -Nru file-roller-3.38.1/src/fr-archive.c file-roller-3.40.0/src/fr-archive.c
--- file-roller-3.38.1/src/fr-archive.c	2021-04-11 15:45:18.417800700 +0000
+++ file-roller-3.40.0/src/fr-archive.c	2021-05-01 19:02:13.853334700 +0000
@@ -603,6 +603,9 @@
 						mime_type,
 						FR_ARCHIVE_CAN_WRITE);
 
+	if (archive == NULL)
+		return NULL;
+
 	parent = g_file_get_parent (file);
 	archive->priv->have_write_permissions = _g_file_check_permissions (parent, W_OK);
 	archive->read_only = ! fr_archive_is_capable_of (archive, FR_ARCHIVE_CAN_WRITE) || ! archive->priv->have_write_permissions;
@@ -725,7 +728,7 @@
 	uri = g_file_get_uri (open_data->file);
 	local_mime_type = g_content_type_guess (uri, (guchar *) open_data->buffer, open_data->buffer_size, &result_uncertain);
 	if (! result_uncertain) {
-		const char const *mime_type_from_filename;
+		const char *mime_type_from_filename;
 
 		/* for example: "application/x-lrzip" --> "application/x-lrzip-compressed-tar" */
 		mime_type_from_filename = _g_mime_type_get_from_filename (open_data->file);
diff -Nru file-roller-3.38.1/src/fr-archive-libarchive.c file-roller-3.40.0/src/fr-archive-libarchive.c
--- file-roller-3.38.1/src/fr-archive-libarchive.c	2021-04-11 15:45:18.414467300 +0000
+++ file-roller-3.40.0/src/fr-archive-libarchive.c	2021-05-01 19:02:13.853334700 +0000
@@ -1448,6 +1448,12 @@
 		}
 		if (compression_level != NULL)
 			archive_write_set_filter_option (a, NULL, "compression-level", compression_level);
+
+		/* set the amount of threads */
+
+		if (archive_filter == ARCHIVE_FILTER_XZ) {
+			archive_write_set_filter_option (a, NULL, "threads", fr_get_thread_count());
+                }
 	}
 }
 
diff -Nru file-roller-3.38.1/src/fr-command-cpio.c file-roller-3.40.0/src/fr-command-cpio.c
--- file-roller-3.38.1/src/fr-command-cpio.c	2021-04-11 15:45:18.421134000 +0000
+++ file-roller-3.40.0/src/fr-command-cpio.c	2021-05-01 19:02:13.856668000 +0000
@@ -199,7 +199,7 @@
                 fr_process_set_working_dir (comm->process, dest_dir);
 	fr_process_add_arg (comm->process, "-c");
 
-	cmd = g_string_new ("cpio -idu --no-absolute-filenames ");
+	cmd = g_string_new (CPIO_PATH " -idu --no-absolute-filenames ");
 	for (scan = file_list; scan; scan = scan->next) {
 		char *filepath = scan->data;
 		char *filename;
diff -Nru file-roller-3.38.1/src/fr-new-archive-dialog.c file-roller-3.40.0/src/fr-new-archive-dialog.c
--- file-roller-3.38.1/src/fr-new-archive-dialog.c	2021-04-11 15:45:18.427800700 +0000
+++ file-roller-3.40.0/src/fr-new-archive-dialog.c	2021-05-01 19:02:13.860001300 +0000
@@ -87,6 +87,7 @@
 	self = FR_NEW_ARCHIVE_DIALOG (widget);
 
 	g_settings_set_boolean (self->settings, PREF_NEW_ENCRYPT_HEADER, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton"))));
+	g_settings_set_boolean (self->settings, PREF_NEW_EXPAND_OPTIONS, gtk_expander_get_expanded (GTK_EXPANDER (GET_WIDGET ("other_options_expander"))));
 	g_settings_set_int (self->settings, PREF_NEW_VOLUME_SIZE, gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("volume_spinbutton"))) * MEGABYTE);
 
 	n_format = get_selected_format (self);
@@ -250,7 +251,8 @@
 		folder = _g_file_get_home ();
 	gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (GET_WIDGET ("parent_filechooserbutton")), folder, NULL);
 
-	gtk_expander_set_expanded (GTK_EXPANDER (GET_WIDGET ("other_options_expander")), FALSE);
+	gtk_expander_set_expanded (GTK_EXPANDER (GET_WIDGET ("other_options_expander")),
+				      g_settings_get_boolean (self->settings, PREF_NEW_EXPAND_OPTIONS));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton")),
 				      g_settings_get_boolean (self->settings, PREF_NEW_ENCRYPT_HEADER));
diff -Nru file-roller-3.38.1/src/fr-window.c file-roller-3.40.0/src/fr-window.c
--- file-roller-3.38.1/src/fr-window.c	2021-04-11 15:45:18.427800700 +0000
+++ file-roller-3.40.0/src/fr-window.c	2021-05-01 19:02:13.860001300 +0000
@@ -1527,7 +1527,7 @@
 
 	emblem_name = NULL;
 	if (fdata->encrypted)
-		emblem_name = "emblem-nowrite";
+		emblem_name = "emblem-readonly";
 
 	if (emblem_name == NULL)
 		return NULL;
@@ -6519,16 +6519,16 @@
 	_g_clear_object (&window->priv->last_extraction_destination);
 	window->priv->last_extraction_destination = _g_object_ref (fr_archive_get_last_extraction_destination (window->archive));
 
-	if (ask_to_open_destination) {
+	_g_object_list_unref (window->priv->last_extraction_files_first_level);
+	window->priv->last_extraction_files_first_level = NULL;
+
+	if (ask_to_open_destination && ! edata->junk_paths) {
 		/* collect the files to show in the file manager */
 
 		GHashTable *names_hash;
 		gboolean    stop = FALSE;
 		int         i;
 
-		_g_object_list_unref (window->priv->last_extraction_files_first_level);
-		window->priv->last_extraction_files_first_level = NULL;
-
 		names_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 		for (i = 0; ! stop && (i < window->archive->files->len); i++) {
 			FileData *fdata = g_ptr_array_index (window->archive->files, i);
diff -Nru file-roller-3.38.1/src/glib-utils.c file-roller-3.40.0/src/glib-utils.c
--- file-roller-3.38.1/src/glib-utils.c	2021-04-11 15:45:18.427800700 +0000
+++ file-roller-3.40.0/src/glib-utils.c	2021-05-01 19:02:13.860001300 +0000
@@ -1552,6 +1552,20 @@
 	return g_strndup (f_start + 1, f_end - f_start);
 }
 
+/* threading */
+
+gchar *
+fr_get_thread_count (void)
+{
+	gchar *cpus;
+	if (g_get_num_processors() >= 8)
+		cpus = g_strdup_printf("%u", g_get_num_processors() - 2);
+	else if (g_get_num_processors() >= 4)
+		cpus = g_strdup_printf("%u", g_get_num_processors() - 1);
+	else
+		cpus = g_strdup_printf("%u", g_get_num_processors());
+	return cpus;
+}
 
 /* debug */
 
diff -Nru file-roller-3.38.1/src/glib-utils.h file-roller-3.40.0/src/glib-utils.h
--- file-roller-3.38.1/src/glib-utils.h	2021-04-11 15:45:18.427800700 +0000
+++ file-roller-3.40.0/src/glib-utils.h	2021-05-01 19:02:13.860001300 +0000
@@ -205,6 +205,10 @@
 						    int                  start_from,
 						    int                  field_n);
 
+/* threading */
+
+gchar * 	   fr_get_thread_count 		   (void);
+
 /* debug */
 
 void                debug                          (const char          *file,
diff -Nru file-roller-3.38.1/src/preferences.h file-roller-3.40.0/src/preferences.h
--- file-roller-3.38.1/src/preferences.h	2021-04-11 15:45:18.431134000 +0000
+++ file-roller-3.40.0/src/preferences.h	2021-05-01 19:02:13.863334700 +0000
@@ -69,6 +69,7 @@
 #define PREF_NEW_DEFAULT_EXTENSION        "default-extension"
 #define PREF_NEW_ENCRYPT_HEADER           "encrypt-header"
 #define PREF_NEW_VOLUME_SIZE              "volume-size"
+#define PREF_NEW_EXPAND_OPTIONS		  "expand-options"
 
 #define NAUTILUS_SCHEMA                   "org.gnome.nautilus.preferences"
 #define NAUTILUS_CLICK_POLICY             "click-policy"