From edc9f36322e44bc0b164cf27ca03cf970ef48091 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 31 May 2014 23:09:24 +0200 Subject: Replace TrueCrypt references in added sources and resources by VeraCrypt ones. --- src/Main/Forms/AboutDialog.cpp | 6 +++--- src/Main/Forms/Forms.cpp | 10 +++++----- src/Main/Forms/Forms.h | 12 ++++++------ src/Main/Forms/MainFrame.cpp | 2 +- src/Main/Forms/PreferencesDialog.cpp | 2 +- src/Main/Forms/TrueCrypt.fbp | 26 +++++++++++++------------- src/Main/Forms/VolumeCreationWizard.cpp | 6 +++--- src/Main/Forms/VolumePropertiesDialog.cpp | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/Main/Forms') diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp index 736a669a..c8384457 100644 --- a/src/Main/Forms/AboutDialog.cpp +++ b/src/Main/Forms/AboutDialog.cpp @@ -25,7 +25,7 @@ namespace TrueCrypt VersionStaticText->SetLabel (Application::GetName() + L" " + StringConverter::ToWide (Version::String())); CopyrightStaticText->SetLabel (StringConverter::ToWide (TC_STR_RELEASED_BY)); - WebsiteHyperlink->SetLabel (L"www.truecrypt.org"); + WebsiteHyperlink->SetLabel (L"www.idrix.fr"); CreditsTextCtrl->SetMinSize (wxSize ( Gui->GetCharWidth (CreditsTextCtrl) * 70, @@ -57,10 +57,10 @@ namespace TrueCrypt L"Copyright \xA9 1998-2008 Brian Gladman. All Rights Reserved.\n" L"\nThis software as a whole:\n" - L"Copyright \xA9 2012 TrueCrypt Developers Association. All rights reserved.\n\n" + L"Copyright \xA9 2014 IDRIX. All rights reserved.\n\n" L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n" - L"A TrueCrypt Foundation Release"); + L"An IDRIX Release"); } } diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index 5825381c..efad4168 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -168,7 +168,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t HelpMenu->AppendSeparator(); wxMenuItem* WebsiteMenuItem; - WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL ); + WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("VeraCrypt Website") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( WebsiteMenuItem ); wxMenuItem* DownloadsMenuItem; @@ -1654,7 +1654,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c wxStaticBoxSizer* sbSizer14; sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL ); - WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 ); + WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after VeraCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 ); @@ -1728,7 +1728,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c bSizer62 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer18; - sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL ); + sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("VeraCrypt Background Task") ), wxVERTICAL ); BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1772,7 +1772,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL ); - StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 ); + StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start VeraCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 ); LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 ); @@ -1780,7 +1780,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 ); - MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 ); + MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted VeraCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 ); LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 ); diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h index cbc6f6e1..7ecfa1c3 100644 --- a/src/Main/Forms/Forms.h +++ b/src/Main/Forms/Forms.h @@ -147,7 +147,7 @@ namespace TrueCrypt public: - MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL ); + MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL ); ~MainFrameBase(); }; @@ -242,7 +242,7 @@ namespace TrueCrypt public: - BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); ~BenchmarkDialogBase(); }; @@ -330,7 +330,7 @@ namespace TrueCrypt public: - EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - 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 = _("VeraCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); ~EncryptionTestDialogBase(); }; @@ -441,7 +441,7 @@ namespace TrueCrypt wxTextCtrl* LegalNoticesTextCtrl; public: - LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - 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 = _("VeraCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); ~LegalNoticesDialogBase(); }; @@ -492,7 +492,7 @@ namespace TrueCrypt public: - MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt 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 = _("Enter VeraCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); ~MountOptionsDialogBase(); }; @@ -643,7 +643,7 @@ namespace TrueCrypt public: - RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - 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 = _("VeraCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); ~RandomPoolEnrichmentDialogBase(); }; diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index cf313a8e..6100a7ab 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/src/Main/Forms/MainFrame.cpp @@ -1420,7 +1420,7 @@ namespace TrueCrypt else if (show && !mTaskBarIcon->IsIconInstalled()) { #ifndef TC_MACOSX - mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"TrueCrypt"); + mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"VeraCrypt"); #endif } } diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp index b10a5cdd..163a06fb 100644 --- a/src/Main/Forms/PreferencesDialog.cpp +++ b/src/Main/Forms/PreferencesDialog.cpp @@ -114,7 +114,7 @@ namespace TrueCrypt #ifdef TC_MACOSX DismountOnScreenSaverCheckBox->Show (false); - DismountOnLogOffCheckBox->SetLabel (_("TrueCrypt quits")); + DismountOnLogOffCheckBox->SetLabel (_("VeraCrypt quits")); OpenExplorerWindowAfterMountCheckBox->SetLabel (_("Open Finder window for successfully mounted volume")); MountRemovableCheckBox->Show (false); diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index 9d8fb6f9..de0ea709 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -11,8 +11,8 @@ 1000 none 1 - TrueCrypt - "TrueCrypt" + VeraCrypt + "VeraCrypt" . #include "System.h" 1 @@ -35,7 +35,7 @@ -1,496 wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU - TrueCrypt + VeraCrypt @@ -646,7 +646,7 @@ wxID_ANY wxITEM_NORMAL - TrueCrypt Website + VeraCrypt Website WebsiteMenuItem none @@ -3059,7 +3059,7 @@ wxDEFAULT_DIALOG_STYLE - TrueCrypt - Encryption Algorithm Benchmark + VeraCrypt - Encryption Algorithm Benchmark @@ -3958,7 +3958,7 @@ wxDEFAULT_DIALOG_STYLE - TrueCrypt - Test Vectors + VeraCrypt - Test Vectors @@ -6752,7 +6752,7 @@ wxDEFAULT_DIALOG_STYLE - TrueCrypt - Legal Notices + VeraCrypt - Legal Notices @@ -6929,7 +6929,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE - Enter TrueCrypt Volume Password + Enter VeraCrypt Volume Password wxWS_EX_VALIDATE_RECURSIVELY @@ -9007,7 +9007,7 @@ 0 wxID_ANY - Wipe after TrueCrypt window has been closed + Wipe after VeraCrypt window has been closed WipeCacheOnCloseCheckBox @@ -9544,7 +9544,7 @@ 0 wxID_ANY - TrueCrypt Background Task + VeraCrypt Background Task sbSizer18 wxVERTICAL @@ -9916,7 +9916,7 @@ 0 wxID_ANY - Start TrueCrypt Background Task + Start VeraCrypt Background Task StartOnLogonCheckBox @@ -10020,7 +10020,7 @@ 0 wxID_ANY - Mount all device-hosted TrueCrypt volumes + Mount all device-hosted VeraCrypt volumes MountDevicesOnLogonCheckBox @@ -11698,7 +11698,7 @@ wxDEFAULT_DIALOG_STYLE - TrueCrypt - Random Pool Enrichment + VeraCrypt - Random Pool Enrichment diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 1219fc20..127880a1 100644 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -152,7 +152,7 @@ namespace TrueCrypt 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 not a bug in TrueCrypt but a limitation of the operating system."); + 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 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)); } else @@ -579,7 +579,7 @@ namespace TrueCrypt { if (partition.MountPoint == "/") { - Gui->ShowError (_("Error: You are trying to encrypt a system drive.\n\nTrueCrypt can encrypt a system drive only under Windows.")); + Gui->ShowError (_("Error: You are trying to encrypt a system drive.\n\nVeraCrypt can encrypt a system drive only under Windows.")); return GetCurrentStep(); } } @@ -614,7 +614,7 @@ namespace TrueCrypt { if (mountPoint == "/") { - Gui->ShowError (_("Error: You are trying to encrypt a system partition.\n\nTrueCrypt can encrypt system partitions only under Windows.")); + Gui->ShowError (_("Error: You are trying to encrypt a system partition.\n\nVeraCrypt can encrypt system partitions only under Windows.")); return GetCurrentStep(); } diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp index 65685ba0..2c2ae114 100644 --- a/src/Main/Forms/VolumePropertiesDialog.cpp +++ b/src/Main/Forms/VolumePropertiesDialog.cpp @@ -69,7 +69,7 @@ namespace TrueCrypt AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]); #ifdef TC_LINUX - if (string (volumeInfo.VirtualDevice).find ("/dev/mapper/truecrypt") != 0) + if (string (volumeInfo.VirtualDevice).find ("/dev/mapper/veracrypt") != 0) { #endif AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead)); -- cgit v1.2.3