From 6ced991d98da9645b97ed6cf2556ae2a76085116 Mon Sep 17 00:00:00 2001 From: Jertzukka Date: Thu, 1 Jun 2023 10:01:53 +0300 Subject: Fix issues launching fsck via terminal on Linux (#1086) Currently on a system without xterm or konsole (like fresh Ubuntu install) the fsck check will not launch. Added gnome-terminal as an alternative and fixed an issue where konsole will always error out as --title and --caption are no longer valid arguments. Previously the error message was simply "xterm not found", so new LangString LINUX_EX2MSG_TERMINALNOTFOUND was added to let the user knows which programs they need to get the feature working. --- Translations/Language.ar.xml | 3 ++- Translations/Language.be.xml | 3 ++- Translations/Language.bg.xml | 3 ++- Translations/Language.ca.xml | 3 ++- Translations/Language.co.xml | 1 + Translations/Language.cs.xml | 3 ++- Translations/Language.da.xml | 3 ++- Translations/Language.de.xml | 3 ++- Translations/Language.el.xml | 3 ++- Translations/Language.es.xml | 3 ++- Translations/Language.et.xml | 3 ++- Translations/Language.eu.xml | 3 ++- Translations/Language.fa.xml | 3 ++- Translations/Language.fi.xml | 3 ++- Translations/Language.fr.xml | 3 ++- Translations/Language.he.xml | 3 ++- Translations/Language.hu.xml | 3 ++- Translations/Language.id.xml | 3 ++- Translations/Language.it.xml | 3 ++- Translations/Language.ja.xml | 3 ++- Translations/Language.ka.xml | 3 ++- Translations/Language.ko.xml | 1 + Translations/Language.lv.xml | 3 ++- Translations/Language.my.xml | 3 ++- Translations/Language.nl.xml | 1 + Translations/Language.nn.xml | 3 ++- Translations/Language.pl.xml | 3 ++- Translations/Language.pt-br.xml | 3 ++- Translations/Language.ro.xml | 3 ++- Translations/Language.ru.xml | 3 ++- Translations/Language.sk.xml | 3 ++- Translations/Language.sl.xml | 3 ++- Translations/Language.sv.xml | 3 ++- Translations/Language.th.xml | 3 ++- Translations/Language.tr.xml | 3 ++- Translations/Language.uk.xml | 3 ++- Translations/Language.uz.xml | 3 ++- Translations/Language.vi.xml | 3 ++- Translations/Language.zh-cn.xml | 1 + Translations/Language.zh-hk.xml | 3 ++- Translations/Language.zh-tw.xml | 3 ++- src/Common/Language.xml | 1 + src/Core/Unix/CoreUnix.cpp | 22 +++++++++++++++++----- src/Main/Forms/WaitDialog.cpp | 1 + src/Main/UserInterface.cpp | 2 ++ src/Platform/Exception.h | 1 + 46 files changed, 100 insertions(+), 42 deletions(-) diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index ea3a5054..046320c9 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index 99244680..f760eabe 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index 76a038e8..70027e97 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index e3d0f61b..cb99a628 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.co.xml b/Translations/Language.co.xml index 301a97be..34fd6f89 100644 --- a/Translations/Language.co.xml +++ b/Translations/Language.co.xml @@ -1585,6 +1585,7 @@ Information about Corsican localization: VeraCrypt hè statu installatu anteriurmente impieghendu un pacchettu MSI è dunque, ùn pò micca esse mudificatu cù un stalladore classicu.\n\nImpiegate u pacchettu MSI per mudificà a vostra installazione VeraCrypt. Impiegà tuttu u spaziu dispunibule VeraCrypt ùn pò micca esse messu à livellu perchè a partizione o u lettore di u sistema hè statu cifratu impieghendu una cudificazione chì ùn hè più accettata.\nDicifrate u vostru sistema prima di mette VeraCrypt à livellu è cifratelu torna. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 9a32f692..d355cf01 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -1568,7 +1568,8 @@ UPOZORNĚNÍ: Hostitelský soubor/zařízení {0} je již používán!\n\nIgnorování této skutečnosti může způsobit nežádoucí výsledky včetně nestability systému. Všechny aplikace, které by mohly používat hostitelský soubor/zařízení, by měly být před připojením svazku ukončeny.\n\nPokračovat v připojení? VeraCrypt byl nainstalován pomocí balíčku MSI, a proto jej nelze aktualizovat pomocí standardního instalátoru.\n\nPro aktualizaci instalace VeraCrypt, použijte balíček MSI. Využít veškeré dostupné volné místo - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index adb6106f..3f58ee75 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index 44755fe9..fe6d1703 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -1571,7 +1571,8 @@ WARNUNG: Die Datei/das Laufwerk {0} ist bereits in Verwendung!\n\nWenn Sie diese Warnung ignorieren, können nicht vorhersehbare Probleme einschließlich Systemabstürze auftreten. Alle Programme, die die Datei/das Laufwerk verwenden (z. B. Virenscanner oder Backup-Software), sollten geschlossen werden, bevor das Volume eingehängt wird.\n\nTrotzdem fortfahren? VeraCrypt wurde zuvor mit einem MSI-Paket installiert und kann daher nicht mit dem Standard-Installationsprogramm aktualisiert werden.\n\nBitte verwenden Sie das MSI-Paket, um Ihre VeraCrypt-Installation zu aktualisieren. Gesamten verfügbaren freien Speicherplatz nutzen - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index 404e4ddf..7569f7df 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index 82a08ab9..eab23e68 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index 2b9ccdb8..fac86ab9 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index f4055cef..d8ccad4c 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index d1d9dc74..1bd421f5 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index 440cb2f9..0b38fd0e 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index 953ad43d..56c65621 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt a déjà été installé à l'aide d'un package MSI et de ce fait il ne peut pas être mis à jour à l'aide du programme d'installation standard.\n\nVeuillez utiliser le package MSI pour mettre à jour votre installation VeraCrypt. Utiliser la totalité de l'espace libre sur le disque - VeraCrypt ne peut pas être mis à niveau car votre partition/disque système a été chiffré à l'aide d'un algorithme qui n'est plus pris en charge.\nVeuillez déchiffrer votre système avant de mettre à niveau VeraCrypt, puis chiffrez-le à nouveau. + VeraCrypt ne peut pas être mis à niveau car votre partition/disque système a été chiffré à l'aide d'un algorithme qui n'est plus pris en charge.\nVeuillez déchiffrer votre système avant de mettre à niveau VeraCrypt, puis chiffrez-le à nouveau. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.he.xml b/Translations/Language.he.xml index cce3b6cb..dd0a5092 100644 --- a/Translations/Language.he.xml +++ b/Translations/Language.he.xml @@ -1569,7 +1569,8 @@ אזהרה: הקובץ / ההתקן המארח {0} כבר נמצא בשימוש! \n \n התעלמות מכך עלולה לגרום לתוצאות לא רצויות כולל חוסר יציבות במערכת.יש לסגור את כל היישומים שעשויים להשתמש בקובץ המארח / בהתקן לפני התקנת אמצעי האחסון. \n \n האם להמשיך בטעינה? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index 2deedb43..309b2bd8 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -1568,7 +1568,8 @@ FIGYELEM: A(z) {0} gazdafájl/eszköz már használatban van!\n\nEnnek figyelmen kívül hagyása nemkívánatos eredményekhez vezethet, beleértve a rendszer instabilitását is.\nA kötet csatolása előtt minden olyan alkalmazást le kell állítani, amely a gazdafájlt/eszközt használja.\nFolytatja a csatolást? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index a38020d1..0e765404 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -1568,7 +1568,8 @@ PERINGATAN: File / perangkat host {0} sudah digunakan! \n\nIgnoring ini dapat menyebabkan hasil yang tidak diinginkan termasuk ketidakstabilan sistem. Semua aplikasi yang mungkin menggunakan file / perangkat host harus ditutup sebelum memasang volume. VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index 0047eb07..a742f8bd 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -1568,7 +1568,8 @@ ATTENZIONE: il file/dispositivo host {0} è già in uso!\n\nIgnorarlo può causare risultati indesiderati inclusa l'instabilità del sistema.\nTutte le applicazioni che potrebbero usare il file/dispositivo host devono essere chiuse prima di montare il volume.\n\nVuoi continuare il montaggio? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index c1754043..46ee41ae 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index d0cbbf81..05985826 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index 07df0187..733339f3 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -1569,6 +1569,7 @@ VeraCrypt가 MSI 패키지(.msi)로 설치되어 표준 설치 프로그램으로 업데이트 할 수 없습니다.\n\nMSI 패키지를 사용하여 VeraCrypt를 업데이트하십시오. 사용 가능한 모든 여유 공간 사용 시스템 파티션/드라이브가 더 이상 지원되지 않는 알고리즘으로 암호화되었기 때문에 VeraCrypt를 업데이트할 수 없습니다.\nVeraCrypt를 업데이트 하기 전에 시스템 암호를 해독한 다음 다시 암호화하십시오. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index 8d69d461..849dd01a 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index b63985ee..2256cb89 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -1570,7 +1570,8 @@ သတိပေးချက် - Host ဖိုင်/device {0} ကို အသုံးပြုထားပြီးဖြစ်သည်။\n\n ဤအချက်ကို လျစ်လျူရှုခြင်းအားဖြင့် ကွန်ပျူတာစနစ် မတည်ငြိမ်မှု စသော မလိုလားအပ်သည့် ရလဒ်များ ဖြစ်ပေါ်စေနိုင်သည်။ Volume ကို အစမ​ပျိုးခင် host ဖိုင်/device ကို သုံးစွဲနေသည့် အက်ပလီကေးရှင်း အားလုံးကို ပိတ်ထားရမည်။\n\n ဆက်လက် အစပျိုးမလား။ VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index dec2fda2..b67ebb64 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -1569,6 +1569,7 @@ VeraCrypt werd eerder geïnstalleerd met een MSI-pakket en kan dus niet worden bijgewerkt met het standaardinstallatieprogramma. Gebruik het MSI-pakket om uw VeraCrypt-installatie bij te werken. Alle beschikbare vrije ruimte gebruiken VeraCrypt kan niet worden bijgewerkt omdat de systeempartitie/schijf is versleuteld met een algoritme dat niet meer wordt ondersteund.\nOntsleutel uw systeem voordat u VeraCrypt bijwerkt en versleutel het dan opnieuw. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index f573f477..8316da7d 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index 80d55295..20fa7908 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -1568,7 +1568,8 @@ OSTRZEŻENIE: Plik/urządzenie {0} jest już używane!\n\nZignorowanie tego może spowodować niepożądane skutki, w tym niestabilność systemu. Wszystkie aplikacje, które mogą korzystać z pliku/urządzenia, powinny zostać zamknięte przed podłączeniem wolumenu.\n\nKontynuować podłączanie? VeraCrypt zainstalowano wcześniej przy użyciu pakietu MSI, więc nie można dokonać aktualizacji za pomocą standardowego instalatora.\n\nUżyj pakietu MSI, aby zaktualizować swoją instalację VeraCrypt. Wykorzystaj całą dostępną wolną przestrzeń - Nie można zaktualizować VeraCrypt, ponieważ partycję/dysk systemowy zaszyfrowano przy użyciu algorytmu, który nie jest już obsługiwany.\nProszę odszyfrować system przed aktualizacją VeraCrypt, a następnie zaszyfrować go ponownie. + Nie można zaktualizować VeraCrypt, ponieważ partycję/dysk systemowy zaszyfrowano przy użyciu algorytmu, który nie jest już obsługiwany.\nProszę odszyfrować system przed aktualizacją VeraCrypt, a następnie zaszyfrować go ponownie. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index 68bd5a8c..dcaf99b0 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index 99eba988..bad34340 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index 47d545f1..5b46d0dd 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -1568,7 +1568,8 @@ ВНИМАНИЕ: Хост-файл/устройство {0} уже используется!\n\nИгнорирование этого может привести к нежелательным результатам, включая нестабильность системы. Перед монтированием тома закройте все приложения, которые могут использовать хост-файл/устройство.\n\nПродолжить монтирование? Программа VeraCrypt ранее была установлена с помощью MSI-пакета, поэтому её нельзя обновить с помощью стандартного установщика.\n\nЧтобы обновить VeraCrypt, используйте MSI-пакет. Использовать всё свободное место - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index 07978db7..496fd611 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index d7314d9f..a7ad9ab0 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index 0358302e..230d239e 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index ac1d27f4..6ae207c9 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -1569,7 +1569,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index a9f60d0b..4e3145e5 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -1568,7 +1568,8 @@ UYARI: {0} ana bilgisayar dosyası/cihazı zaten kullanımda!\n\nBunu dikkate almamak, sistem kararsızlığı dahil olmak üzere istenmeyen sonuçlara neden olabilir. Ana bilgisayar dosyasını/cihazı kullanıyor olabilecek tüm uygulamalar, birimi monte etmeden önce kapatılmalıdır.\n\nMontaj devam edilsin mi? VeraCrypt daha önce bir MSI paketi kullanılarak kurulmuştu ve bu nedenle standart yükleyici kullanılarak güncellenemez.\n\nVeraCrypt kurulumunuzu güncellemek için lütfen MSI paketini kullanın.. Mevcut tüm boş alanı kullan - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index 451cfe68..941b4413 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index d97826c5..7592f3b4 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index 298597e1..0443aa66 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index e9c5746c..1dae6049 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -1570,6 +1570,7 @@ VeraCrypt 此前通过MSI包进行了安装，因此其无法再通过独立安装包进行更新。\n\n请通过MSI包更新您的 VeraCrypt 程序。 使用所有空闲空间。 VeraCrypt无法升级，因为系统分区/驱动器使用了将不再支持的算法进行加密。\n请在升级VeraCrypt之前解密系统，然后再次加密。 + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index de988a5f..39b274eb 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index da99eb43..52145fd3 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -1568,7 +1568,8 @@ WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting? VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space - VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/src/Common/Language.xml b/src/Common/Language.xml index 366bb0b0..a2615124 100644 --- a/src/Common/Language.xml +++ b/src/Common/Language.xml @@ -1569,6 +1569,7 @@ VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation. Use all available free space VeraCrypt cannot be upgraded because the system partition/drive was encrypted using an algorithm that is not supported anymore.\nPlease decrypt your system before upgrading VeraCrypt and then encrypt it again. + Supported terminal application could not be found, you need either xterm, konsole or gnome-terminal (with dbus-x11). diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp index 2dac4cb5..56382c18 100644 --- a/src/Core/Unix/CoreUnix.cpp +++ b/src/Core/Unix/CoreUnix.cpp @@ -78,10 +78,8 @@ namespace VeraCrypt if (stat("/usr/bin/konsole", &sb) == 0) { args.clear (); - args.push_back ("--title"); - args.push_back ("fsck"); - args.push_back ("--caption"); - args.push_back ("fsck"); + args.push_back ("-p"); + args.push_back ("tabtitle=fsck"); args.push_back ("-e"); args.push_back ("sh"); args.push_back ("-c"); @@ -91,8 +89,22 @@ namespace VeraCrypt Process::Execute ("konsole", args, 1000); } catch (TimeOut&) { } } + else if (stat("/usr/bin/gnome-terminal", &sb) == 0 && stat("/usr/bin/dbus-launch", &sb) == 0) + { + args.clear (); + args.push_back ("--title"); + args.push_back ("fsck"); + args.push_back ("--"); + args.push_back ("sh"); + args.push_back ("-c"); + args.push_back (xargs); + try + { + Process::Execute ("gnome-terminal", args, 1000); + } catch (TimeOut&) { } + } else - throw; + throw TerminalNotFound(); } #endif } diff --git a/src/Main/Forms/WaitDialog.cpp b/src/Main/Forms/WaitDialog.cpp index 2976a6e8..795d7763 100644 --- a/src/Main/Forms/WaitDialog.cpp +++ b/src/Main/Forms/WaitDialog.cpp @@ -74,6 +74,7 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (ParameterTooLarge); VC_CONVERT_EXCEPTION (PartitionDeviceRequired); VC_CONVERT_EXCEPTION (StringConversionFailed); + VC_CONVERT_EXCEPTION (TerminalNotFound); VC_CONVERT_EXCEPTION (TestFailed); VC_CONVERT_EXCEPTION (TimeOut); VC_CONVERT_EXCEPTION (UnknownException); diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 9c7d4e29..1a237bbe 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -481,6 +481,7 @@ namespace VeraCrypt EX2MSG (UnportablePassword, LangString["UNSUPPORTED_CHARS_IN_PWD"]); #if defined (TC_LINUX) + EX2MSG (TerminalNotFound, LangString["LINUX_EX2MSG_TERMINALNOTFOUND"]); EX2MSG (UnsupportedSectorSize, LangString["SECTOR_SIZE_UNSUPPORTED"]); EX2MSG (UnsupportedSectorSizeHiddenVolumeProtection, LangString["LINUX_EX2MSG_UNSUPPORTEDSECTORSIZEHIDDENVOLUMEPROTECTION"]); EX2MSG (UnsupportedSectorSizeNoKernelCrypto, LangString["LINUX_EX2MSG_UNSUPPORTEDSECTORSIZENOKERNELCRYPTO"]); @@ -1620,6 +1621,7 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (ParameterTooLarge); VC_CONVERT_EXCEPTION (PartitionDeviceRequired); VC_CONVERT_EXCEPTION (StringConversionFailed); + VC_CONVERT_EXCEPTION (TerminalNotFound); VC_CONVERT_EXCEPTION (TestFailed); VC_CONVERT_EXCEPTION (TimeOut); VC_CONVERT_EXCEPTION (UnknownException); diff --git a/src/Platform/Exception.h b/src/Platform/Exception.h index b0f04bba..c9635414 100644 --- a/src/Platform/Exception.h +++ b/src/Platform/Exception.h @@ -92,6 +92,7 @@ namespace VeraCrypt TC_EXCEPTION (ParameterTooLarge); \ TC_EXCEPTION (PartitionDeviceRequired); \ TC_EXCEPTION (StringConversionFailed); \ + TC_EXCEPTION (TerminalNotFound); \ TC_EXCEPTION (TestFailed); \ TC_EXCEPTION (TimeOut); \ TC_EXCEPTION (UnknownException); \ -- cgit v1.2.3