Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures

This commit is contained in:
Rainer Kottenhoff 2019-08-25 10:05:20 +02:00
commit 36946a64d0
3 changed files with 9 additions and 9 deletions

View File

@ -302,26 +302,26 @@ IDS_MUI_ABOUT_RTF_0 "{\
\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fswiss\\fcharset0 Arial;}}\
{\\colortbl ;\\red80\\green160\\blue80;}\
\\tx3500\\tx7000\\fs18\
\\cf0 \\fs20\\b1\\ul1 Development:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Utveckling:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_1 "\
\\cf0 \\fs20\\b1\\ul1 Contributors:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Medverkande:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_2 "\
\\cf0 \\fs20\\b1\\ul1 Open Source / Libraries:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Open Source / Bibliotek:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_3 "\
\\cf0 \\fs20\\b1\\ul1 Acknowledgments:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Tack:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_4 "\
\\cf0 \\fs20\\b1\\ul1 Resources:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Resurser:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_5 "\
\\cf0 \\fs20\\b1\\ul1 Licences:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Licenser:\\ul0\\b0\\fs18\\par\
"
IDS_MUI_ABOUT_RTF_6 "\
\\cf0 \\fs20\\b1\\ul1 Notepad3 Licence:\\ul0\\b0\\fs18\\par\
\\cf0 \\fs20\\b1\\ul1 Notepad3 Licens:\\ul0\\b0\\fs18\\par\
\\cf0 \\par\
\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\
\\cf0 https://www.rizonesoft.com\\par\

View File

@ -42,7 +42,7 @@ MUILANGUAGE MUI_LanguageDLLs[] =
{ 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"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_TR_TR, L"tr-TR", L"Türkçe (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}
};

View File

@ -72,7 +72,7 @@
#if defined(_MSC_VER)
#if (_MSC_VER >= 1922)
#if(_MSC_FULL_VER >= 192227905)
#define VER_CPL MS Visual C++ 2019 v16.2.(0-2)
#define VER_CPL MS Visual C++ 2019 v16.2.(0-3)
#endif
#elif (_MSC_VER >= 1921)
#if(_MSC_FULL_VER >= 192127702)