Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-13 11:58:26 -06:00
Code Activity

Merge branch 'master' of https://github.com/e2Security/VeraCrypt into e2Security-master

Browse Source 
Changes made to src/Common/Dlgcode.c and src/Common/Language.xml to resolve conflicts.
For Language.xml, new entries were put at the end and remove entries were put back in order to keep same order to entries as before. This important for compatibility with Transifex translation platform.
This commit is contained in:
Mounir IDRASSI
2022-01-16 15:43:45 +01:00
parent 0d92195c91 36f71280fa
commit fcb220e39a
11 changed files with 1001633 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Signing/sign_test.bat
View File

@@ -28,6 +28,7 @@ cd "..\Release\Setup Files\"
copy ..\..\LICENSE .
copy ..\..\License.txt .
copy ..\..\NOTICE .
copy ..\..\password1000000 .
copy ..\..\Resources\Texts\License.rtf .
copy ..\..\Common\VeraCrypt.ico .
copy ..\..\Setup\VeraCrypt_setup_background.bmp .
@@ -52,6 +53,7 @@ call build_msi_x64.bat %VC_VERSION_NBRE%
del LICENSE
del License.txt
del NOTICE
del password1000000.txt
del License.rtf
del VeraCrypt.ico
del VeraCrypt_setup_background.bmp