Skip to content
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

MUI - Minor update of pl-PL and add some config for sv-SE #1539

Merged
merged 1 commit into from
Aug 18, 2019
Merged

MUI - Minor update of pl-PL and add some config for sv-SE #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
274 changes: 137 additions & 137 deletions Build/Changes.txt
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Notepad3.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc
{82BD93B4-0306-4DDC-87F6-84B906DBAA77} = {82BD93B4-0306-4DDC-87F6-84B906DBAA77}
{E99EA1C1-B4DE-454B-9500-C98F817C0D6A} = {E99EA1C1-B4DE-454B-9500-C98F817C0D6A}
{AB02DFC9-B0C0-488C-9BF9-E90B0402F30E} = {AB02DFC9-B0C0-488C-9BF9-E90B0402F30E}
{07C218D7-D510-4D63-95E8-F661F62ED418} = {07C218D7-D510-4D63-95E8-F661F62ED418}
{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E} = {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}
EndProjectSection
EndProject
Expand All @@ -32,6 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa
{954B9D26-1735-4674-8279-FF2C44E4258B} = {954B9D26-1735-4674-8279-FF2C44E4258B}
{6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {6503214A-CE25-45B5-84BB-61EEFB35D1A9}
{DA372A4B-7AE0-4C50-97B7-49D5FF953325} = {DA372A4B-7AE0-4C50-97B7-49D5FF953325}
{3E19AA6A-0935-4320-962A-C1E9378B387C} = {3E19AA6A-0935-4320-962A-C1E9378B387C}
{18CD506D-5596-4B58-B868-57FAAC657C6B} = {18CD506D-5596-4B58-B868-57FAAC657C6B}
{73B1A06D-F536-4F39-80AA-798A1E8023DE} = {73B1A06D-F536-4F39-80AA-798A1E8023DE}
{53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} = {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250}
Expand Down Expand Up @@ -226,8 +228,14 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "scintilla\Scintilla.vcxproj", "{5877B917-512B-49F5-B514-1B4159E7A9CA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_sv_se", "language\np3_sv_se\np3_sv_se.vcxproj", "{07C218D7-D510-4D63-95E8-F661F62ED418}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_sv_se", "minipath\language\mp_sv_se\mp_sv_se.vcxproj", "{3E19AA6A-0935-4320-962A-C1E9378B387C}"
ProjectSection(ProjectDependencies) = postProject
{29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
8 changes: 8 additions & 0 deletions Notepad3DLL.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3DLL
{82BD93B4-0306-4DDC-87F6-84B906DBAA77} = {82BD93B4-0306-4DDC-87F6-84B906DBAA77}
{E99EA1C1-B4DE-454B-9500-C98F817C0D6A} = {E99EA1C1-B4DE-454B-9500-C98F817C0D6A}
{AB02DFC9-B0C0-488C-9BF9-E90B0402F30E} = {AB02DFC9-B0C0-488C-9BF9-E90B0402F30E}
{07C218D7-D510-4D63-95E8-F661F62ED418} = {07C218D7-D510-4D63-95E8-F661F62ED418}
{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E} = {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}
EndProjectSection
EndProject
Expand All @@ -32,6 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa
{954B9D26-1735-4674-8279-FF2C44E4258B} = {954B9D26-1735-4674-8279-FF2C44E4258B}
{6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {6503214A-CE25-45B5-84BB-61EEFB35D1A9}
{DA372A4B-7AE0-4C50-97B7-49D5FF953325} = {DA372A4B-7AE0-4C50-97B7-49D5FF953325}
{3E19AA6A-0935-4320-962A-C1E9378B387C} = {3E19AA6A-0935-4320-962A-C1E9378B387C}
{18CD506D-5596-4B58-B868-57FAAC657C6B} = {18CD506D-5596-4B58-B868-57FAAC657C6B}
{73B1A06D-F536-4F39-80AA-798A1E8023DE} = {73B1A06D-F536-4F39-80AA-798A1E8023DE}
{53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} = {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250}
Expand Down Expand Up @@ -232,8 +234,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_tr_tr", "minipath\langua
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_sv_se", "minipath\language\mp_sv_se\mp_sv_se.vcxproj", "{3E19AA6A-0935-4320-962A-C1E9378B387C}"
ProjectSection(ProjectDependencies) = postProject
{29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_sv_se", "language\np3_sv_se\np3_sv_se.vcxproj", "{07C218D7-D510-4D63-95E8-F661F62ED418}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion Versions/build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2595
2596
9 changes: 3 additions & 6 deletions language/np3_pl_pl/dialogs_pl_pl.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,11 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10
CONTROL "Otw�rz 8-bitowe pliki *.&nfo/diz w trybie DOS-437.",IDC_NFOASOEM,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10
CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS,
// CONTROL "Nie uwzgl�dniaj znacznik�w kodowania.",IDC_ENCODINGFROMFILEVARS,
CONTROL "Uwzgl�dnij znaczniki kodowania..",IDC_ENCODINGFROMFILEVARS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,126,10
CONTROL "Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION,
// CONTROL "Nie wykrywaj strony kodowej &ANSI.",IDC_NOANSICPDETECTION,
CONTROL "Wykonaj analiz� strony kodowej &ANSI.",IDC_NOANSICPDETECTION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10
CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10
// CONTROL "Pomi� wykrywanie &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10
CONTROL "W��cz wykrywanie &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10
DEFPUSHBUTTON "OK",IDOK,87,151,50,14
PUSHBUTTON "Anuluj",IDCANCEL,140,151,50,14
END
Expand Down
1 change: 1 addition & 0 deletions np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ PORTUGUESEBR=true
RUSSIAN=true
SIMPCHINESE=true
SPANISH=true
SWEDISH=true
TURKISH=true
[DirectoriesToPreserve]
[DirectoriesToRemove]
Expand Down
2 changes: 1 addition & 1 deletion res/Notepad3.exe.manifest.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.815.2595"
version="5.19.818.2596"
type="win32"
/>
<description>Notepad3 BETA</description>
Expand Down
4 changes: 2 additions & 2 deletions src/MuiLanguage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ MUILANGUAGE MUI_LanguageDLLs[] =
{ IDS_MUI_LANG_PL_PL, L"pl-PL", L"Polski (Polska)\t\t\t[%s]", MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), false, false },
{ IDS_MUI_LANG_PT_BR, L"pt-BR", L"Português (Brasil)\t\t\t[%s]", MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), false, false },
{ IDS_MUI_LANG_RU_RU, L"ru-RU", L"Русский (Pоссия)\t\t\t[%s]", MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), false, false },
{ IDS_MUI_LANG_SV_SE, L"sv-SE", L"Swedish (Sweden)\t\t\t[%s]", MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), false, false },
{ IDS_MUI_LANG_SV_SE, L"sv-SE", L"Svenska (Sverige)\t\t\t[%s]", MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), false, false },
{ IDS_MUI_LANG_TR_TR, L"tr-TR", L"Türk (Türkiye)\t\t\t[%s]", MAKELANGID(LANG_TURKISH, SUBLANG_TURKISH_TURKEY), false, false },
{ IDS_MUI_LANG_ZH_CN, L"zh-CN", L"中文（中国）\t\t\t[%s]", MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), false, false}
{ IDS_MUI_LANG_ZH_CN, L"zh-CN", L"中文（中国）\t\t\t[%s]", MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), false, false}
};

//NUM_OF_MUI_LANGUAGES
Expand Down
4 changes: 2 additions & 2 deletions src/VersionEx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 815
#define VERSION_BUILD 2595
#define VERSION_REV 818
#define VERSION_BUILD 2596
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define UCHARDET_VER 2018.09.27
Expand Down