mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-12 03:18:26 -06:00
new xml Tag for en and de (#708)
* new xml Tag for en and de * add linux support for env LANG * precopiled header into TrueCrypt.fdp to substitute '_()' with 'LangString[]' * more LangString in Code * add Language xml's to Linux Setup location * backup language for linux is en * remove Language.en.xml install * rearange new xml lines to end * yes/no dialogs now translated * All OK/Cancel Button now support international Co-authored-by: tb@tbon.de <tb@tbon.de>
This commit is contained in:
T-Bonhagen
GitHub
@@ -48,21 +48,21 @@ namespace VeraCrypt
|
||||
enableNewPassword = true;
|
||||
enableNewKeyfiles = true;
|
||||
enablePkcs5Prf = true;
|
||||
SetTitle (_("Change Volume Password and Keyfiles"));
|
||||
SetTitle (LangString["IDD_PASSWORDCHANGE_DLG"]);
|
||||
break;
|
||||
|
||||
case Mode::ChangeKeyfiles:
|
||||
enableNewKeyfiles = true;
|
||||
SetTitle (_("Add/Remove Keyfiles to/from Volume"));
|
||||
SetTitle (LangString["IDD_PCDM_ADD_REMOVE_VOL_KEYFILES"]);
|
||||
break;
|
||||
|
||||
case Mode::RemoveAllKeyfiles:
|
||||
SetTitle (_("Remove All Keyfiles from Volume"));
|
||||
SetTitle (LangString["IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL"]);
|
||||
break;
|
||||
|
||||
case Mode::ChangePkcs5Prf:
|
||||
enablePkcs5Prf = true;
|
||||
SetTitle (_("Change Header Key Derivation Algorithm"));
|
||||
SetTitle (LangString["IDD_PCDM_CHANGE_PKCS5_PRF"]);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace VeraCrypt
|
||||
}
|
||||
|
||||
#ifdef TC_WINDOWS
|
||||
fields[ColumnDevice] = StringFormatter (L"{0} {1}:", _("Harddisk"), device.SystemNumber);
|
||||
fields[ColumnDevice] = StringFormatter (L"{0} {1}:", LangString["HARDDISK"], device.SystemNumber);
|
||||
fields[ColumnDrive] = device.MountPoint;
|
||||
fields[ColumnName] = device.Name;
|
||||
#else
|
||||
@@ -120,21 +120,20 @@ namespace VeraCrypt
|
||||
Fit();
|
||||
Layout();
|
||||
Center();
|
||||
|
||||
StdButtonsOK->Disable();
|
||||
StdButtonsOK->SetDefault();
|
||||
OKButton->Disable();
|
||||
OKButton->SetDefault();
|
||||
}
|
||||
|
||||
void DeviceSelectionDialog::OnListItemActivated (wxListEvent& event)
|
||||
{
|
||||
if (StdButtonsOK->IsEnabled())
|
||||
if (OKButton->IsEnabled())
|
||||
EndModal (wxID_OK);
|
||||
}
|
||||
|
||||
void DeviceSelectionDialog::OnListItemDeselected (wxListEvent& event)
|
||||
{
|
||||
if (DeviceListCtrl->GetSelectedItemCount() == 0)
|
||||
StdButtonsOK->Disable();
|
||||
OKButton->Disable();
|
||||
}
|
||||
|
||||
void DeviceSelectionDialog::OnListItemSelected (wxListEvent& event)
|
||||
@@ -144,9 +143,9 @@ namespace VeraCrypt
|
||||
if (device && device->Size)
|
||||
{
|
||||
SelectedDevice = *device;
|
||||
StdButtonsOK->Enable();
|
||||
OKButton->Enable();
|
||||
}
|
||||
else
|
||||
StdButtonsOK->Disable();
|
||||
OKButton->Disable();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ namespace VeraCrypt
|
||||
else
|
||||
EncryptionAlgorithmStaticText->SetLabel (L"");
|
||||
|
||||
EncryptionAlgorithmHyperlink->SetLabel (_("More information"));
|
||||
EncryptionAlgorithmHyperlink->SetLabel (LangString["IDC_MORE_INFO_SYS_ENCRYPTION"]);
|
||||
}
|
||||
|
||||
Layout();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -41,6 +41,8 @@
|
||||
#include <wx/spinctrl.h>
|
||||
#include <wx/notebook.h>
|
||||
|
||||
#include "international.h"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
namespace VeraCrypt
|
||||
@@ -244,7 +246,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Algorithms Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_BENCHMARK_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~BenchmarkDialogBase();
|
||||
|
||||
};
|
||||
@@ -284,19 +286,19 @@ namespace VeraCrypt
|
||||
|
||||
protected:
|
||||
wxListCtrl* DeviceListCtrl;
|
||||
wxStdDialogButtonSizer* StdButtons;
|
||||
wxButton* StdButtonsOK;
|
||||
wxButton* StdButtonsCancel;
|
||||
wxButton* CancelButton;
|
||||
wxButton* OKButton;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
|
||||
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
|
||||
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a Partition or Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_RAWDEVICES_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~DeviceSelectionDialogBase();
|
||||
|
||||
};
|
||||
@@ -335,7 +337,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_CIPHER_TEST_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~EncryptionTestDialogBase();
|
||||
|
||||
};
|
||||
@@ -368,7 +370,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Favorite Volumes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_FAVORITE_VOLUMES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~FavoriteVolumesDialogBase();
|
||||
|
||||
};
|
||||
@@ -398,7 +400,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("SELECT_TOKEN_KEYFILES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~KeyfilesDialogBase();
|
||||
|
||||
};
|
||||
@@ -455,7 +457,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("LEGAL_NOTICES_DLG_TITLE"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~LegalNoticesDialogBase();
|
||||
|
||||
};
|
||||
@@ -507,7 +509,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter VeraCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_PASSWORD_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~MountOptionsDialogBase();
|
||||
|
||||
};
|
||||
@@ -522,17 +524,17 @@ namespace VeraCrypt
|
||||
protected:
|
||||
wxChoice* SecurityTokenChoice;
|
||||
wxTextCtrl* KeyfileNameTextCtrl;
|
||||
wxStdDialogButtonSizer* StdButtons;
|
||||
wxButton* StdButtonsOK;
|
||||
wxButton* StdButtonsCancel;
|
||||
wxButton* CancelButton;
|
||||
wxButton* OKButton;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnKeyfileNameChanged( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Security Token Keyfile Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_TOKEN_PREFERENCES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~NewSecurityTokenKeyfileDialogBase();
|
||||
|
||||
};
|
||||
@@ -545,6 +547,7 @@ namespace VeraCrypt
|
||||
private:
|
||||
|
||||
protected:
|
||||
wxBoxSizer* bSizer32;
|
||||
wxNotebook* PreferencesNotebook;
|
||||
wxPanel* SecurityPage;
|
||||
wxStaticBoxSizer* AutoDismountSizer;
|
||||
@@ -600,9 +603,8 @@ namespace VeraCrypt
|
||||
wxButton* RemoveHotkeyButton;
|
||||
wxCheckBox* BeepAfterHotkeyMountDismountCheckBox;
|
||||
wxCheckBox* DisplayMessageAfterHotkeyDismountCheckBox;
|
||||
wxStdDialogButtonSizer* StdButtons;
|
||||
wxButton* StdButtonsOK;
|
||||
wxButton* StdButtonsCancel;
|
||||
wxButton* OKButton;
|
||||
wxButton* CancelButton;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
|
||||
@@ -618,7 +620,6 @@ namespace VeraCrypt
|
||||
virtual void OnHotkeyListItemSelected( wxListEvent& event ) { event.Skip(); }
|
||||
virtual void OnAssignHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnRemoveHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
@@ -628,7 +629,7 @@ namespace VeraCrypt
|
||||
wxPanel* SecurityTokensPage;
|
||||
wxPanel* HotkeysPage;
|
||||
|
||||
PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_PREFERENCES_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~PreferencesDialogBase();
|
||||
|
||||
};
|
||||
@@ -657,7 +658,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_RANDOM_POOL_ENRICHMENT"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~RandomPoolEnrichmentDialogBase();
|
||||
|
||||
};
|
||||
@@ -689,7 +690,7 @@ namespace VeraCrypt
|
||||
|
||||
public:
|
||||
|
||||
SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Security Token Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_KEYFILES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~SecurityTokenKeyfilesDialogBase();
|
||||
|
||||
};
|
||||
@@ -703,12 +704,15 @@ namespace VeraCrypt
|
||||
|
||||
protected:
|
||||
wxListCtrl* PropertiesListCtrl;
|
||||
wxStdDialogButtonSizer* StdButtons;
|
||||
wxButton* StdButtonsOK;
|
||||
wxButton* OKButton;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Volume Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||
VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_VOLUME_PROPERTIES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~VolumePropertiesDialogBase();
|
||||
|
||||
};
|
||||
|
||||
@@ -219,7 +219,7 @@ namespace VeraCrypt
|
||||
L"cmd.exe", args.c_str(), nullptr, SW_SHOW);
|
||||
#else
|
||||
# ifdef TC_MACOSX
|
||||
Gui->ShowInfo (_("Disk Utility will be launched after you press 'OK'.\n\nPlease select your volume in the Disk Utility window and press 'Verify Disk' or 'Repair Disk' button on the 'First Aid' page."));
|
||||
Gui->ShowInfo (LangString["LINUX_FIRST_AID"]);
|
||||
# endif
|
||||
Core->CheckFilesystem (selectedVolume, repair);
|
||||
UpdateVolumeList();
|
||||
@@ -282,15 +282,15 @@ namespace VeraCrypt
|
||||
VolumeStaticBoxSizer->Detach (VolumeGridBagSizer);
|
||||
VolumeStaticBoxSizer->Add (VolumeGridBagSizer, 1, wxEXPAND, 0);
|
||||
|
||||
ExitButton->SetLabel (_("Close"));
|
||||
MountAllDevicesButton->SetLabel (_("Mount All Devices"));
|
||||
ExitButton->SetLabel (LangString["CLOSE"]);
|
||||
MountAllDevicesButton->SetLabel (LangString["LINUX_MOUNT_ALL_DEV"]);
|
||||
#endif
|
||||
|
||||
#ifdef TC_WINDOWS
|
||||
SlotListCtrl->InsertColumn (ColumnSlot, LangString["DRIVE"], wxLIST_FORMAT_LEFT, 1);
|
||||
colPermilles.push_back (75);
|
||||
#else
|
||||
SlotListCtrl->InsertColumn (ColumnSlot, _("Slot"), wxLIST_FORMAT_LEFT, 1);
|
||||
SlotListCtrl->InsertColumn (ColumnSlot, LangString["TOKEN_SLOT_ID"], wxLIST_FORMAT_LEFT, 1);
|
||||
colPermilles.push_back (82);
|
||||
#endif
|
||||
|
||||
@@ -493,7 +493,7 @@ namespace VeraCrypt
|
||||
catch (exception &e)
|
||||
{
|
||||
Gui->ShowError (e);
|
||||
Gui->ShowError (_("Error while loading configuration files located in ") + wstring (Application::GetConfigFilePath (L"")));
|
||||
Gui->ShowError (LangString["LINUX_ERROR_LOADING_CONFIG"] + wstring (Application::GetConfigFilePath (L"")));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -514,8 +514,8 @@ namespace VeraCrypt
|
||||
Gui->AppendToMenu (*popup, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"], this, wxCommandEventHandler (TaskBarIcon::OnShowHideMenuItemSelected));
|
||||
|
||||
popup->AppendSeparator();
|
||||
Gui->AppendToMenu (*popup, _("Mount All Favorite Volumes"), this, wxCommandEventHandler (TaskBarIcon::OnMountAllFavoritesMenuItemSelected))->Enable (!Busy);
|
||||
Gui->AppendToMenu (*popup, _("Dismount All Mounted Volumes"), this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
|
||||
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);
|
||||
|
||||
// Favorite volumes
|
||||
if (Gui->GetPreferences().BackgroundTaskMenuMountItemsEnabled && !Frame->FavoriteVolumesMenuMap.empty())
|
||||
@@ -524,7 +524,8 @@ namespace VeraCrypt
|
||||
typedef pair <int, FavoriteVolume> FavMapPair;
|
||||
foreach (FavMapPair fp, Frame->FavoriteVolumesMenuMap)
|
||||
{
|
||||
Gui->AppendToMenu (*popup, LangString["MOUNT"] + L" " + wstring (fp.second.Path) + (fp.second.MountPoint.IsEmpty() ? L"" : L" " + wstring (fp.second.MountPoint)),
|
||||
//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);
|
||||
}
|
||||
}
|
||||
@@ -569,10 +570,10 @@ namespace VeraCrypt
|
||||
}
|
||||
|
||||
popup->AppendSeparator();
|
||||
Gui->AppendToMenu (*popup, _("Preferences..."), this, wxCommandEventHandler (TaskBarIcon::OnPreferencesMenuItemSelected))->Enable (!Busy);
|
||||
Gui->AppendToMenu (*popup, LangString["IDM_PREFERENCES"], this, wxCommandEventHandler (TaskBarIcon::OnPreferencesMenuItemSelected))->Enable (!Busy);
|
||||
#ifndef TC_MACOSX
|
||||
popup->AppendSeparator();
|
||||
Gui->AppendToMenu (*popup, _("Exit"), this, wxCommandEventHandler (TaskBarIcon::OnExitMenuItemSelected))->Enable (!Busy && Frame->CanExit());
|
||||
Gui->AppendToMenu (*popup, LangString["EXIT"], this, wxCommandEventHandler (TaskBarIcon::OnExitMenuItemSelected))->Enable (!Busy && Frame->CanExit());
|
||||
#endif
|
||||
return popup.release();
|
||||
}
|
||||
@@ -692,7 +693,7 @@ namespace VeraCrypt
|
||||
{
|
||||
if (!IsFreeSlotSelected())
|
||||
{
|
||||
Gui->ShowWarning (_("Please select a free drive slot from the list."));
|
||||
Gui->ShowWarning (LangString["LINUX_SELECT_FREE_SLOT"]);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1143,10 +1144,10 @@ namespace VeraCrypt
|
||||
{
|
||||
Gui->AppendToMenu (popup, LangString["DISMOUNT"], this, wxCommandEventHandler (MainFrame::OnDismountVolumeMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["OPEN"], this, wxCommandEventHandler (MainFrame::OnOpenVolumeMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, _("Deselect"), this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["LINUX_DESELECT"], this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
|
||||
|
||||
popup.AppendSeparator();
|
||||
Gui->AppendToMenu (popup, _("Add to Favorites..."), this, wxCommandEventHandler (MainFrame::OnAddToFavoritesMenuItemSelected));
|
||||
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));
|
||||
@@ -1159,7 +1160,7 @@ namespace VeraCrypt
|
||||
}
|
||||
else if (IsFreeSlotSelected())
|
||||
{
|
||||
Gui->AppendToMenu (popup, _("Mount Volume"), this, wxCommandEventHandler (MainFrame::OnMountVolumeMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_MOUNT_VOLUME"], this, wxCommandEventHandler (MainFrame::OnMountVolumeMenuItemSelected));
|
||||
|
||||
popup.AppendSeparator();
|
||||
|
||||
@@ -1168,7 +1169,7 @@ namespace VeraCrypt
|
||||
|
||||
popup.AppendSeparator();
|
||||
|
||||
Gui->AppendToMenu (popup, _("Deselect"), this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["LINUX_DESELECT"], this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
|
||||
|
||||
PopupMenu (&popup);
|
||||
}
|
||||
@@ -1483,21 +1484,21 @@ namespace VeraCrypt
|
||||
|
||||
wxMenu popup;
|
||||
|
||||
Gui->AppendToMenu (popup, _("Change Volume Password..."), this, wxCommandEventHandler (MainFrame::OnChangePasswordMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_CHANGE_PASSWORD"], this, wxCommandEventHandler (MainFrame::OnChangePasswordMenuItemSelected));
|
||||
|
||||
popup.AppendSeparator ();
|
||||
|
||||
Gui->AppendToMenu (popup, _("Add/Remove Keyfiles to/from Volume..."), this, wxCommandEventHandler (MainFrame::OnChangeKeyfilesMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, _("Remove All Keyfiles from Volume..."), this, wxCommandEventHandler (MainFrame::OnRemoveKeyfilesMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_ADD_REMOVE_VOL_KEYFILES"], this, wxCommandEventHandler (MainFrame::OnChangeKeyfilesMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_REMOVE_ALL_KEYFILES_FROM_VOL"], this, wxCommandEventHandler (MainFrame::OnRemoveKeyfilesMenuItemSelected));
|
||||
|
||||
popup.AppendSeparator ();
|
||||
|
||||
Gui->AppendToMenu (popup, _("Change Header Key Derivation Algorithm..."), this, wxCommandEventHandler (MainFrame::OnChangePkcs5PrfMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_CHANGE_SYS_HEADER_KEY_DERIV_ALGO"], this, wxCommandEventHandler (MainFrame::OnChangePkcs5PrfMenuItemSelected));
|
||||
|
||||
popup.AppendSeparator ();
|
||||
|
||||
Gui->AppendToMenu (popup, _("Backup Volume Header..."), this, wxCommandEventHandler (MainFrame::OnBackupVolumeHeadersMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, _("Restore Volume Header..."), this, wxCommandEventHandler (MainFrame::OnRestoreVolumeHeaderMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_BACKUP_VOL_HEADER"], this, wxCommandEventHandler (MainFrame::OnBackupVolumeHeadersMenuItemSelected));
|
||||
Gui->AppendToMenu (popup, LangString["IDM_RESTORE_VOL_HEADER"], this, wxCommandEventHandler (MainFrame::OnRestoreVolumeHeaderMenuItemSelected));
|
||||
|
||||
PopupMenu (&popup, VolumeToolsButton->GetPosition().x + 2, VolumeToolsButton->GetPosition().y + 2);
|
||||
}
|
||||
@@ -1587,7 +1588,7 @@ namespace VeraCrypt
|
||||
{
|
||||
bool mounted = IsMountedSlotSelected();
|
||||
|
||||
VolumeButton->SetLabel (mounted ? LangString["DISMOUNT"] : wxString (_("Mount")));
|
||||
VolumeButton->SetLabel (mounted ? LangString["UNMOUNT_BUTTON"] : LangString["MOUNT_BUTTON"]);
|
||||
VolumePropertiesButton->Enable (mounted);
|
||||
|
||||
DismountVolumeMenuItem->Enable (mounted);
|
||||
|
||||
@@ -88,7 +88,7 @@ namespace VeraCrypt
|
||||
OptionsButton->SetLabel (OptionsButtonLabel + L" >");
|
||||
OptionsPanel->Show (false);
|
||||
|
||||
ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, _("P&assword to hidden volume:"));
|
||||
ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, LangString["IDT_HIDDEN_PROT_PASSWD"]);
|
||||
ProtectionPasswordSizer->Add (ProtectionPasswordPanel, 1, wxALL | wxEXPAND);
|
||||
|
||||
UpdateDialog();
|
||||
@@ -143,7 +143,7 @@ namespace VeraCrypt
|
||||
|
||||
if (Options.PartitionInSystemEncryptionScope && Options.Password->Size() > VolumePassword::MaxLegacySize)
|
||||
{
|
||||
Gui->ShowWarning (StringFormatter (_("System Encryption password is longer than {0} characters."), (int) VolumePassword::MaxLegacySize));
|
||||
Gui->ShowWarning (StringFormatter (LangString["LINUX_SYSTEM_ENC_PW_LENGTH_NOTE"], (int) VolumePassword::MaxLegacySize));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace VeraCrypt
|
||||
|
||||
void NewSecurityTokenKeyfileDialog::OnKeyfileNameChanged (wxCommandEvent& event)
|
||||
{
|
||||
StdButtonsOK->Enable (!KeyfileNameTextCtrl->GetValue().empty());
|
||||
OKButton->Enable(!KeyfileNameTextCtrl->GetValue().empty());
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,8 +135,8 @@ namespace VeraCrypt
|
||||
|
||||
#ifdef TC_MACOSX
|
||||
DismountOnScreenSaverCheckBox->Show (false);
|
||||
DismountOnLogOffCheckBox->SetLabel (_("VeraCrypt quits"));
|
||||
OpenExplorerWindowAfterMountCheckBox->SetLabel (_("Open Finder window for successfully mounted volume"));
|
||||
DismountOnLogOffCheckBox->SetLabel (LangString["LINUX_VC_QUITS"]);
|
||||
OpenExplorerWindowAfterMountCheckBox->SetLabel (LangString["LINUX_OPEN_FINDER"]);
|
||||
|
||||
MountRemovableCheckBox->Show (false);
|
||||
FilesystemSizer->Show (false);
|
||||
@@ -200,7 +200,7 @@ namespace VeraCrypt
|
||||
Fit();
|
||||
Center();
|
||||
|
||||
StdButtonsOK->SetDefault();
|
||||
OKButton->SetDefault();
|
||||
|
||||
#ifdef TC_WINDOWS
|
||||
// Hotkey timer
|
||||
@@ -302,20 +302,20 @@ namespace VeraCrypt
|
||||
if (Gui->AskYesNo (LangString["CONFIRM_SETTING_DEGRADES_PERFORMANCE"], true, true))
|
||||
{
|
||||
#ifdef TC_LINUX
|
||||
Gui->ShowWarning (_("Please note that this setting takes effect only if use of the kernel cryptographic services is disabled."));
|
||||
Gui->ShowWarning (LangString["LINUX_DISABLE_KERNEL_ONLY_SETTING"]);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
NoHardwareCryptoCheckBox->SetValue (false);
|
||||
}
|
||||
|
||||
Gui->ShowWarning (_("Please note that any currently mounted volumes need to be remounted before they can use this setting."));
|
||||
Gui->ShowWarning (LangString["LINUX_REMOUNT_BECAUSEOF_SETTING"]);
|
||||
}
|
||||
|
||||
void PreferencesDialog::OnNoKernelCryptoCheckBoxClick (wxCommandEvent& event)
|
||||
{
|
||||
if (event.IsChecked())
|
||||
NoKernelCryptoCheckBox->SetValue (Gui->AskYesNo (_("Disabling the use of kernel cryptographic services can degrade performance.\n\nAre you sure?"), false, true));
|
||||
NoKernelCryptoCheckBox->SetValue (Gui->AskYesNo (LangString["LINUX_DISABLE_KERNEL_CRYPT_CONFIRM"], false, true));
|
||||
}
|
||||
|
||||
void PreferencesDialog::OnClose (wxCloseEvent& event)
|
||||
@@ -424,7 +424,7 @@ namespace VeraCrypt
|
||||
{
|
||||
#ifdef TC_LINUX
|
||||
if (!event.IsChecked())
|
||||
Gui->ShowInfo (_("Please note that disabling this option may have no effect on volumes mounted using kernel cryptographic services."));
|
||||
Gui->ShowInfo (LangString["LINUX_KERNEL_CRYPT_OPTION_CHANGE_MOUNTED_HINT"]);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -117,7 +117,7 @@ namespace VeraCrypt
|
||||
page->SetPageTitle (LangString["INTRO_TITLE"]);
|
||||
|
||||
page->AddChoice (VolumeHostType::File, LangString["IDC_FILE_CONTAINER"], LangString["IDT_FILE_CONTAINER"], L"introcontainer", LangString["IDC_MORE_INFO_ON_CONTAINERS"]);
|
||||
page->AddChoice (VolumeHostType::Device, _("Create a volume within a partition/&drive"), _("Formats and encrypts a non-system partition, entire external or secondary drive, entire USB stick, etc."));
|
||||
page->AddChoice (VolumeHostType::Device, LangString["IDC_NONSYS_DEVICE"], LangString["IDT_NON_SYS_DEVICE"]);
|
||||
|
||||
page->SetSelection (SelectedVolumeHostType);
|
||||
return page;
|
||||
@@ -138,7 +138,7 @@ namespace VeraCrypt
|
||||
case Step::VolumeLocation:
|
||||
{
|
||||
VolumeLocationWizardPage *page = new VolumeLocationWizardPage (GetPageParent(), SelectedVolumeHostType);
|
||||
page->SetPageTitle (LangString["VOLUME_LOCATION"]);
|
||||
page->SetPageTitle (LangString["LOCATION"]);
|
||||
|
||||
if (SelectedVolumeType == VolumeType::Hidden)
|
||||
page->SetPageText (LangString[SelectedVolumeHostType == VolumeHostType::File ? "FILE_HELP_HIDDEN_HOST_VOL" : "DEVICE_HELP_HIDDEN_HOST_VOL"]);
|
||||
@@ -179,8 +179,8 @@ namespace VeraCrypt
|
||||
else if (SelectedVolumeType == VolumeType::Hidden)
|
||||
{
|
||||
pageTitle = LangString["SIZE_HIDVOL_TITLE"];
|
||||
pageText = LangString["SIZE_HELP_HIDDEN_VOL"] + L"\n\n" + _("Please note that if your operating system does not allocate files from the beginning of the free space, the maximum possible hidden volume size may be much smaller than the size of the free space on the outer volume. This is not a bug in VeraCrypt but a limitation of the operating system.");
|
||||
freeSpaceText = StringFormatter (_("Maximum possible hidden volume size for this volume is {0}."), Gui->SizeToString (MaxHiddenVolumeSize));
|
||||
pageText = LangString["SIZE_HELP_HIDDEN_VOL"] + L"\n\n" + LangString["LINUX_DYNAMIC_NOTICE"];
|
||||
freeSpaceText = StringFormatter (LangString["LINUX_MAX_HIDDEN_SIZE"], Gui->SizeToString (MaxHiddenVolumeSize));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -246,11 +246,9 @@ namespace VeraCrypt
|
||||
SingleChoiceWizardPage <bool> *page = new SingleChoiceWizardPage <bool> (GetPageParent(), wxEmptyString, true);
|
||||
page->SetPageTitle (LangString["FILESYS_PAGE_TITLE"]);
|
||||
|
||||
page->AddChoice (false, _("I will not store files larger than 4 GB on the volume"),
|
||||
_("Choose this option if you do not need to store files larger than 4 GB (4,294,967,296 bytes) on the volume."));
|
||||
page->AddChoice (true, LangString["UISTR_YES"],LangString["FILESYS_PAGE_HELP_QUESTION"]);
|
||||
|
||||
page->AddChoice (true, _("I will store files larger than 4 GB on the volume"),
|
||||
_("Choose this option if you need to store files larger than 4 GB (4,294,967,296 bytes) on the volume."));
|
||||
page->AddChoice (false, LangString["UISTR_NO"],LangString["FILESYS_PAGE_HELP_EXPLANATION"]);
|
||||
|
||||
page->SetSelection (LargeFilesSupport);
|
||||
return page;
|
||||
@@ -264,7 +262,7 @@ namespace VeraCrypt
|
||||
VolumeFormatOptionsWizardPage *page = new VolumeFormatOptionsWizardPage (GetPageParent(), filesystemSize, SectorSize,
|
||||
SelectedVolumePath.IsDevice() && (OuterVolume || SelectedVolumeType != VolumeType::Hidden), OuterVolume, LargeFilesSupport);
|
||||
|
||||
page->SetPageTitle (_("Format Options"));
|
||||
page->SetPageTitle (LangString["FORMAT_TITLE"]);
|
||||
page->SetFilesystemType (SelectedFilesystemType);
|
||||
|
||||
if (!OuterVolume && SelectedVolumeType == VolumeType::Hidden)
|
||||
@@ -277,13 +275,12 @@ namespace VeraCrypt
|
||||
case Step::CrossPlatformSupport:
|
||||
{
|
||||
SingleChoiceWizardPage <bool> *page = new SingleChoiceWizardPage <bool> (GetPageParent(), wxEmptyString, true);
|
||||
page->SetPageTitle (_("Cross-Platform Support"));
|
||||
page->SetPageTitle ( LangString["LINUX_CROSS_SUPPORT"]);
|
||||
|
||||
page->AddChoice (true, _("I will mount the volume on other platforms"),
|
||||
_("Choose this option if you need to use the volume on other platforms."));
|
||||
page->AddChoice (true, LangString["LINUX_CROSS_SUPPORT_OTHER"], LangString["LINUX_CROSS_SUPPORT_OTHER_HELP"]);
|
||||
|
||||
page->AddChoice (false, StringFormatter (_("I will mount the volume only on {0}"), SystemInfo::GetPlatformName()),
|
||||
_("Choose this option if you do not need to use the volume on other platforms."));
|
||||
page->AddChoice (false, StringFormatter ( LangString["LINUX_CROSS_SUPPORT_ONLY"], SystemInfo::GetPlatformName()),
|
||||
LangString["LINUX_CROSS_SUPPORT_ONLY_HELP"]);
|
||||
|
||||
page->SetSelection (CrossPlatformSupport);
|
||||
return page;
|
||||
@@ -312,7 +309,7 @@ namespace VeraCrypt
|
||||
page->SetPageTitle (LangString["FORMAT_FINISHED_TITLE"]);
|
||||
page->SetPageText (LangString["FORMAT_FINISHED_HELP"]);
|
||||
|
||||
SetCancelButtonText (_("Exit"));
|
||||
SetCancelButtonText (LangString["IDC_EXIT"]);
|
||||
return page;
|
||||
}
|
||||
|
||||
@@ -353,13 +350,12 @@ namespace VeraCrypt
|
||||
DirectoryPath OuterVolumeMountPoint;
|
||||
};
|
||||
|
||||
InfoWizardPage *page = new InfoWizardPage (GetPageParent(), _("Open Outer Volume"),
|
||||
InfoWizardPage *page = new InfoWizardPage (GetPageParent(), LangString["LINUX_OPEN_OUTER_VOL"],
|
||||
shared_ptr <Functor> (new OpenOuterVolumeFunctor (MountedOuterVolume->MountPoint)));
|
||||
|
||||
page->SetPageTitle (LangString["HIDVOL_HOST_FILLING_TITLE"]);
|
||||
|
||||
page->SetPageText (StringFormatter (
|
||||
_("Outer volume has been successfully created and mounted as '{0}'. To this volume you should now copy some sensitive-looking files that you actually do NOT want to hide. The files will be there for anyone forcing you to disclose your password. You will reveal only the password for this outer volume, not for the hidden one. The files that you really care about will be stored in the hidden volume, which will be created later on. When you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, the outer volume will be analyzed to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. The procedure ensures no data on the outer volume are overwritten by the hidden volume."),
|
||||
page->SetPageText (StringFormatter (LangString["LINUX_OUTER_VOL_IS_MOUNTED"],
|
||||
wstring (MountedOuterVolume->MountPoint)));
|
||||
|
||||
return page;
|
||||
@@ -645,7 +641,7 @@ namespace VeraCrypt
|
||||
{
|
||||
if (partition.MountPoint == "/")
|
||||
{
|
||||
Gui->ShowError (_("Error: You are trying to encrypt a system drive.\n\nVeraCrypt can encrypt a system drive only under Windows."));
|
||||
Gui->ShowError (LangString["LINUX_ERROR_TRY_ENCRYPT_SYSTEM_DRIVE"]);
|
||||
return GetCurrentStep();
|
||||
}
|
||||
}
|
||||
@@ -680,11 +676,11 @@ namespace VeraCrypt
|
||||
{
|
||||
if (mountPoint == "/")
|
||||
{
|
||||
Gui->ShowError (_("Error: You are trying to encrypt a system partition.\n\nVeraCrypt can encrypt system partitions only under Windows."));
|
||||
Gui->ShowError (LangString["LINUX_ERROR_TRY_ENCRYPT_SYSTEM_PARTITION"]);
|
||||
return GetCurrentStep();
|
||||
}
|
||||
|
||||
if (!Gui->AskYesNo (StringFormatter (_("WARNING: Formatting of the device will destroy all data on filesystem '{0}'.\n\nDo you want to continue?"), wstring (mountPoint)), false, true))
|
||||
if (!Gui->AskYesNo (StringFormatter (LangString["LINUX_WARNING_FORMAT_DESTROY_FS"], wstring (mountPoint)), false, true))
|
||||
return GetCurrentStep();
|
||||
|
||||
try
|
||||
@@ -694,7 +690,7 @@ namespace VeraCrypt
|
||||
catch (exception &e)
|
||||
{
|
||||
Gui->ShowError (e);
|
||||
Gui->ShowError (StringFormatter (_("The filesystem of the selected device is currently mounted. Please dismount '{0}' before proceeding."), wstring (mountPoint)));
|
||||
Gui->ShowError (StringFormatter (LangString["LINUX_MOUNTET_HINT"], wstring (mountPoint)));
|
||||
return GetCurrentStep();
|
||||
}
|
||||
}
|
||||
@@ -815,7 +811,7 @@ namespace VeraCrypt
|
||||
//check if they have also the same PIM
|
||||
if (OuterPim == Pim)
|
||||
{
|
||||
Gui->ShowError (_("The Hidden volume can't have the same password, PIM and keyfiles as the Outer volume"));
|
||||
Gui->ShowError (LangString["LINUX_HIDDEN_PASS_NO_DIFF"]);
|
||||
return GetCurrentStep();
|
||||
}
|
||||
}
|
||||
@@ -866,7 +862,7 @@ namespace VeraCrypt
|
||||
//check if they have also the same PIM
|
||||
if (OuterPim == Pim)
|
||||
{
|
||||
Gui->ShowError (_("The Hidden volume can't have the same password, PIM and keyfiles as the Outer volume"));
|
||||
Gui->ShowError (LangString["LINUX_HIDDEN_PASS_NO_DIFF"]);
|
||||
return GetCurrentStep();
|
||||
}
|
||||
}
|
||||
@@ -931,11 +927,7 @@ namespace VeraCrypt
|
||||
{
|
||||
if (page->GetFilesystemType() != VolumeCreationOptions::FilesystemType::FAT)
|
||||
{
|
||||
if (!Gui->AskYesNo (_("WARNING: You have selected a filesystem other than FAT for the outer volume.\n"
|
||||
"Please Note that in this case VeraCrypt can't calculate the exact maximum allowed size for the hidden volume and it will use only an estimation that can be wrong.\n"
|
||||
"Thus, it is your responsibility to use an adequate value for the size of the hidden volume so that it doesn\'t overlap the outer volume.\n\n"
|
||||
"Do you want to continue using the selected filesystem for the outer volume?")
|
||||
, false, true))
|
||||
if (!Gui->AskYesNo (LangString["LINUX_CONFIRM_INNER_VOLUME_CALC"], false, true))
|
||||
{
|
||||
return GetCurrentStep();
|
||||
}
|
||||
@@ -966,7 +958,7 @@ namespace VeraCrypt
|
||||
}
|
||||
|
||||
if (forward && CrossPlatformSupport)
|
||||
Gui->ShowWarning (StringFormatter (_("Please note that the volume will not be formatted with a FAT filesystem and, therefore, you may be required to install additional filesystem drivers on platforms other than {0}, which will enable you to mount the volume."), SystemInfo::GetPlatformName()));
|
||||
Gui->ShowWarning (StringFormatter (LangString["LINUX_NOT_FAT_HINT"], SystemInfo::GetPlatformName()));
|
||||
|
||||
return Step::CreationProgress;
|
||||
}
|
||||
@@ -984,15 +976,15 @@ namespace VeraCrypt
|
||||
if (OuterVolume && VolumeSize > TC_MAX_FAT_SECTOR_COUNT * SectorSize)
|
||||
{
|
||||
uint64 limit = TC_MAX_FAT_SECTOR_COUNT * SectorSize / BYTES_PER_TB;
|
||||
wstring err = StringFormatter (_("Error: The hidden volume to be created is larger than {0} TB ({1} GB).\n\nPossible solutions:\n- Create a container/partition smaller than {0} TB.\n"), limit, limit * 1024);
|
||||
wstring err = StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024);
|
||||
|
||||
if (SectorSize < 4096)
|
||||
{
|
||||
err += _("- Use a drive with 4096-byte sectors to be able to create partition/device-hosted hidden volumes up to 16 TB in size");
|
||||
err += LangString["LINUX_MAX_SIZE_HINT"];
|
||||
#if defined (TC_LINUX)
|
||||
err += _(".\n");
|
||||
err += LangString["LINUX_DOT_LF"];
|
||||
#else
|
||||
err += _(" (not supported by components available on this platform).\n");
|
||||
err += LangString["LINUX_NOT_SUPPORTED"];
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1004,7 +996,7 @@ namespace VeraCrypt
|
||||
{
|
||||
wxString confirmMsg = LangString["OVERWRITEPROMPT_DEVICE"];
|
||||
|
||||
if (!Gui->AskYesNo (wxString::Format (confirmMsg, wxString (_("DEVICE")).c_str(), wstring (SelectedVolumePath).c_str(), L""), false, true))
|
||||
if (!Gui->AskYesNo (wxString::Format (confirmMsg, wxString (LangString["DEVICE"]).c_str(), wstring (SelectedVolumePath).c_str(), L""), false, true))
|
||||
return GetCurrentStep();
|
||||
}
|
||||
else if (FilesystemPath (wstring (SelectedVolumePath)).IsFile())
|
||||
|
||||
@@ -20,9 +20,7 @@ namespace VeraCrypt
|
||||
VolumeFormatOptionsWizardPage::VolumeFormatOptionsWizardPage (wxPanel* parent, uint64 filesystemSize, uint32 sectorSize, bool enableQuickFormatButton, bool disableNoneFilesystem, bool disable32bitFilesystems)
|
||||
: VolumeFormatOptionsWizardPageBase (parent)
|
||||
{
|
||||
InfoStaticText->SetLabel (_(
|
||||
"In order to enable your operating system to mount your new volume, it has to be formatted with a filesystem. Please select a filesystem type.\n\nIf your volume is going to be hosted on a device or partition, you can use 'Quick format' to skip encryption of free space of the volume."));
|
||||
|
||||
InfoStaticText->SetLabel ( LangString["QUICK_FORMAT_HELP"] );
|
||||
if (!disableNoneFilesystem)
|
||||
FilesystemTypeChoice->Append (LangString["NONE"], (void *) VolumeCreationOptions::FilesystemType::None);
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ namespace VeraCrypt
|
||||
Fit();
|
||||
Center();
|
||||
|
||||
StdButtonsOK->SetDefault();
|
||||
OKButton->SetDefault();
|
||||
}
|
||||
|
||||
void VolumePropertiesDialog::AppendToList (const string &name, const wxString &value)
|
||||
|
||||
@@ -52,13 +52,13 @@ namespace VeraCrypt
|
||||
wxString drive = wxFileName (wstring (volumePath)).GetVolume();
|
||||
if (!drive.empty())
|
||||
{
|
||||
FreeSpaceStaticText->SetLabel (StringFormatter (_("Free space on drive {0}: is {1}."),
|
||||
FreeSpaceStaticText->SetLabel (StringFormatter (LangString["LINUX_FREE_SPACE_ON_DRIVE"],
|
||||
drive, Gui->SizeToString (diskSpace.GetValue())));
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
FreeSpaceStaticText->SetLabel (StringFormatter (_("Free space available: {0}"),
|
||||
FreeSpaceStaticText->SetLabel (StringFormatter (LangString["DISK_FREE"],
|
||||
Gui->SizeToString (diskSpace.GetValue())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "Main/Main.h"
|
||||
#include "Main/Application.h"
|
||||
#include <wx/msgqueue.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
namespace VeraCrypt
|
||||
{
|
||||
@@ -165,7 +166,7 @@ namespace VeraCrypt
|
||||
void OnAdminPasswordRequest(wxCommandEvent &)
|
||||
{
|
||||
|
||||
wxPasswordEntryDialog dialog (this, _("Enter your user password or administrator password:"), _("Administrator privileges required"));
|
||||
wxPasswordEntryDialog dialog (this, LangString["LINUX_ADMIN_PW_QUERY"], LangString["LINUX_ADMIN_PW_QUERY_TITLE"]);
|
||||
if (dialog.ShowModal() != wxID_OK)
|
||||
m_queue.Post(wxT(""));
|
||||
else
|
||||
@@ -196,8 +197,9 @@ namespace VeraCrypt
|
||||
|
||||
pParam->m_style |= wxSTAY_ON_TOP;
|
||||
}
|
||||
|
||||
int iResult = wxMessageBox (pParam->m_message, pParam->m_caption, pParam->m_style, this);
|
||||
wxMessageDialog cur(this, pParam->m_message, pParam->m_caption, pParam->m_style);
|
||||
cur.SetYesNoLabels(LangString["UISTR_YES"], LangString["UISTR_NO"]);
|
||||
int iResult = (cur.ShowModal() == wxID_YES ? wxYES : wxNO);
|
||||
delete pParam;
|
||||
m_queue.Post(wxString::Format(wxT("%d"), iResult));
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ namespace VeraCrypt
|
||||
|
||||
void WizardFrame::SetCancelButtonText (const wxString &text)
|
||||
{
|
||||
CancelButton->SetLabel (text.empty() ? wxString (_("Cancel")) : text);
|
||||
CancelButton->SetLabel (text.empty() ? wxString (LangString["IDC_ABORT_BUTTON"]) : text);
|
||||
}
|
||||
|
||||
void WizardFrame::SetImage (const wxBitmap &bitmap)
|
||||
@@ -167,7 +167,7 @@ namespace VeraCrypt
|
||||
|
||||
wxString nextButtonText = CurrentPage->GetNextButtonText();
|
||||
if (nextButtonText.empty())
|
||||
NextButton->SetLabel (_("&Next >"));
|
||||
NextButton->SetLabel (_("NEXT"));
|
||||
else
|
||||
NextButton->SetLabel (nextButtonText);
|
||||
|
||||
|
||||
6
src/Main/Forms/international.h
Normal file
6
src/Main/Forms/international.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifdef TC_LINUX
|
||||
#include "Main/LanguageStrings.h"
|
||||
#undef _
|
||||
#define _(key) LangString[key]
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user