VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/CommandLineInterface.cpp7
-rw-r--r--src/Main/Forms/Forms.cpp20
-rw-r--r--src/Main/Forms/MainFrame.cpp12
-rw-r--r--src/Main/Forms/PreferencesDialog.cpp6
-rw-r--r--src/Main/Forms/TrueCrypt.fbp20
-rw-r--r--src/Main/Forms/VolumeCreationWizard.cpp2
-rw-r--r--src/Main/GraphicUserInterface.cpp6
-rw-r--r--src/Main/Hotkey.cpp8
-rw-r--r--src/Main/TextUserInterface.cpp4
-rw-r--r--src/Main/UserInterface.cpp26
10 files changed, 56 insertions, 55 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 06815ca9..2d38a5bd 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -39,47 +39,48 @@ namespace VeraCrypt
StartBackgroundTask (false)
{
wxCmdLineParser parser;
parser.SetCmdLine (argc, argv);
parser.SetSwitchChars (L"-");
#if defined(TC_WINDOWS) || defined(TC_MACOSX)
parser.AddSwitch (L"", L"allow-screencapture", _("Allow window to be included in screenshots and screen captures (Windows/MacOS)"));
#endif
parser.AddOption (L"", L"auto-mount", _("Auto mount device-hosted/favorite volumes"));
parser.AddSwitch (L"", L"backup-headers", _("Backup volume headers"));
parser.AddSwitch (L"", L"background-task", _("Start Background Task"));
#ifdef TC_WINDOWS
parser.AddSwitch (L"", L"cache", _("Cache passwords and keyfiles"));
#endif
parser.AddSwitch (L"C", L"change", _("Change password or keyfiles"));
parser.AddSwitch (L"c", L"create", _("Create new volume"));
parser.AddSwitch (L"", L"create-keyfile", _("Create new keyfile"));
parser.AddSwitch (L"", L"delete-token-keyfiles", _("Delete security token keyfiles"));
- parser.AddSwitch (L"d", L"dismount", _("Dismount volume"));
+ parser.AddSwitch (L"d", L"dismount", _("Unmount volume (deprecated: use 'unmount')"));
+ parser.AddSwitch (L"u", L"unmount", _("Unmount volume"));
parser.AddSwitch (L"", L"display-password", _("Display password while typing"));
parser.AddOption (L"", L"encryption", _("Encryption algorithm"));
parser.AddSwitch (L"", L"explore", _("Open explorer window for mounted volume"));
parser.AddSwitch (L"", L"export-token-keyfile",_("Export keyfile from token"));
parser.AddOption (L"", L"filesystem", _("Filesystem type"));
- parser.AddSwitch (L"f", L"force", _("Force mount/dismount/overwrite"));
+ parser.AddSwitch (L"f", L"force", _("Force mount/unmount/overwrite"));
#if !defined(TC_WINDOWS) && !defined(TC_MACOSX)
parser.AddOption (L"", L"fs-options", _("Filesystem mount options"));
#endif
parser.AddOption (L"", L"hash", _("Hash algorithm"));
parser.AddSwitch (L"h", L"help", _("Display detailed command line help"), wxCMD_LINE_OPTION_HELP);
parser.AddSwitch (L"", L"import-token-keyfiles", _("Import keyfiles to security token"));
parser.AddOption (L"k", L"keyfiles", _("Keyfiles"));
parser.AddSwitch (L"l", L"list", _("List mounted volumes"));
parser.AddSwitch (L"", L"list-token-keyfiles", _("List token keyfiles"));
parser.AddSwitch (L"", L"list-securitytoken-keyfiles", _("List security token keyfiles"));
parser.AddSwitch (L"", L"list-emvtoken-keyfiles", _("List EMV token keyfiles"));
parser.AddSwitch (L"", L"load-preferences", _("Load user preferences"));
parser.AddSwitch (L"", L"mount", _("Mount volume interactively"));
parser.AddOption (L"m", L"mount-options", _("VeraCrypt volume mount options"));
parser.AddOption (L"", L"new-hash", _("New hash algorithm"));
parser.AddOption (L"", L"new-keyfiles", _("New keyfiles"));
parser.AddOption (L"", L"new-password", _("New password"));
parser.AddOption (L"", L"new-pim", _("New PIM"));
parser.AddSwitch (L"", L"non-interactive", _("Do not interact with user"));
parser.AddSwitch (L"", L"stdin", _("Read password from standard input"));
@@ -205,41 +206,41 @@ namespace VeraCrypt
if (parser.Found (L"create"))
{
CheckCommandSingle();
ArgCommand = CommandId::CreateVolume;
param1IsVolume = true;
}
if (parser.Found (L"create-keyfile"))
{
CheckCommandSingle();
ArgCommand = CommandId::CreateKeyfile;
param1IsFile = true;
}
if (parser.Found (L"delete-token-keyfiles"))
{
CheckCommandSingle();
ArgCommand = CommandId::DeleteSecurityTokenKeyfiles;
}
- if (parser.Found (L"dismount"))
+ if (parser.Found (L"unmount") || parser.Found (L"dismount"))
{
CheckCommandSingle();
ArgCommand = CommandId::DismountVolumes;
param1IsMountedVolumeSpec = true;
}
if (parser.Found (L"export-token-keyfile"))
{
CheckCommandSingle();
ArgCommand = CommandId::ExportTokenKeyfile;
}
if (parser.Found (L"import-token-keyfiles"))
{
CheckCommandSingle();
ArgCommand = CommandId::ImportTokenKeyfiles;
}
if (parser.Found (L"list"))
{
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 9ffad555..6e1432a3 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -1804,97 +1804,97 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase()
}
PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( this->GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
bSizer32 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer178;
bSizer178 = new wxBoxSizer( wxVERTICAL );
PreferencesNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
SecurityPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer44;
bSizer44 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer33;
bSizer33 = new wxBoxSizer( wxVERTICAL );
- AutoDismountSizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("IDT_AUTO_DISMOUNT") ), wxVERTICAL );
+ AutoDismountSizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("IDT_AUTO_UNMOUNT") ), wxVERTICAL );
wxStaticBoxSizer* sbSizer13;
- sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("LINUX_DISMOUNT_ALL_WHEN") ), wxVERTICAL );
+ sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("LINUX_UNMOUNT_ALL_WHEN") ), wxVERTICAL );
- DismountOnLogOffCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_LOGOFF"), wxDefaultPosition, wxDefaultSize, 0 );
+ DismountOnLogOffCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_LOGOFF"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnLogOffCheckBox, 0, wxALL, 5 );
- DismountOnScreenSaverCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_SCREENSAVER"), wxDefaultPosition, wxDefaultSize, 0 );
+ DismountOnScreenSaverCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_SCREENSAVER"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnScreenSaverCheckBox, 0, wxALL, 5 );
DismountOnPowerSavingCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("LINUX_ENTERING_POVERSAWING"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnPowerSavingCheckBox, 0, wxALL, 5 );
AutoDismountSizer->Add( sbSizer13, 0, wxEXPAND|wxALL, 5 );
wxBoxSizer* bSizer34;
bSizer34 = new wxBoxSizer( wxHORIZONTAL );
- DismountOnInactivityCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_INACTIVE"), wxDefaultPosition, wxDefaultSize, 0 );
+ DismountOnInactivityCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_INACTIVE"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer34->Add( DismountOnInactivityCheckBox, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
DismountOnInactivitySpinCtrl = new wxSpinCtrl( AutoDismountSizer->GetStaticBox(), wxID_ANY, wxT("1"), wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 9999, 1 );
DismountOnInactivitySpinCtrl->SetMinSize( wxSize( 60,-1 ) );
bSizer34->Add( DismountOnInactivitySpinCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxStaticText* m_staticText5;
m_staticText5 = new wxStaticText( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("MINUTES"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText5->Wrap( -1 );
bSizer34->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
AutoDismountSizer->Add( bSizer34, 0, wxEXPAND, 5 );
- ForceAutoDismountCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_FORCE_AUTO_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+ ForceAutoDismountCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_FORCE_AUTO_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
AutoDismountSizer->Add( ForceAutoDismountCheckBox, 0, wxALL, 5 );
bSizer33->Add( AutoDismountSizer, 0, wxEXPAND|wxALL, 5 );
FilesystemSecuritySizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("LINUX_PREF_TAB_MOUNT_OPTIONS_FS") ), wxVERTICAL );
PreserveTimestampsCheckBox = new wxCheckBox( FilesystemSecuritySizer->GetStaticBox(), wxID_ANY, _("IDC_PRESERVE_TIMESTAMPS"), wxDefaultPosition, wxDefaultSize, 0 );
FilesystemSecuritySizer->Add( PreserveTimestampsCheckBox, 0, wxALL, 5 );
bSizer33->Add( FilesystemSecuritySizer, 0, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizer14;
sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("IDT_PW_CACHE_OPTIONS") ), wxVERTICAL );
WipeCacheOnCloseCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_EXIT"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
- WipeCacheOnAutoDismountCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+ WipeCacheOnAutoDismountCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer14->Add( WipeCacheOnAutoDismountCheckBox, 0, wxALL, 5 );
bSizer33->Add( sbSizer14, 0, wxEXPAND|wxALL, 5 );
bSizer44->Add( bSizer33, 1, wxEXPAND|wxALL, 5 );
SecurityPage->SetSizer( bSizer44 );
SecurityPage->Layout();
bSizer44->Fit( SecurityPage );
PreferencesNotebook->AddPage( SecurityPage, _("LINUX_PREF_TAB_SECURITY"), true );
DefaultMountOptionsPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer46;
bSizer46 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer35;
bSizer35 = new wxBoxSizer( wxVERTICAL );
@@ -1966,41 +1966,41 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
bSizer62 = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizer18;
sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("IDT_TASKBAR_ICON") ), wxVERTICAL );
BackgroundTaskEnabledCheckBox = new wxCheckBox( sbSizer18->GetStaticBox(), wxID_ANY, _("IDC_PREF_BKG_TASK_ENABLE"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer18->Add( BackgroundTaskEnabledCheckBox, 0, wxALL, 5 );
CloseBackgroundTaskOnNoVolumesCheckBox = new wxCheckBox( sbSizer18->GetStaticBox(), wxID_ANY, _("IDC_CLOSE_BKG_TASK_WHEN_NOVOL"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer18->Add( CloseBackgroundTaskOnNoVolumesCheckBox, 0, wxALL, 5 );
wxStaticBoxSizer* sbSizer26;
sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( sbSizer18->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_MENU_ITEMS") ), wxVERTICAL );
BackgroundTaskMenuMountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("HK_MOUNT_FAVORITE_VOLUMES"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuMountItemsEnabledCheckBox, 0, wxALL, 5 );
BackgroundTaskMenuOpenItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_OPEN_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuOpenItemsEnabledCheckBox, 0, wxALL, 5 );
- BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_DISMOUNT_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
+ BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_UNMOUNT_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuDismountItemsEnabledCheckBox, 0, wxALL, 5 );
sbSizer18->Add( sbSizer26, 1, wxEXPAND|wxALL, 5 );
bSizer62->Add( sbSizer18, 0, wxEXPAND|wxALL, 5 );
bSizer61->Add( bSizer62, 1, wxEXPAND|wxALL, 5 );
BackgroundTaskPanel->SetSizer( bSizer61 );
BackgroundTaskPanel->Layout();
bSizer61->Fit( BackgroundTaskPanel );
PreferencesNotebook->AddPage( BackgroundTaskPanel, _("LINUX_PREF_TAB_BACKGROUND_TASK"), false );
SystemIntegrationPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer49;
bSizer49 = new wxBoxSizer( wxVERTICAL );
@@ -2009,41 +2009,41 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("LINUX_LOGIN_ACTION") ), wxVERTICAL );
StartOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_LOGON_START"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
MountFavoritesOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("HK_MOUNT_FAVORITE_VOLUMES"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
MountDevicesOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_LOGON_MOUNT_DEVICES"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
bSizer37->Add( LogOnSizer, 0, wxALL|wxEXPAND, 5 );
ExplorerSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("LINUX_PREF_TAB_SYSTEM_INTEGRATION_EXPLORER") ), wxVERTICAL );
OpenExplorerWindowAfterMountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_OPEN_EXPLORER"), wxDefaultPosition, wxDefaultSize, 0 );
ExplorerSizer->Add( OpenExplorerWindowAfterMountCheckBox, 0, wxALL, 5 );
- CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("LINUX_CLOSE_EXPL_ON_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+ CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("LINUX_CLOSE_EXPL_ON_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
ExplorerSizer->Add( CloseExplorerWindowsOnDismountCheckBox, 0, wxALL, 5 );
bSizer37->Add( ExplorerSizer, 0, wxEXPAND|wxALL, 5 );
KernelServicesSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("LINUX_PREF_KERNEL_SERVICES") ), wxVERTICAL );
NoKernelCryptoCheckBox = new wxCheckBox( KernelServicesSizer->GetStaticBox(), wxID_ANY, _("LINUX_PREF_KERNEL_CRYPT"), wxDefaultPosition, wxDefaultSize, 0 );
KernelServicesSizer->Add( NoKernelCryptoCheckBox, 0, wxALL, 5 );
bSizer37->Add( KernelServicesSizer, 0, wxEXPAND|wxALL, 5 );
bSizer49->Add( bSizer37, 1, wxEXPAND|wxALL, 5 );
SystemIntegrationPage->SetSizer( bSizer49 );
SystemIntegrationPage->Layout();
bSizer49->Fit( SystemIntegrationPage );
@@ -2221,41 +2221,41 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
gSizer4->Add( HotkeyWinCheckBox, 0, wxALL, 5 );
fgSizer4->Add( gSizer4, 1, wxEXPAND, 5 );
RemoveHotkeyButton = new wxButton( sbSizer23->GetStaticBox(), wxID_ANY, _("IDC_KEYREMOVE"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer4->Add( RemoveHotkeyButton, 1, wxALL, 5 );
sbSizer23->Add( fgSizer4, 1, wxALIGN_RIGHT, 5 );
sbSizer21->Add( sbSizer23, 0, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizer24;
sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( sbSizer21->GetStaticBox(), wxID_ANY, _("IDT_FORMAT_OPTIONS") ), wxVERTICAL );
BeepAfterHotkeyMountDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_SOUND_NOTIFICATION"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer24->Add( BeepAfterHotkeyMountDismountCheckBox, 0, wxALL, 5 );
- DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_CONFIRM_AFTER_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+ DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_CONFIRM_AFTER_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer24->Add( DisplayMessageAfterHotkeyDismountCheckBox, 0, wxALL, 5 );
sbSizer21->Add( sbSizer24, 0, wxEXPAND|wxALL, 5 );
bSizer38->Add( sbSizer21, 1, wxEXPAND|wxALL, 5 );
bSizer51->Add( bSizer38, 1, wxEXPAND|wxALL, 5 );
HotkeysPage->SetSizer( bSizer51 );
HotkeysPage->Layout();
bSizer51->Fit( HotkeysPage );
PreferencesNotebook->AddPage( HotkeysPage, _("LINUX_HOTKEYS"), false );
LanguagesPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer170;
bSizer170 = new wxBoxSizer( wxVERTICAL );
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index b31f765f..59329e09 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -508,81 +508,81 @@ namespace VeraCrypt
}
void MainFrame::InitTaskBarIcon ()
{
class TaskBarIcon : public wxTaskBarIcon
{
public:
TaskBarIcon (MainFrame *frame) : Busy (false), Frame (frame)
{
Connect (wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEventHandler (TaskBarIcon::OnLeftButtonDown));
}
wxMenu *CreatePopupMenu ()
{
unique_ptr <wxMenu> popup (new wxMenu);
Gui->AppendToMenu (*popup, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"], this, wxCommandEventHandler (TaskBarIcon::OnShowHideMenuItemSelected));
popup->AppendSeparator();
Gui->AppendToMenu (*popup, LangString["IDM_MOUNT_FAVORITE_VOLUMES"], this, wxCommandEventHandler (TaskBarIcon::OnMountAllFavoritesMenuItemSelected))->Enable (!Busy);
- Gui->AppendToMenu (*popup, LangString["HK_DISMOUNT_ALL"], this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
+ Gui->AppendToMenu (*popup, LangString["HK_UNMOUNT_ALL"], this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
// Favorite volumes
if (Gui->GetPreferences().BackgroundTaskMenuMountItemsEnabled && !Frame->FavoriteVolumesMenuMap.empty())
{
popup->AppendSeparator();
typedef pair <int, FavoriteVolume> FavMapPair;
foreach (FavMapPair fp, Frame->FavoriteVolumesMenuMap)
{
//TBH Gui->AppendToMenu (*popup, LangString["MOUNT"] + L" " + wstring (fp.second.Path) + (fp.second.MountPoint.IsEmpty() ? L"" : L" " + wstring (fp.second.MountPoint)),
Gui->AppendToMenu (*popup, LangString["MOUNT_BUTTON"] + L" " + wstring (fp.second.Path) + (fp.second.MountPoint.IsEmpty() ? L"" : L" " + wstring (fp.second.MountPoint)),
this, wxCommandEventHandler (TaskBarIcon::OnFavoriteVolumeMenuItemSelected), fp.first)->Enable (!Busy);
}
}
// Mounted volumes
VolumeInfoList mountedVolumes = Core->GetMountedVolumes();
if (!mountedVolumes.empty())
{
if (Gui->GetPreferences().BackgroundTaskMenuOpenItemsEnabled)
{
popup->AppendSeparator();
OpenMap.clear();
foreach (shared_ptr <VolumeInfo> volume, mountedVolumes)
{
if (!volume->MountPoint.IsEmpty())
{
wxString label = LangString["OPEN"] + L" " + wstring (volume->MountPoint) + L" (" + wstring (volume->Path) + L")";
wxMenuItem *item = Gui->AppendToMenu (*popup, label, this, wxCommandEventHandler (TaskBarIcon::OnOpenMenuItemSelected));
OpenMap[item->GetId()] = volume;
}
}
}
if (Gui->GetPreferences().BackgroundTaskMenuDismountItemsEnabled)
{
popup->AppendSeparator();
DismountMap.clear();
foreach (shared_ptr <VolumeInfo> volume, mountedVolumes)
{
- wxString label = LangString["DISMOUNT"] + L" ";
+ wxString label = LangString["UNMOUNT"] + L" ";
if (!volume->MountPoint.IsEmpty())
label += wstring (volume->MountPoint) + L" (" + wstring (volume->Path) + L")";
else
label += wstring (volume->Path);
wxMenuItem *item = Gui->AppendToMenu (*popup, label, this, wxCommandEventHandler (TaskBarIcon::OnDismountMenuItemSelected));
item->Enable (!Busy);
DismountMap[item->GetId()] = volume;
}
}
}
popup->AppendSeparator();
Gui->AppendToMenu (*popup, LangString["IDM_PREFERENCES"], this, wxCommandEventHandler (TaskBarIcon::OnPreferencesMenuItemSelected))->Enable (!Busy);
#ifndef TC_MACOSX
popup->AppendSeparator();
Gui->AppendToMenu (*popup, LangString["EXIT"], this, wxCommandEventHandler (TaskBarIcon::OnExitMenuItemSelected))->Enable (!Busy && Frame->CanExit());
#endif
return popup.release();
@@ -991,57 +991,57 @@ namespace VeraCrypt
{
SecurityToken::CloseAllSessions();
Gui->ShowInfo ("ALL_TOKEN_SESSIONS_CLOSED");
}
catch (exception &e) { Gui->ShowError (e); }
break;
case Hotkey::Id::DismountAll:
case Hotkey::Id::DismountAllWipeCache:
{
if (event.GetId() == Hotkey::Id::DismountAllWipeCache)
WipeCache();
size_t mountedCount = Core->GetMountedVolumes().size();
Gui->DismountAllVolumes();
size_t newMountedCount = Core->GetMountedVolumes().size();
if (newMountedCount < mountedCount)
{
if (newMountedCount == 0 && GetPreferences().DisplayMessageAfterHotkeyDismount)
- Gui->ShowInfo ("MOUNTED_VOLUMES_DISMOUNTED");
+ Gui->ShowInfo ("MOUNTED_VOLUMES_UNMOUNTED");
else if (GetPreferences().BeepAfterHotkeyMountDismount)
MessageBeep((UINT) -1);
}
}
break;
case Hotkey::Id::ForceDismountAllWipeCache:
case Hotkey::Id::ForceDismountAllWipeCacheExit:
{
bool mounted = !Core->GetMountedVolumes().empty();
WipeCache();
Gui->DismountAllVolumes (true, true);
if (mounted && GetPreferences().DisplayMessageAfterHotkeyDismount)
- Gui->ShowInfo ("VOLUMES_DISMOUNTED_CACHE_WIPED");
+ Gui->ShowInfo ("VOLUMES_UNMOUNTED_CACHE_WIPED");
else if (mounted && GetPreferences().BeepAfterHotkeyMountDismount)
MessageBeep((UINT) -1);
if (event.GetId() == Hotkey::Id::ForceDismountAllWipeCacheExit)
Close (true);
}
break;
case Hotkey::Id::MountAllDevices:
case Hotkey::Id::MountAllFavorites:
{
size_t mountedCount = Core->GetMountedVolumes().size();
if (event.GetId() == Hotkey::Id::MountAllDevices)
MountAllDevices();
else
MountAllFavorites();
if (Core->GetMountedVolumes().size() > mountedCount && GetPreferences().BeepAfterHotkeyMountDismount)
MessageBeep((UINT) -1);
@@ -1132,41 +1132,41 @@ namespace VeraCrypt
#ifdef TC_MACOSX
if (SelectedItemIndex != event.GetIndex())
{
SelectedItemIndex = event.GetIndex();
OnListItemSelectionChanged();
}
if (!ListItemRightClickEventPending)
{
ListItemRightClickEventPending = true;
SlotListCtrl->GetEventHandler()->AddPendingEvent (event);
return;
}
ListItemRightClickEventPending = false;
#endif
wxMenu popup;
if (IsMountedSlotSelected())
{
- Gui->AppendToMenu (popup, LangString["DISMOUNT"], this, wxCommandEventHandler (MainFrame::OnDismountVolumeMenuItemSelected));
+ Gui->AppendToMenu (popup, LangString["UNMOUNT"], this, wxCommandEventHandler (MainFrame::OnDismountVolumeMenuItemSelected));
Gui->AppendToMenu (popup, LangString["OPEN"], this, wxCommandEventHandler (MainFrame::OnOpenVolumeMenuItemSelected));
Gui->AppendToMenu (popup, LangString["LINUX_DESELECT"], this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
popup.AppendSeparator();
Gui->AppendToMenu (popup, LangString["IDPM_ADD_TO_FAVORITES"], this, wxCommandEventHandler (MainFrame::OnAddToFavoritesMenuItemSelected));
popup.AppendSeparator();
Gui->AppendToMenu (popup, LangString["IDPM_CHECK_FILESYS"], this, wxCommandEventHandler (MainFrame::OnCheckFilesystemMenuItemSelected));
Gui->AppendToMenu (popup, LangString["IDPM_REPAIR_FILESYS"], this, wxCommandEventHandler (MainFrame::OnRepairFilesystemMenuItemSelected));
popup.AppendSeparator();
Gui->AppendToMenu (popup, LangString["IDPM_PROPERTIES"], this, wxCommandEventHandler (MainFrame::OnVolumePropertiesButtonClick));
PopupMenu (&popup);
}
else if (IsFreeSlotSelected())
{
Gui->AppendToMenu (popup, LangString["IDM_MOUNT_VOLUME"], this, wxCommandEventHandler (MainFrame::OnMountVolumeMenuItemSelected));
popup.AppendSeparator();
@@ -1604,41 +1604,41 @@ namespace VeraCrypt
mTaskBarIcon->SetIcon (Resources::GetVeraCryptIcon(), L"VeraCrypt");
#endif
#endif
#ifdef HAVE_INDICATORS
if (indicator == NULL) {
indicator = app_indicator_new ("veracrypt", "veracrypt", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ACTIVE);
GtkWidget *menu = gtk_menu_new();
indicator_item_showhide = gtk_menu_item_new_with_label (LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"].mb_str());
gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_showhide);
g_signal_connect (indicator_item_showhide, "activate", G_CALLBACK (IndicatorOnShowHideMenuItemSelected), this);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
indicator_item_mountfavorites = gtk_menu_item_new_with_label (LangString["IDM_MOUNT_FAVORITE_VOLUMES"]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_mountfavorites);
g_signal_connect (indicator_item_mountfavorites, "activate", G_CALLBACK (IndicatorOnMountAllFavoritesMenuItemSelected), this);
- indicator_item_dismountall = gtk_menu_item_new_with_label (LangString["HK_DISMOUNT_ALL"]);
+ indicator_item_dismountall = gtk_menu_item_new_with_label (LangString["HK_UNMOUNT_ALL"]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_dismountall);
g_signal_connect (indicator_item_dismountall, "activate", G_CALLBACK (IndicatorOnDismountAllMenuItemSelected), this);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
indicator_item_prefs = gtk_menu_item_new_with_label (LangString["IDM_PREFERENCES"]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_prefs);
g_signal_connect (indicator_item_prefs, "activate", G_CALLBACK (IndicatorOnPreferencesMenuItemSelected), this);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
indicator_item_exit = gtk_menu_item_new_with_label (LangString["EXIT"]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_exit);
g_signal_connect (indicator_item_exit, "activate", G_CALLBACK (IndicatorOnExitMenuItemSelected), this);
gtk_widget_show_all (menu);
app_indicator_set_menu (indicator, GTK_MENU (menu));
}
#endif
}
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 7ac8b583..4a6eaec0 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -404,53 +404,53 @@ namespace VeraCrypt
Gui->ShowWarning (LangString["LINUX_REMOUNT_BECAUSEOF_SETTING"]);
}
void PreferencesDialog::OnNoKernelCryptoCheckBoxClick (wxCommandEvent& event)
{
if (event.IsChecked())
NoKernelCryptoCheckBox->SetValue (Gui->AskYesNo (LangString["LINUX_DISABLE_KERNEL_CRYPT_CONFIRM"], false, true));
}
void PreferencesDialog::OnClose (wxCloseEvent& event)
{
#ifdef TC_WINDOWS
Hotkey::RegisterList (Gui->GetMainFrame(), UnregisteredHotkeys);
#endif
event.Skip();
}
void PreferencesDialog::OnDismountOnPowerSavingCheckBoxClick (wxCommandEvent& event)
{
if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
- Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+ Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
}
void PreferencesDialog::OnDismountOnScreenSaverCheckBoxClick (wxCommandEvent& event)
{
if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
- Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+ Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
}
void PreferencesDialog::OnForceAutoDismountCheckBoxClick (wxCommandEvent& event)
{
if (!event.IsChecked())
- ForceAutoDismountCheckBox->SetValue (!Gui->AskYesNo (LangString["CONFIRM_NO_FORCED_AUTODISMOUNT"], false, true));
+ ForceAutoDismountCheckBox->SetValue (!Gui->AskYesNo (LangString["CONFIRM_NO_FORCED_AUTOUNMOUNT"], false, true));
}
void PreferencesDialog::OnHotkeyListItemDeselected (wxListEvent& event)
{
UpdateHotkeyButtons();
}
void PreferencesDialog::OnHotkeyListItemSelected (wxListEvent& event)
{
UpdateHotkeyButtons();
HotkeyTextCtrl->ChangeValue (LangString ["PRESS_A_KEY_TO_ASSIGN"]);
AssignHotkeyButton->Enable (false);
}
// Fixes an issue where going through PreferencesNotebook tabs would unintentionally select the first entry
// in the LanguageListBox and thus cause a language change on OKButton press.
void PreferencesDialog::OnPageChanged(wxBookCtrlEvent &event)
{
LanguageListBox->DeselectAll();
}
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 0b40a99e..3c911652 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -10937,92 +10937,92 @@
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer44</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer33</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
- <property name="label">IDT_AUTO_DISMOUNT</property>
+ <property name="label">IDT_AUTO_UNMOUNT</property>
<property name="minimum_size"></property>
<property name="name">AutoDismountSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">protected</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
- <property name="label">LINUX_DISMOUNT_ALL_WHEN</property>
+ <property name="label">LINUX_UNMOUNT_ALL_WHEN</property>
<property name="minimum_size"></property>
<property name="name">sbSizer13</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">IDC_PREF_DISMOUNT_LOGOFF</property>
+ <property name="label">IDC_PREF_UNMOUNT_LOGOFF</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">DismountOnLogOffCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -11052,41 +11052,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">IDC_PREF_DISMOUNT_SCREENSAVER</property>
+ <property name="label">IDC_PREF_UNMOUNT_SCREENSAVER</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">DismountOnScreenSaverCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -11193,41 +11193,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">IDC_PREF_DISMOUNT_INACTIVE</property>
+ <property name="label">IDC_PREF_UNMOUNT_INACTIVE</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">DismountOnInactivityCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -11382,41 +11382,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">IDC_PREF_FORCE_AUTO_DISMOUNT</property>
+ <property name="label">IDC_PREF_FORCE_AUTO_UNMOUNT</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">ForceAutoDismountCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -11604,41 +11604,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT</property>
+ <property name="label">IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">WipeCacheOnAutoDismountCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -12598,41 +12598,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">TASKICON_PREF_DISMOUNT_VOL</property>
+ <property name="label">TASKICON_PREF_UNMOUNT_VOL</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">BackgroundTaskMenuDismountItemsEnabledCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -13022,41 +13022,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">LINUX_CLOSE_EXPL_ON_DISMOUNT</property>
+ <property name="label">LINUX_CLOSE_EXPL_ON_UNMOUNT</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">CloseExplorerWindowsOnDismountCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
@@ -14830,41 +14830,41 @@
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">LINUX_CONFIRM_AFTER_DISMOUNT</property>
+ <property name="label">LINUX_CONFIRM_AFTER_UNMOUNT</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">DisplayMessageAfterHotkeyDismountCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp
index fd1f9c2d..bbf9fe0d 100644
--- a/src/Main/Forms/VolumeCreationWizard.cpp
+++ b/src/Main/Forms/VolumeCreationWizard.cpp
@@ -605,41 +605,41 @@ namespace VeraCrypt
{
return GetCurrentStep();
}
if (SelectedVolumeType == VolumeType::Hidden)
OuterVolume = true;
return Step::VolumeLocation;
}
case Step::VolumeLocation:
{
VolumeLocationWizardPage *page = dynamic_cast <VolumeLocationWizardPage *> (GetCurrentPage());
SelectedVolumePath = page->GetVolumePath();
VolumeSize = 0;
if (forward)
{
if (Core->IsVolumeMounted (SelectedVolumePath))
{
- Gui->ShowInfo ("DISMOUNT_FIRST");
+ Gui->ShowInfo ("UNMOUNT_FIRST");
return GetCurrentStep();
}
if (SelectedVolumePath.IsDevice())
{
if (!DeviceWarningConfirmed && !Gui->AskYesNo (LangString["FORMAT_DEVICE_FOR_ADVANCED_ONLY"]))
return GetCurrentStep();
DeviceWarningConfirmed = true;
foreach_ref (const HostDevice &drive, Core->GetHostDevices())
{
if (drive.Path == SelectedVolumePath && !drive.Partitions.empty())
{
foreach_ref (const HostDevice &partition, drive.Partitions)
{
if (partition.MountPoint == "/")
{
Gui->ShowError (LangString["LINUX_ERROR_TRY_ENCRYPT_SYSTEM_DRIVE"]);
return GetCurrentStep();
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index 84daa1aa..75b326e5 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -140,41 +140,41 @@ namespace VeraCrypt
}
catch (...) { }
if (Core->GetMountedVolumes().size() < mountedVolumeCount)
OnVolumesAutoDismounted();
}
void GraphicUserInterface::BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const
{
wxWindow *parent = GetActiveWindow();
if (!volumePath || volumePath->IsEmpty())
volumePath = make_shared <VolumePath> (SelectVolumeFile (GetActiveWindow()));
if (volumePath->IsEmpty())
throw UserAbort (SRC_POS);
#ifdef TC_WINDOWS
if (Core->IsVolumeMounted (*volumePath))
{
- ShowInfo ("DISMOUNT_FIRST");
+ ShowInfo ("UNMOUNT_FIRST");
return;
}
#endif
#ifdef TC_UNIX
// Temporarily take ownership of a device if the user is not an administrator
UserId origDeviceOwner ((uid_t) -1);
if (!Core->HasAdminPrivileges() && volumePath->IsDevice())
{
origDeviceOwner = FilesystemPath (wstring (*volumePath)).GetOwner();
Core->SetFileOwner (*volumePath, UserId (getuid()));
}
finally_do_arg2 (FilesystemPath, *volumePath, UserId, origDeviceOwner,
{
if (finally_arg2.SystemId != (uid_t) -1)
Core->SetFileOwner (finally_arg, finally_arg2);
});
#endif
@@ -1139,41 +1139,41 @@ namespace VeraCrypt
catch (...)
{
Thread::Sleep (500);
}
VolumeInfoList mountedVolumes = Core->GetMountedVolumes();
}
}
}
#ifdef wxHAS_POWER_EVENTS
void GraphicUserInterface::OnPowerSuspending (wxPowerEvent& event)
{
size_t volumeCount = Core->GetMountedVolumes().size();
if (GetPreferences().BackgroundTaskEnabled && GetPreferences().DismountOnPowerSaving && volumeCount > 0)
{
OnAutoDismountAllEvent();
if (Core->GetMountedVolumes().size() < volumeCount)
- ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_DISMOUNTED"]);
+ ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_UNMOUNTED"]);
}
}
#endif
void GraphicUserInterface::OnSignal (int signal)
{
#ifdef TC_UNIX
Gui->SingleInstanceChecker.reset();
_exit (1);
#endif
}
void GraphicUserInterface::OnVolumesAutoDismounted ()
{
if (GetPreferences().WipeCacheOnAutoDismount)
{
Core->WipePasswordCache();
SecurityToken::CloseAllSessions();
}
}
@@ -1401,41 +1401,41 @@ namespace VeraCrypt
}
void GraphicUserInterface::OpenUserGuide (wxWindow *parent)
{
OpenHomepageLink (parent, L"help");
}
void GraphicUserInterface::RestoreVolumeHeaders (shared_ptr <VolumePath> volumePath) const
{
wxWindow *parent = GetActiveWindow();
if (!volumePath || volumePath->IsEmpty())
volumePath = make_shared <VolumePath> (SelectVolumeFile (GetActiveWindow()));
if (volumePath->IsEmpty())
throw UserAbort (SRC_POS);
#ifdef TC_WINDOWS
if (Core->IsVolumeMounted (*volumePath))
{
- ShowInfo ("DISMOUNT_FIRST");
+ ShowInfo ("UNMOUNT_FIRST");
return;
}
#endif
#ifdef TC_UNIX
// Temporarily take ownership of a device if the user is not an administrator
UserId origDeviceOwner ((uid_t) -1);
if (!Core->HasAdminPrivileges() && volumePath->IsDevice())
{
origDeviceOwner = FilesystemPath (wstring (*volumePath)).GetOwner();
Core->SetFileOwner (*volumePath, UserId (getuid()));
}
finally_do_arg2 (FilesystemPath, *volumePath, UserId, origDeviceOwner,
{
if (finally_arg2.SystemId != (uid_t) -1)
Core->SetFileOwner (finally_arg, finally_arg2);
});
#endif
diff --git a/src/Main/Hotkey.cpp b/src/Main/Hotkey.cpp
index 231528e1..ed6a2aff 100644
--- a/src/Main/Hotkey.cpp
+++ b/src/Main/Hotkey.cpp
@@ -10,44 +10,44 @@
code distribution packages.
*/
#include "System.h"
#include "Application.h"
#include "LanguageStrings.h"
#include "GraphicUserInterface.h"
#include "Hotkey.h"
#include "Xml.h"
namespace VeraCrypt
{
HotkeyList Hotkey::GetAvailableHotkeys ()
{
HotkeyList hotkeys;
#ifdef TC_WINDOWS
#define TC_HOTKEY(ID,LANG) hotkeys.push_back (shared_ptr <Hotkey> (new Hotkey (Id::##ID, L###ID, LangString[LANG])))
TC_HOTKEY (CloseAllSecurityTokenSessions, "IDM_CLOSE_ALL_TOKEN_SESSIONS");
- TC_HOTKEY (DismountAll, "HK_DISMOUNT_ALL");
- TC_HOTKEY (DismountAllWipeCache, "HK_DISMOUNT_ALL_AND_WIPE");
- TC_HOTKEY (ForceDismountAllWipeCache, "HK_FORCE_DISMOUNT_ALL_AND_WIPE");
- TC_HOTKEY (ForceDismountAllWipeCacheExit, "HK_FORCE_DISMOUNT_ALL_AND_WIPE_AND_EXIT");
+ TC_HOTKEY (DismountAll, "HK_UNMOUNT_ALL");
+ TC_HOTKEY (DismountAllWipeCache, "HK_UNMOUNT_ALL_AND_WIPE");
+ TC_HOTKEY (ForceDismountAllWipeCache, "HK_FORCE_UNMOUNT_ALL_AND_WIPE");
+ TC_HOTKEY (ForceDismountAllWipeCacheExit, "HK_FORCE_UNMOUNT_ALL_AND_WIPE_AND_EXIT");
TC_HOTKEY (MountAllDevices, "HK_AUTOMOUNT_DEVICES");
TC_HOTKEY (MountAllFavorites, "HK_MOUNT_FAVORITE_VOLUMES");
TC_HOTKEY (ShowHideApplication, "HK_SHOW_HIDE_MAIN_WINDOW");
TC_HOTKEY (WipeCache, "HK_WIPE_CACHE");
#endif
return hotkeys;
}
wxString Hotkey::GetShortcutString () const
{
wxString keyStr = Hotkey::GetVirtualKeyCodeString (VirtualKeyCode);
if (keyStr.empty())
return L"";
wxString str;
if (VirtualKeyModifiers & wxMOD_SHIFT)
str += LangString["VK_SHIFT"] + L"+";
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index 1f1b4b49..5217199d 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -273,41 +273,41 @@ namespace VeraCrypt
if (s.IsSameAs (L'y', false) || s.IsSameAs (L"yes", false) || (defaultYes && s.empty()))
return true;
};
}
shared_ptr <VolumePath> TextUserInterface::AskVolumePath (const wxString &message) const
{
return make_shared <VolumePath> (AskString (message.empty() ? wxString (_("Enter volume path: ")) : message));
}
void TextUserInterface::BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const
{
if (!volumePath)
volumePath = AskVolumePath();
if (!volumePath)
throw UserAbort (SRC_POS);
#ifdef TC_WINDOWS
if (Core->IsVolumeMounted (*volumePath))
- throw_err (LangString["DISMOUNT_FIRST"]);
+ throw_err (LangString["UNMOUNT_FIRST"]);
#endif
ShowInfo ("EXTERNAL_VOL_HEADER_BAK_FIRST_INFO");
shared_ptr <Pkcs5Kdf> kdf;
if (CmdLine->ArgHash)
{
kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
}
shared_ptr <Volume> normalVolume;
shared_ptr <Volume> hiddenVolume;
MountOptions normalVolumeMountOptions;
MountOptions hiddenVolumeMountOptions;
normalVolumeMountOptions.Path = volumePath;
hiddenVolumeMountOptions.Path = volumePath;
normalVolumeMountOptions.EMVSupportEnabled = true;
@@ -1520,41 +1520,41 @@ namespace VeraCrypt
throw UserAbort (SRC_POS);
}
wxString TextUserInterface::ReadInputStreamLine () const
{
wxString line;
ReadInputStreamLine (line);
return line;
}
void TextUserInterface::RestoreVolumeHeaders (shared_ptr <VolumePath> volumePath) const
{
if (!volumePath)
volumePath = AskVolumePath();
if (!volumePath)
throw UserAbort (SRC_POS);
#ifdef TC_WINDOWS
if (Core->IsVolumeMounted (*volumePath))
- throw_err (LangString["DISMOUNT_FIRST"]);
+ throw_err (LangString["UNMOUNT_FIRST"]);
#endif
// Ask whether to restore internal or external backup
bool restoreInternalBackup;
shared_ptr <Pkcs5Kdf> kdf;
if (CmdLine->ArgHash)
{
kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
}
ShowInfo (LangString["HEADER_RESTORE_EXTERNAL_INTERNAL"]);
ShowInfo (L"\n1) " + LangString["HEADER_RESTORE_INTERNAL"]);
ShowInfo (L"2) " + LangString["HEADER_RESTORE_EXTERNAL"] + L"\n");
switch (AskSelection (2))
{
case 1:
restoreInternalBackup = true;
break;
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 5f82db49..b507d9a3 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -205,41 +205,41 @@ namespace VeraCrypt
}
else
throw UserAbort (SRC_POS);
}
}
catch (...)
{
if (twoPassMode && firstPass)
volumesLeft.push_back (volume);
else
throw;
}
if (volume->HiddenVolumeProtectionTriggered)
ShowWarning (StringFormatter (LangString["DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"], wstring (volume->Path)));
if (Preferences.Verbose)
{
if (!message.IsEmpty())
message += L'\n';
- message += StringFormatter (LangString["LINUX_VOL_DISMOUNTED"], wstring (volume->Path));
+ message += StringFormatter (LangString["LINUX_VOL_UNMOUNTED"], wstring (volume->Path));
}
}
if (twoPassMode && firstPass)
{
volumes = volumesLeft;
if (volumesInUse && interactive)
{
if (AskYesNo (LangString["UNMOUNTALL_LOCK_FAILED"], true, true))
ignoreOpenFiles = true;
else
throw UserAbort (SRC_POS);
}
}
else
break;
firstPass = false;
}
@@ -1159,55 +1159,55 @@ const FileManager fileManagers[] = {
" Auto mount device-hosted or favorite volumes.\n"
"\n"
"--backup-headers[=VOLUME_PATH]\n"
" Backup volume headers to a file. All required options are requested from the\n"
" user.\n"
"\n"
"-c, --create[=VOLUME_PATH]\n"
" Create a new volume. Most options are requested from the user if not specified\n"
" on command line. See also options --encryption, -k, --filesystem, --hash, -p,\n"
" --random-source, --quick, --size, --volume-type. Note that passing some of the\n"
" options may affect security of the volume (see option -p for more information).\n"
"\n"
" Inexperienced users should use the graphical user interface to create a hidden\n"
" volume. When using the text user interface, the following procedure must be\n"
" followed to create a hidden volume:\n"
" 1) Create an outer volume with no filesystem.\n"
" 2) Create a hidden volume within the outer volume.\n"
" 3) Mount the outer volume using hidden volume protection.\n"
" 4) Create a filesystem on the virtual device of the outer volume.\n"
" 5) Mount the new filesystem and fill it with data.\n"
- " 6) Dismount the outer volume.\n"
+ " 6) Unmount the outer volume.\n"
" If at any step the hidden volume protection is triggered, start again from 1).\n"
"\n"
"--create-keyfile[=FILE_PATH]\n"
" Create a new keyfile containing pseudo-random data.\n"
"\n"
"-C, --change[=VOLUME_PATH]\n"
" Change a password and/or keyfile(s) of a volume. Most options are requested\n"
" from the user if not specified on command line. PKCS-5 PRF HMAC hash\n"
" algorithm can be changed with option --hash. See also options -k,\n"
" --new-keyfiles, --new-password, -p, --random-source.\n"
"\n"
- "-d, --dismount[=MOUNTED_VOLUME]\n"
- " Dismount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
- " volumes are dismounted. See below for description of MOUNTED_VOLUME.\n"
+ "-u, --unmount[=MOUNTED_VOLUME]\n"
+ " Unmount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
+ " volumes are unmounted. See below for description of MOUNTED_VOLUME.\n"
"\n"
"--delete-token-keyfiles\n"
" Delete keyfiles from security tokens. See also command --list-token-keyfiles.\n"
"\n"
"--export-token-keyfile\n"
" Export a keyfile from a token. See also command --list-token-keyfiles.\n"
"\n"
"--import-token-keyfiles\n"
" Import keyfiles to a security token. See also option --token-lib.\n"
"\n"
"-l, --list[=MOUNTED_VOLUME]\n"
" Display a list of mounted volumes. If MOUNTED_VOLUME is not specified, all\n"
" volumes are listed. By default, the list contains only volume path, virtual\n"
" device, and mount point. A more detailed list can be enabled by verbose\n"
" output option (-v). See below for description of MOUNTED_VOLUME.\n"
"\n"
"--list-token-keyfiles\n"
" Display a list of all available token keyfiles. See also command\n"
" --import-token-keyfiles.\n"
"\n""--list-securitytoken-keyfiles\n"
@@ -1244,133 +1244,133 @@ const FileManager fileManagers[] = {
" 2) Mount directory of the volume's filesystem (if mounted).\n"
" 3) Slot number of the mounted volume (requires --slot).\n"
"\n"
"\n"
"Options:\n"
"\n"
"--display-password\n"
" Display password characters while typing.\n"
"\n"
"--encryption=ENCRYPTION_ALGORITHM\n"
" Use specified encryption algorithm when creating a new volume. When cascading\n"
" algorithms, they must be separated by a dash. For example: AES-Twofish.\n"
"\n"
"--filesystem=TYPE\n"
" Filesystem type to mount. The TYPE argument is passed to mount(8) command\n"
" with option -t. Default type is 'auto'. When creating a new volume, this\n"
" option specifies the filesystem to be created on the new volume.\n"
" Filesystem type 'none' disables mounting or creating a filesystem.\n"
"\n"
"--force\n"
- " Force mounting of a volume in use, dismounting of a volume in use, or\n"
+ " Force mounting of a volume in use, unmounting of a volume in use, or\n"
" overwriting a file. Note that this option has no effect on some platforms.\n"
"\n"
"--fs-options=OPTIONS\n"
" Filesystem mount options. The OPTIONS argument is passed to mount(8)\n"
" command with option -o when a filesystem on a VeraCrypt volume is mounted.\n"
" This option is not available on some platforms.\n"
"\n"
"--hash=HASH\n"
" Use specified hash algorithm when creating a new volume or changing password\n"
" and/or keyfiles. This option also specifies the mixing PRF of the random\n"
" number generator.\n"
"\n"
"-k, --keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Use specified keyfiles when mounting a volume or when changing password\n"
" and/or keyfiles. When a directory is specified, all files inside it will be\n"
" used (non-recursively). Multiple keyfiles must be separated by comma.\n"
" Use double comma (,,) to specify a comma contained in keyfile's name.\n"
" Keyfile stored on a security token must be specified as\n"
" token://slot/SLOT_NUMBER/file/FILENAME for a security token keyfile\n"
" and emv://slot/SLOT_NUMBER for an EMV token keyfile.\n"
" An empty keyfile (-k \"\") disables\n"
" interactive requests for keyfiles. See also options --import-token-keyfiles,\n"
" --list-token-keyfiles, --list-securitytoken-keyfiles, --list-emvtoken-keyfiles,\n"
" --new-keyfiles, --protection-keyfiles.\n"
"\n"
"--load-preferences\n"
" Load user preferences.\n"
"\n"
"-m, --mount-options=OPTION1[,OPTION2,OPTION3,...]\n"
" Specifies comma-separated mount options for a VeraCrypt volume:\n"
" headerbak: Use backup headers when mounting a volume.\n"
" nokernelcrypto: Do not use kernel cryptographic services.\n"
" readonly|ro: Mount volume as read-only.\n"
" system: Mount partition using system encryption.\n"
" timestamp|ts: Do not restore host-file modification timestamp when a volume\n"
- " is dismounted (note that the operating system under certain circumstances\n"
+ " is unmounted (note that the operating system under certain circumstances\n"
" does not alter host-file timestamps, which may be mistakenly interpreted\n"
" to mean that this option does not work).\n"
" See also option --fs-options.\n"
"\n"
"--new-keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Add specified keyfiles to a volume. This option can only be used with command\n"
" -C.\n"
"\n"
"--new-password=PASSWORD\n"
" Specifies a new password. This option can only be used with command -C.\n"
"\n"
"--new-pim=PIM\n"
" Specifies a new PIM. This option can only be used with command -C.\n"
"\n"
"-p, --password=PASSWORD\n"
" Use specified password to mount/open a volume. An empty password can also be\n"
" specified (-p \"\"). Note that passing a password on the command line is\n"
" potentially insecure as the password may be visible in the process list\n"
" (see ps(1)) and/or stored in a command history file or system logs.\n"
"\n"
"--pim=PIM\n"
" Use specified PIM to mount/open a volume. Note that passing a PIM on the \n"
" command line is potentially insecure as the PIM may be visible in the process \n"
" list (see ps(1)) and/or stored in a command history file or system logs.\n"
"\n"
"--protect-hidden=yes|no\n"
" Write-protect a hidden volume when mounting an outer volume. Before mounting\n"
" the outer volume, the user will be prompted for a password to open the hidden\n"
" volume. The size and position of the hidden volume is then determined and the\n"
" outer volume is mounted with all sectors belonging to the hidden volume\n"
" protected against write operations. When a write to the protected area is\n"
" prevented, the whole volume is switched to read-only mode. Verbose list\n"
" (-v -l) can be used to query the state of the hidden volume protection.\n"
" Warning message is displayed when a volume switched to read-only is being\n"
- " dismounted.\n"
+ " unmounted.\n"
"\n"
"--protection-keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Use specified keyfiles to open a hidden volume to be protected. This option\n"
" may be used only when mounting an outer volume with hidden volume protected.\n"
" See also options -k and --protect-hidden.\n"
"\n"
"--protection-password=PASSWORD\n"
" Use specified password to open a hidden volume to be protected. This option\n"
" may be used only when mounting an outer volume with hidden volume protected.\n"
" See also options -p and --protect-hidden.\n"
"\n"
"--quick\n"
" Do not encrypt free space when creating a device-hosted volume. This option\n"
" must not be used when creating an outer volume.\n"
"\n"
"--random-source=FILE\n"
" Use FILE as a source of random data (e.g., when creating a volume) instead\n"
" of requiring the user to type random characters.\n"
"\n"
"--slot=SLOT\n"
- " Use specified slot number when mounting, dismounting, or listing a volume.\n"
+ " Use specified slot number when mounting, unmounting, or listing a volume.\n"
"\n"
"--size=SIZE[K|KiB|M|MiB|G|GiB|T|TiB] or --size=max\n"
" Use specified size when creating a new volume. If no suffix is indicated,\n"
" then SIZE is interpreted in bytes. Suffixes K, M, G or T can be used to\n"
" indicate a value in KiB, MiB, GiB or TiB respectively.\n"
" If max is specified, the new volume will use all available free disk space.\n"
"\n"
"-t, --text\n"
" Use text user interface. Graphical user interface is used by default if\n"
" available. This option must be specified as the first argument.\n"
"\n"
"--token-lib=LIB_PATH\n"
" Use specified PKCS #11 security token library.\n"
"\n"
"--volume-type=TYPE\n"
" Use specified volume type when creating a new volume. TYPE can be 'normal'\n"
" or 'hidden'. See option -c for more information on creating hidden volumes.\n"
"\n"
"-v, --verbose\n"
" Enable verbose output.\n"
@@ -1381,45 +1381,45 @@ const FileManager fileManagers[] = {
"If you want to use VeraCrypt, you must follow the security requirements and\n"
"security precautions listed in chapter 'Security Requirements and Precautions'\n"
"in the VeraCrypt documentation (file 'VeraCrypt User Guide.pdf').\n"
"\n"
"\nExamples:\n\n"
"Create a new volume:\n"
"veracrypt -t -c\n"
"\n"
"Mount a volume:\n"
"veracrypt volume.hc /media/veracrypt1\n"
"\n"
"Mount a volume as read-only, using keyfiles:\n"
"veracrypt -m ro -k keyfile1,keyfile2 volume.hc\n"
"\n"
"Mount a volume without mounting its filesystem:\n"
"veracrypt --filesystem=none volume.hc\n"
"\n"
"Mount a volume prompting only for its password:\n"
"veracrypt -t -k \"\" --pim=0 --protect-hidden=no volume.hc /media/veracrypt1\n"
"\n"
- "Dismount a volume:\n"
- "veracrypt -d volume.hc\n"
+ "Unmount a volume:\n"
+ "veracrypt -u volume.hc\n"
"\n"
- "Dismount all mounted volumes:\n"
- "veracrypt -d\n"
+ "Unmount all mounted volumes:\n"
+ "veracrypt -u\n"
);
#ifndef TC_NO_GUI
if (Application::GetUserInterfaceType() == UserInterfaceType::Graphic)
{
wxDialog dialog (nullptr, wxID_ANY, LangString["LINUX_CMD_HELP"], wxDefaultPosition);
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
textCtrl->SetFont (wxFont (wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Courier"));
textCtrl->SetValue (helpText);
int fontWidth, fontHeight;
textCtrl->GetTextExtent (L"A", &fontWidth, &fontHeight);
dialog.SetSize (wxSize (fontWidth * 85, fontHeight * 29));
wxBoxSizer *sizer = new wxBoxSizer (wxVERTICAL);
sizer->Add (textCtrl, 1, wxALL | wxEXPAND, 5);
sizer->Add (new wxButton (&dialog, wxID_OK, LangString["IDOK"]), 0, wxALL | wxALIGN_CENTER_HORIZONTAL, 5);
dialog.SetSizer (sizer);