Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys

# Conflicts: # language/np3_af_za/strings_af_za.rc # language/np3_be_by/strings_be_by.rc # language/np3_de_de/lexer_de_de.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/strings_ru_ru.rc # language/np3_zh_cn/menu_zh_cn.rc # language/np3_zh_cn/strings_zh_cn.rc
2026-06-14 21:09:05 +08:00 · 2018-11-05 14:01:41 +01:00 · 2018-11-05 14:01:41 +01:00 · ea0eabe76a
commit ea0eabe76a
parent 70ce384a4b b5e1581f35
14 changed files with 0 additions and 0 deletions
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
--- a/language/np3_de_de/lexer_de_de.rc
+++ b/language/np3_de_de/lexer_de_de.rc
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
--- 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/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
--- a/src/Version.h
+++ b/src/Version.h