Merge branch 'main' of https://github.com/tretdm/notepad4-ru

zufuliu · Oct 26, 2024 · 9605db1 · 9605db1
2 parents 2778bf2 + 4d90feb
commit 9605db1
Show file tree

Hide file tree

Showing 31 changed files with 314 additions and 131 deletions.
diff --git a/build/BuildAll.py b/build/BuildAll.py
@@ -14,7 +14,7 @@
 notepad4_rc = os.path.abspath('../src/Notepad4.rc')
 matepath_rc = os.path.abspath('../matepath/src/matepath.rc')
 
-activeLocaleList = ['i18n', 'en', 'de', 'fr', 'it', 'ja', 'ko', 'zh-Hans', 'zh-Hant']
+activeLocaleList = ['i18n', 'en', 'de', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-Hans', 'zh-Hant']
 defaultConfig = {
 	'NP2_ENABLE_CUSTOMIZE_TOOLBAR_LABELS': 0,
 	'NP2_ENABLE_HIDPI_IMAGE_RESOURCE': 1,

diff --git a/doc/release.md b/doc/release.md
@@ -18,6 +18,7 @@
 | it | Italiano | x64 | 🟡legacy 64-bit Windows Vista, Server 2008 |
 | ja | 日本語 | Win32 | 🟠legacy Windows XP, Server 2003 |
 | ko | 한국어 |
+| ru | Русский |
 | zh-Hans | 中文 (简体) |
 | zh-Hant | 中文 (繁體) | Chocolatey | `choco install notepad4`
 | i18n | all above languages | winget | `winget install -e "Notepad4"` |

diff --git a/locale/Locale.sln b/locale/Locale.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1145
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad4(zh-Hans)", "zh-Hans\Notepad4(zh-Hans).vcxproj", "{14E1F7FB-7F84-4D06-AF55-378DFD7519DF}"
 EndProject
@@ -35,6 +35,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matepath(fr)", "fr\matepath
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad4(fr)", "fr\Notepad4(fr).vcxproj", "{B56E86E2-F6AB-4615-BE4A-C9612D14BDFA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matepath(ru)", "ru\matepath(ru).vcxproj", "{4BC0C880-0C47-4D9C-93DA-DB59994D8046}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad4(ru)", "ru\Notepad4(ru).vcxproj", "{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -303,6 +307,38 @@ Global
 		{B56E86E2-F6AB-4615-BE4A-C9612D14BDFA}.Release|Win32.Build.0 = Release|Win32
 		{B56E86E2-F6AB-4615-BE4A-C9612D14BDFA}.Release|x64.ActiveCfg = Release|x64
 		{B56E86E2-F6AB-4615-BE4A-C9612D14BDFA}.Release|x64.Build.0 = Release|x64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|ARM.ActiveCfg = Debug|ARM
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|ARM.Build.0 = Debug|ARM
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|Win32.Build.0 = Debug|Win32
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|x64.ActiveCfg = Debug|x64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Debug|x64.Build.0 = Debug|x64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|ARM.ActiveCfg = Release|ARM
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|ARM.Build.0 = Release|ARM
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|ARM64.Build.0 = Release|ARM64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|Win32.ActiveCfg = Release|Win32
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|Win32.Build.0 = Release|Win32
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|x64.ActiveCfg = Release|x64
+		{4BC0C880-0C47-4D9C-93DA-DB59994D8046}.Release|x64.Build.0 = Release|x64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|ARM.ActiveCfg = Debug|ARM
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|ARM.Build.0 = Debug|ARM
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|Win32.Build.0 = Debug|Win32
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|x64.ActiveCfg = Debug|x64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Debug|x64.Build.0 = Debug|x64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|ARM.ActiveCfg = Release|ARM
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|ARM.Build.0 = Release|ARM
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|ARM64.Build.0 = Release|ARM64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|Win32.ActiveCfg = Release|Win32
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|Win32.Build.0 = Release|Win32
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|x64.ActiveCfg = Release|x64
+		{C13A52D7-2A2E-4E96-936B-ECA98C076AFE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/locale/de/Notepad4.rc b/locale/de/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "Italiano",				IDM_LANG_ITALIAN
 				MENUITEM "Português (Brasil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "日本語",					IDM_LANG_JAPANESE
 				MENUITEM "한국어",					IDM_LANG_KOREAN
 				MENUITEM "中文(繁體)",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/de/matepath.rc b/locale/de/matepath.rc
@@ -614,6 +614,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/fr/Notepad4.rc b/locale/fr/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "Italien",				IDM_LANG_ITALIAN
 				MENUITEM "Portuguais (Brésil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "Japonais",					IDM_LANG_JAPANESE
 				MENUITEM "Coréen",					IDM_LANG_KOREAN
 				MENUITEM "Chinois traditionnel",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/fr/matepath.rc b/locale/fr/matepath.rc
@@ -614,6 +614,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/it/Notepad4.rc b/locale/it/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "&Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "&Italiano",				IDM_LANG_ITALIAN
 				MENUITEM "&Português (Brasil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "日本語",					IDM_LANG_JAPANESE
 				MENUITEM "한국어",					IDM_LANG_KOREAN
 				MENUITEM "中文(繁體)",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/it/matepath.rc b/locale/it/matepath.rc
@@ -614,6 +614,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/ja/Notepad4.rc b/locale/ja/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "Italiano",				IDM_LANG_ITALIAN
 				MENUITEM "Português (Brasil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "日本語",					IDM_LANG_JAPANESE
 				MENUITEM "한국어",					IDM_LANG_KOREAN
 				MENUITEM "中文(繁體)",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/ja/matepath.rc b/locale/ja/matepath.rc
@@ -615,6 +615,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/ko/Notepad4.rc b/locale/ko/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "Italiano",				IDM_LANG_ITALIAN
 				MENUITEM "Português (Brasil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "日本語",					IDM_LANG_JAPANESE
 				MENUITEM "한국어",					IDM_LANG_KOREAN
 				MENUITEM "中文(繁體)",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/ko/matepath.rc b/locale/ko/matepath.rc
@@ -614,6 +614,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/pt-BR/Notepad4.rc b/locale/pt-BR/Notepad4.rc
@@ -620,6 +620,7 @@ BEGIN
 				MENUITEM "Français",				IDM_LANG_FRENCH_FRANCE
 				MENUITEM "Italiano",				IDM_LANG_ITALIAN
 				MENUITEM "Português (Brasil)",		IDM_LANG_PORTUGUESE_BRAZIL
+				MENUITEM "Русский",					IDM_LANG_RUSSIAN
 				MENUITEM "日本語",					IDM_LANG_JAPANESE
 				MENUITEM "한국어",					IDM_LANG_KOREAN
 				MENUITEM "中文(繁體)",				IDM_LANG_CHINESE_TRADITIONAL

diff --git a/locale/pt-BR/matepath.rc b/locale/pt-BR/matepath.rc
@@ -614,6 +614,7 @@ BEGIN
 	IDS_LANG_ITALIAN				"Italiano"
 	IDS_LANG_PORTUGUESE_BRAZIL		"Português (Brasil)"
 	IDS_LANG_FRENCH_FRANCE		    "Français"
+	IDS_LANG_RUSSIAN		        "Русский"
 END
 #endif
 

diff --git a/locale/ru/Notepad4.rc b/locale/ru/Notepad4.rc
@@ -20,9 +20,9 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
+// Russian (Russia) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
@@ -273,8 +273,8 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "&Табулировать выделение\tCtrl+Shift+T",				IDM_EDIT_CONVERTSPACES
 			MENUITEM "Раст&абулировать выделение\tCtrl+Shift+S",			IDM_EDIT_CONVERTTABS
-			MENUITEM "Табулировать &отступ\tCtrl+Alt+T",							IDM_EDIT_CONVERTSPACES2
-			MENUITEM "Растабулировать &отступ\tCtrl+Alt+S",						IDM_EDIT_CONVERTTABS2
+			MENUITEM "Табулировать &отступ\tCtrl+Alt+T",					IDM_EDIT_CONVERTSPACES2
+			MENUITEM "Растабулировать &отступ\tCtrl+Alt+S",					IDM_EDIT_CONVERTTABS2
 			MENUITEM SEPARATOR
 			MENUITEM "В &шестнадцатеричное число\tCtrl+Alt+H",				IDM_EDIT_NUM2HEX
 			MENUITEM "В д&есятеричное число\tCtrl+Alt+D",					IDM_EDIT_NUM2DEC
@@ -335,18 +335,18 @@ BEGIN
 			MENUITEM "Дата и время (под&робная форма)\tCtrl+Shift+F5",				IDM_EDIT_INSERT_LONGDATE
 			MENUITEM SEPARATOR
 			MENUITEM "Обо&значение кодировки\tCtrl+F8",								IDM_EDIT_INSERT_ENCODING
-			MENUITEM "Строка She&bang",										IDM_EDIT_INSERT_SHEBANG
+			MENUITEM "Строка She&bang",												IDM_EDIT_INSERT_SHEBANG
 		END
 		POPUP "&Экспертные возможности"
 		BEGIN
 			MENUITEM "Сим&вол в шестнадцатеричное число\tCtrl+Alt+X",				IDM_EDIT_CHAR2HEX
 			MENUITEM "Шестнадцатеричное число в &символ\tCtrl+Alt+C",				IDM_EDIT_HEX2CHAR
 			MENUITEM "&Показать шестнадцатеричный код",								IDM_EDIT_SHOW_HEX
 			MENUITEM SEPARATOR
-			MENUITEM "Заэкранивать символы C\tCtrl+Alt+E",									IDM_EDIT_ESCAPECCHARS
-			MENUITEM "Расэкранивать си&мволы C\tCtrl+Alt+R",								IDM_EDIT_UNESCAPECCHARS
-			MENUITEM "Заэкранивать символы HT&ML/XML\tAlt+Shift+X",							IDM_EDIT_XHTML_ESCAPE_CHAR
-			MENUITEM "Расэкранивать символы HTML/&XML\tAlt+Shift+H",						IDM_EDIT_XHTML_UNESCAPE_CHAR
+			MENUITEM "Заэкранивать символы C\tCtrl+Alt+E",							IDM_EDIT_ESCAPECCHARS
+			MENUITEM "Расэкранивать си&мволы C\tCtrl+Alt+R",						IDM_EDIT_UNESCAPECCHARS
+			MENUITEM "Заэкранивать символы HT&ML/XML\tAlt+Shift+X",					IDM_EDIT_XHTML_ESCAPE_CHAR
+			MENUITEM "Расэкранивать символы HTML/&XML\tAlt+Shift+H",				IDM_EDIT_XHTML_UNESCAPE_CHAR
 			MENUITEM SEPARATOR
 			MENUITEM "&Обрезать строку слева\tCtrl+Shift+Back",						IDM_EDIT_DELETELINELEFT
 			MENUITEM "О&брезать строку справа\tCtrl+Shift+Del",						IDM_EDIT_DELETELINERIGHT
@@ -400,8 +400,8 @@ BEGIN
 			MENUITEM "Goto P&revious Sibling Block\tCtrl+Alt+Comma (<,)",			IDM_EDIT_GOTO_PREV_SIBLING_BLOCK
 			MENUITEM "Goto N&ext Sibling Block\tCtrl+Alt+Period (>.)",				IDM_EDIT_GOTO_NEXT_SIBLING_BLOCK
 			MENUITEM SEPARATOR
-			MENUITEM "Перейти к &началу выделения\tCtrl+Shift+Comma (<,)",				CMD_JUMP2SELSTART
-			MENUITEM "Перейти к &концу выделения\tCtrl+Shift+Period (>.)",					CMD_JUMP2SELEND
+			MENUITEM "Перейти к &началу выделения\tCtrl+Shift+Comma (<,)",			CMD_JUMP2SELSTART
+			MENUITEM "Перейти к &концу выделения\tCtrl+Shift+Period (>.)",			CMD_JUMP2SELEND
 		END
 	END
 	POPUP "&Вид"
@@ -417,7 +417,7 @@ BEGIN
 			MENUITEM "Ширина строки &2",							IDM_VIEW_CARET_STYLE_WIDTH2
 			MENUITEM "Ширина строки &3",							IDM_VIEW_CARET_STYLE_WIDTH3
 			MENUITEM SEPARATOR
-			MENUITEM "&Без мерцания",									IDM_VIEW_CARET_STYLE_NOBLINK
+			MENUITEM "&Без мерцания",								IDM_VIEW_CARET_STYLE_NOBLINK
 			MENUITEM "Draw Block Caret in &Selection",				IDM_VIEW_CARET_STYLE_SELECTION
 		END
 		MENUITEM SEPARATOR
@@ -699,7 +699,7 @@ BEGIN
 	END
 	POPUP "&Инструменты"
 	BEGIN
-		MENUITEM "Сох&ранять перед открытием инструмента",	IDM_VIEW_SAVEBEFORERUNNINGTOOLS
+		MENUITEM "Сох&ранять перед открытием инструментов",	IDM_VIEW_SAVEBEFORERUNNINGTOOLS
 		MENUITEM "Use &matepath to Open Folder",			IDM_SET_OPEN_FOLDER_MATEPATH
 		MENUITEM SEPARATOR
 		MENUITEM "Запустить с &правами администратора",		IDM_FILE_RELAUNCH_ELEVATED
@@ -1277,7 +1277,7 @@ BEGIN
     AUTORADIOBUTTON "&Отсутствует",IDC_CHANGENOTIFY_NONE,7,7,35,10,WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Показывать сообщение",IDC_CHANGENOTIFY_SHOW_MSG,7,19,71,10,WS_TABSTOP
     AUTORADIOBUTTON "&Автоматическая перезагрузка (в неизмененном виде).",IDC_CHANGENOTIFY_AUTO_RELOAD,7,31,114,10,WS_TABSTOP
-    AUTOCHECKBOX    "&Отслеживать постоянный изменяемый файл (например, файл лога).",IDC_CHANGENOTIFY_LOG_FILE,7,48,184,10,WS_TABSTOP
+    AUTOCHECKBOX    "&Отслеживать постоянно изменяемый файл (например, файл лога)",IDC_CHANGENOTIFY_LOG_FILE,7,48,184,10,WS_TABSTOP
     AUTOCHECKBOX    "&Keep at document end after reloading.",IDC_CHANGENOTIFY_KEEP_AT_END,7,60,184,10,WS_TABSTOP
     AUTOCHECKBOX    "&Reset if a new file is opened.",IDC_CHANGENOTIFY_RESET_WATCH,7,72,184,10,WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,139,7,50,14
@@ -2136,7 +2136,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (United States) resources
+#endif    // Russian (Russia) resources
 /////////////////////////////////////////////////////////////////////////////