Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys

# Conflicts: # language/np3_af_za/strings_af_za.rc # language/np3_be_by/dialogs_be_by.rc # language/np3_de_de/strings_de_de.rc # language/np3_en_gb/strings_en_gb.rc # language/np3_en_us/strings_en_us.rc # language/np3_es_es/strings_es_es.rc # language/np3_fr_fr/strings_fr_fr.rc # language/np3_ja_jp/strings_ja_jp.rc # language/np3_nl_nl/strings_nl_nl.rc # language/np3_ru_ru/dialogs_ru_ru.rc # language/np3_zh_cn/strings_zh_cn.rc
2026-06-14 21:09:05 +08:00 · 2018-11-02 12:13:48 +01:00 · 2018-11-02 12:13:48 +01:00 · 83c4f581d2
commit 83c4f581d2
parent 36caffef18 cd9816651b
24 changed files with 2 additions and 2 deletions
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
--- a/language/np3_be_by/resource.h
+++ b/language/np3_be_by/resource.h
@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by strings_be_by.rc
+// Used by menu_be_by.rc
 //

 // Next default values for new objects
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
--- a/language/np3_ja_jp/lexer_ja_jp.rc
+++ b/language/np3_ja_jp/lexer_ja_jp.rc
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
--- a/language/np3_ru_ru/resource.h
+++ b/language/np3_ru_ru/resource.h
@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by strings_ru_ru.rc
+// Used by menu_ru_ru.rc
 //

 // Next default values for new objects
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
--- a/minipath/language/mp_be_by/dialogs_be_by.rc
+++ b/minipath/language/mp_be_by/dialogs_be_by.rc
--- a/minipath/language/mp_be_by/menu_be_by.rc
+++ b/minipath/language/mp_be_by/menu_be_by.rc
--- a/minipath/language/mp_be_by/resource.h
+++ b/minipath/language/mp_be_by/resource.h
--- a/minipath/language/mp_be_by/strings_be_by.rc
+++ b/minipath/language/mp_be_by/strings_be_by.rc
--- a/minipath/language/mp_ru_ru/dialogs_ru_ru.rc
+++ b/minipath/language/mp_ru_ru/dialogs_ru_ru.rc
--- a/minipath/language/mp_ru_ru/menu_ru_ru.rc
+++ b/minipath/language/mp_ru_ru/menu_ru_ru.rc
--- a/minipath/language/mp_ru_ru/resource.h
+++ b/minipath/language/mp_ru_ru/resource.h
--- a/minipath/language/mp_ru_ru/strings_ru_ru.rc
+++ b/minipath/language/mp_ru_ru/strings_ru_ru.rc