Skip to content

Localization Stage 3: Split RC into per-language files (MUI support) #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nbb1967 wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Localization Stage 3: Split RC into per-language files (MUI support) #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f7193f8
CreateProperties.
nbb1967 Jan 22, 2026
9bca422
FsInfoDialog
nbb1967 Jan 23, 2026
0e7e60a
MountPropertyPage
nbb1967 Jan 24, 2026
6b69a26
CryptPropertySheet
nbb1967 Jan 24, 2026
1756a51
Refactoring
nbb1967 Jan 27, 2026
98eea70
Licenses to RCDATA. Folder lic for licenses.txt. CryptAboutPropertyPage
nbb1967 Jan 30, 2026
aa29978
SettingsPropertyPage
nbb1967 Jan 31, 2026
359ccf9
rename en_secure.txt
nbb1967 Jan 31, 2026
70bd032
cryptdokan. GetStringFromResources() ALT edition
nbb1967 Feb 5, 2026
d69ccc5
simplification
nbb1967 Feb 5, 2026
5431c4f
correct, additions
nbb1967 Feb 6, 2026
31a6dc5
minor edits
nbb1967 Feb 6, 2026
58f7387
debugging
nbb1967 Feb 6, 2026
49664bd
renaming
nbb1967 Feb 8, 2026
305b75d
lic
nbb1967 Feb 10, 2026
94ad2fa
refactoring2
nbb1967 Feb 11, 2026
2a47678
format
nbb1967 Feb 11, 2026
f8446dd
localization-independent text in registry
nbb1967 Feb 14, 2026
6985444
spelling
nbb1967 Feb 18, 2026
f9c577b
formatting
nbb1967 Feb 18, 2026
87e8206
frm
nbb1967 Feb 18, 2026
07b2de8
frm2
nbb1967 Feb 18, 2026
f72712e
Splitting RC. MUI
nbb1967 Feb 23, 2026
b755229
Reminder
nbb1967 Feb 24, 2026
b2da6db
Cleaning. Fix for Includes
nbb1967 Mar 3, 2026
26885db
Include cleanup from remove-unused-rc
nbb1967 Mar 4, 2026
3e57205
Merge hardcoded-str-to-rc into splitting-rc (resolved binary RC confl…
nbb1967 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Release/
cppcryptfs/Debug/
cppcryptfs/Release/
cppcryptfs/cppcryptfs.aps
cppcryptfs/res/ru/Resources_RU.aps
cppcryptfs/res/en/Resources_EN.aps
Report*.vspx
Report*.diagsession
enc_temp_folder/
Expand Down
5 changes: 3 additions & 2 deletions cppcryptfs/cppcryptfs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ THE SOFTWARE.
#include "ui/uiutil.h"
#include "../libipc/server.h"
#include "../libipc/client.h"
#include "ui/locutils.h"


#ifdef _DEBUG
Expand Down Expand Up @@ -186,15 +187,15 @@ BOOL CcppcryptfsApp::InitInstance()
ShowWindow(hWnd, SW_SHOWNORMAL);
}
} else {
::MessageBox(NULL, L"cppcryptfs is already running, but window not found!", L"cppcryptfs", MB_OK | MB_ICONERROR);
::MessageBox(NULL, LocUtils::GetStringFromResources(IDS_RUN_WINDOW_NOT_FOUND).c_str(), L"cppcryptfs", MB_OK | MB_ICONERROR);
}

return FALSE;
} else {
wstring mes;
bool dokVerCheck = check_dokany_version(mes);
if (!dokVerCheck && mes.length() < 1) {
mes = L"problem with Dokany version";
mes = LocUtils::GetStringFromResources(IDS_PROBLEM_DOKANY_VERSION);
}
if (mes.length()) {
::MessageBox(NULL, mes.c_str(), L"cppcryptfs", MB_OK | (dokVerCheck ? MB_ICONEXCLAMATION : MB_ICONERROR));
Expand Down
Binary file modified cppcryptfs/cppcryptfs.rc
View file
Open in desktop
Binary file not shown.
43 changes: 39 additions & 4 deletions cppcryptfs/cppcryptfs.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IntDir);$(ProjectDir);$(ProjectDir)res\en;$(ProjectDir)res\ru;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand Down Expand Up @@ -148,7 +148,7 @@
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IntDir);$(ProjectDir);$(ProjectDir)res\en;$(ProjectDir)res\ru;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -181,7 +181,7 @@
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IntDir);$(ProjectDir);$(ProjectDir)res\en;$(ProjectDir)res\ru;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>for /f %%i in ('git rev-parse --short HEAD') do (echo VALUE "FileDescription", "cppcryptfs build %%i" &gt; "$(ProjectDir)gitversion.rc2")</Command>
Expand Down Expand Up @@ -218,7 +218,7 @@
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IntDir);$(ProjectDir);$(ProjectDir)res\en;$(ProjectDir)res\ru;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>for /f %%i in ('git rev-parse --short HEAD') do (echo VALUE "FileDescription", "cppcryptfs build %%i" &gt; "$(ProjectDir)gitversion.rc2")</Command>
Expand All @@ -227,6 +227,7 @@
<ItemGroup>
<ClInclude Include="ui\CryptSetting.h" />
<ClInclude Include="ui\CryptSettings.h" />
<ClInclude Include="ui\locutils.h" />
<ClInclude Include="ui\MoreSettingsPropertyPage.h" />
<ClInclude Include="config\cryptconfig.h" />
<ClInclude Include="context\cryptcontext.h" />
Expand Down Expand Up @@ -260,6 +261,10 @@
<ItemGroup>
<ClCompile Include="ui\CryptSetting.cpp" />
<ClCompile Include="ui\CryptSettings.cpp" />
<ClCompile Include="ui\locutils.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="ui\MoreSettingsPropertyPage.cpp" />
<ClCompile Include="cppcryptfs.cpp" />
<ClCompile Include="dokan\cryptdokan.cpp">
Expand Down Expand Up @@ -308,6 +313,18 @@
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="cppcryptfs.rc" />
<ResourceCompile Include="res\en\Resources_EN.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="res\ru\Resources_RU.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="res\cppcryptfs.rc2" />
Expand All @@ -316,6 +333,24 @@
<Image Include="res\cppcryptfs.ico" />
<Image Include="res\drive.ico" />
</ItemGroup>
<ItemGroup>
<Text Include="res\en\lic\aessiv_en.txt" />
<Text Include="res\en\lic\cppcryptfs_en.txt" />
<Text Include="res\en\lic\dokany_lib_en.txt" />
<Text Include="res\en\lic\dokany_mir_en.txt" />
<Text Include="res\en\lic\getopt_en.txt" />
<Text Include="res\en\lic\openssl_en.txt" />
<Text Include="res\en\lic\rapidjson_en.txt" />
<Text Include="res\en\lic\secure_edit_en.txt" />
<Text Include="res\ru\lic\aessiv_ru.txt" />
<Text Include="res\ru\lic\cppcryptfs_ru.txt" />
<Text Include="res\ru\lic\dokany_lib_ru.txt" />
<Text Include="res\ru\lic\dokany_mir_ru.txt" />
<Text Include="res\ru\lic\getopt_ru.txt" />
<Text Include="res\ru\lic\openssl_ru.txt" />
<Text Include="res\ru\lic\rapidjson_ru.txt" />
<Text Include="res\ru\lic\secure_edit_ru.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
Loading