From: Ada <me@yuhaowen.com>
Date: Sat, 19 Feb 2022 12:06:09 +0000 (+0000)
Subject: patch 8.2.4420: menu translations are inconsistent
X-Git-Tag: v8.2.4420
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a42535340a906d33173e8b3e82085c161a0524c8;p=vim

patch 8.2.4420: menu translations are inconsistent

Problem:    Menu translations are inconsistent.
Solution:   Add a Makefile to convert between encodings. (Ada (Haowen) Yu,
            closes #9801)
---

diff --git a/runtime/lang/Makefile b/runtime/lang/Makefile
new file mode 100644
index 000000000..4a122cb2a
--- /dev/null
+++ b/runtime/lang/Makefile
@@ -0,0 +1,196 @@
+# Author: Ada (Haowen) Yu <me@yuhaowen.com>
+
+all: \
+		menu_chinese_gb.936.vim \
+		menu_uk_ua.cp1251.vim \
+		menu_uk_ua.koi8-u.vim \
+		menu_chinese_taiwan.950.vim \
+		menu_cs_cz.iso_8859-2.vim \
+		menu_czech_czech_republic.1250.vim \
+		menu_ja_jp.euc-jp.vim \
+		menu_japanese_japan.932.vim \
+		menu_ko_kr.euckr.vim \
+		menu_pl_pl.iso_8859-2.vim \
+		menu_polish_poland.1250.vim \
+		menu_ru_ru.koi8-r.vim \
+		menu_sl_si.cp1250.vim \
+		menu_sl_si.latin2.vim \
+		menu_slovak_slovak_republic.1250.vim \
+		menu_tr_tr.cp1254.vim \
+		menu_tr_tr.iso_8859-9.vim \
+		menu_sr_rs.iso_8859-5.vim \
+		menu_sr_rs.iso_8859-2.vim \
+		menu_sr_rs.ascii.vim \
+		menu_czech_czech_republic.ascii.vim \
+
+# Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim.
+menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim
+	rm -f menu_chinese_gb.936.vim
+	iconv -f utf-8 -t cp936 menu_zh_cn.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp936/' -e 's/" Original translations/" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT/' > menu_chinese_gb.936.vim
+
+# Convert menu_zh_tw.utf-8.vim to create menu_chinese_taiwan.950.vim.
+menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim
+	rm -f menu_chinese_taiwan.950.vim
+	iconv -f utf-8 -t cp950 menu_zh_tw.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp950/' -e 's/" Original translations/" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT/' > menu_chinese_taiwan.950.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_cs_cz.iso_8859-2.vim.
+menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_cs_cz.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' \
+			-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+			-e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/'  \
+			> menu_cs_cz.iso_8859-2.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.1250.vim.
+menu_czech_czech_republic.1250.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP1250)/'  \
+		> menu_czech_czech_republic.1250.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.ascii.vim.
+menu_czech_czech_republic.ascii.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.ascii.vim
+	sed -e 's/Á/A/g' -e 's/á/a/g' -e 's/Č/C/g' -e 's/č/c/g' -e 's/Ď/D/g' \
+		-e 's/ď/d/g' -e 's/É/E/g' -e 's/é/e/g' -e 's/Ě/E/g' -e 's/ě/e/g' \
+		-e 's/Í/I/g' -e 's/í/i/g' -e 's/Ň/N/g' -e 's/ň/n/g' -e 's/Ó/O/g' \
+		-e 's/ó/o/g' -e 's/Ř/R/g' -e 's/ř/r/g' -e 's/Š/S/g' -e 's/š/s/g' \
+		-e 's/Ť/T/g' -e 's/ť/t/g' -e 's/Ú/U/g' -e 's/ú/u/g' -e 's/Ů/U/g' \
+		-e 's/ů/u/g' -e 's/Ý/Y/g' -e 's/ý/y/g' -e 's/Ž/Z/g' -e 's/ž/z/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(ASCII - without diacritics)/'  \
+	menu_cs_cz.utf-8.vim > menu_czech_czech_republic.ascii.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_ja_jp.euc-jp.vim.
+menu_ja_jp.euc-jp.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_ja_jp.euc-jp.vim
+	iconv -f utf-8 -t euc-jp menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-jp/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(EUC-JP)/'  \
+		> menu_ja_jp.euc-jp.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_japanese_japan.932.vim.
+menu_japanese_japan.932.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_japanese_japan.932.vim
+	iconv -f utf-8 -t cp932 menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp932/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP932)/'  \
+		> menu_japanese_japan.932.vim
+
+# Convert menu_ko_kr.utf-8.vim to create menu_ko_kr.euckr.vim.
+menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim
+	rm -f menu_ko_kr.euckr.vim
+	iconv -f utf-8 -t euc-kr menu_ko_kr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-kr/' -e 's/" Original translations/" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT/' > menu_ko_kr.euckr.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_pl_pl.iso_8859-2.vim.
+menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_pl_pl.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim.
+menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_polish_poland.1250.vim
+	iconv -f utf-8 -t cp1250 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_polish_poland.1250.vim
+
+# Convert menu_ru_ru.utf-8.vim to create menu_ru_ru.koi8-r.vim.
+menu_ru_ru.koi8-r.vim: menu_ru_ru.utf-8.vim
+	rm -f menu_ru_ru.koi8-r.vim
+	iconv -f utf-8 -t koi8-r menu_ru_ru.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim
+
+# Convert menu_sl_si.utf-8.vim to create menu_sl_si.cp1250.vim.
+menu_sl_si.cp1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.cp1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.cp1250.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_sl_si.latin2.vim.
+menu_sl_si.latin2.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.latin2.vim
+	iconv -f utf-8 -t latin2 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding latin2/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.latin2.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_slovak_slovak_republic.1250.vim.
+menu_slovak_slovak_republic.1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_slovak_slovak_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_slovak_slovak_republic.1250.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.cp1254.vim.
+menu_tr_tr.cp1254.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.cp1254.vim
+	iconv -f utf-8 -t cp1254 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1254/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.cp1254.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.iso_8859-9.vim.
+menu_tr_tr.iso_8859-9.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.iso_8859-9.vim
+	iconv -f utf-8 -t iso8859-9 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-9/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.iso_8859-9.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-5.vim.
+menu_sr_rs.iso_8859-5.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-5.vim
+	iconv -f utf-8 -t iso8859-5 menu_sr_rs.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-5/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' > menu_sr_rs.iso_8859-5.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-2.vim.
+menu_sr_rs.iso_8859-2.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-2.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/đ/g' -e 's/е/e/g' -e 's/ж/ž/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/ć/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/č/g' -e 's/џ/dž/g' -e 's/ш/š/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Ž/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/Ć/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/Č/g' -e 's/Џ/Dž/g' -e 's/Ш/Š/g' \
+		-e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim | iconv -f utf-8 -t iso8859-2 \
+	> menu_sr_rs.iso_8859-2.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.ascii.vim.
+menu_sr_rs.ascii.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.ascii.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/dj/g' -e 's/е/e/g' -e 's/ж/z/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/c/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/c/g' -e 's/џ/dz/g' -e 's/ш/s/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Z/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/C/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/C/g' -e 's/Џ/Dz/g' -e 's/Ш/S/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim > menu_sr_rs.ascii.vim
+	
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.cp1251.vim.
+menu_uk_ua.cp1251.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.cp1251.vim
+	iconv -f utf-8 -t cp1251 menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.cp1251.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.koi8-u.vim.
+menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.koi8-u.vim
+	iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim
diff --git a/runtime/lang/menu_af_af.latin1.vim b/runtime/lang/menu_af_af.latin1.vim
index 46331e7ac..649c4e195 100644
--- a/runtime/lang/menu_af_af.latin1.vim
+++ b/runtime/lang/menu_af_af.latin1.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Afrikaas
 " Maintainer:		Danie Roux <droux@tuks.co.za>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_ca_es.latin1.vim b/runtime/lang/menu_ca_es.latin1.vim
index 6e30eef9d..6f8ea7f82 100644
--- a/runtime/lang/menu_ca_es.latin1.vim
+++ b/runtime/lang/menu_ca_es.latin1.vim
@@ -2,7 +2,7 @@
 "
 " Maintainer:	Ernest Adrogué <eadrogue@gmx.net>
 " Last Change:	26 Jul 2017
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index f20989f4c..a58ec9c59 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,7 +1,8 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2020 Apr 23
+" Last Change:          2022 Feb 19
+" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -449,4 +450,4 @@ menutrans Set\ '&filetype'\ Too			Ò²
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: set nu ts=4 sw=4 noet fdm=marker fdc=4 :
+" vim: set ts=4 sw=4 noet fdm=marker fdc=4 :
diff --git a/runtime/lang/menu_chinese_taiwan.950.vim b/runtime/lang/menu_chinese_taiwan.950.vim
index 7631e3e1a..c2ae9f930 100644
--- a/runtime/lang/menu_chinese_taiwan.950.vim
+++ b/runtime/lang/menu_chinese_taiwan.950.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Traditional Chinese
 " Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
 " Last Change:		2012 May 01
+" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -8,6 +9,7 @@ if exists("did_menu_trans")
 endif
 let did_menu_trans = 1
 " }}}
+
 let s:keepcpo= &cpo
 set cpo&vim
 
diff --git a/runtime/lang/menu_cs_cz.iso_8859-2.vim b/runtime/lang/menu_cs_cz.iso_8859-2.vim
index 1abf0c35e..c93b84b9b 100644
--- a/runtime/lang/menu_cs_cz.iso_8859-2.vim
+++ b/runtime/lang/menu_cs_cz.iso_8859-2.vim
@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (ISO-8859-2)
+" Menu Translations:    Czech (ISO8859-2)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -12,7 +13,7 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
-scriptencoding iso-8859-2
+scriptencoding iso8859-2
 
 " {{{ File menu
 menutrans &File				&Soubor
diff --git a/runtime/lang/menu_cs_cz.utf-8.vim b/runtime/lang/menu_cs_cz.utf-8.vim
index a7be2c8b3..e08362641 100644
--- a/runtime/lang/menu_cs_cz.utf-8.vim
+++ b/runtime/lang/menu_cs_cz.utf-8.vim
@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_czech_czech_republic.1250.vim b/runtime/lang/menu_czech_czech_republic.1250.vim
index 9502288ed..6691a88b4 100644
--- a/runtime/lang/menu_czech_czech_republic.1250.vim
+++ b/runtime/lang/menu_czech_czech_republic.1250.vim
@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_czech_czech_republic.ascii.vim b/runtime/lang/menu_czech_czech_republic.ascii.vim
index e7c2c43a4..7e8672024 100644
--- a/runtime/lang/menu_czech_czech_republic.ascii.vim
+++ b/runtime/lang/menu_czech_czech_republic.ascii.vim
@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (latin1 - w/o diacritics)
+" Menu Translations:    Czech (ASCII - without diacritics)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_da.utf-8.vim b/runtime/lang/menu_da.utf-8.vim
index a11213c05..935a780e1 100644
--- a/runtime/lang/menu_da.utf-8.vim
+++ b/runtime/lang/menu_da.utf-8.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Danish
 " Maintainer:		scootergrisen
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_de_de.latin1.vim b/runtime/lang/menu_de_de.latin1.vim
index d836118ea..17c748ff4 100644
--- a/runtime/lang/menu_de_de.latin1.vim
+++ b/runtime/lang/menu_de_de.latin1.vim
@@ -5,6 +5,7 @@
 "			        Johannes Zellner <johannes@zellner.org>
 " Last Change:	Mon, 1 April 2019
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_eo.utf-8.vim b/runtime/lang/menu_eo.utf-8.vim
index 7e363f904..cc888a5a8 100644
--- a/runtime/lang/menu_eo.utf-8.vim
+++ b/runtime/lang/menu_eo.utf-8.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Esperanto
 " Maintainer:		Dominique PELLE <dominique.pelle@free.fr>
 " Last Change:		2012 May 01
+" Original translations
 " 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_es_es.latin1.vim b/runtime/lang/menu_es_es.latin1.vim
index 97f38a765..e6aceb905 100644
--- a/runtime/lang/menu_es_es.latin1.vim
+++ b/runtime/lang/menu_es_es.latin1.vim
@@ -3,7 +3,7 @@
 " Last translator:	Omar Campagne Polaino <ocampagne@gmail.com>
 " Version:		7.2.245
 " Last Change:		2012 May 01
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_fi_fi.latin1.vim b/runtime/lang/menu_fi_fi.latin1.vim
index c68f232ee..73aa3f517 100644
--- a/runtime/lang/menu_fi_fi.latin1.vim
+++ b/runtime/lang/menu_fi_fi.latin1.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Finnish
 " Maintainer:		Flammie Pirinen <flammie@iki.fi>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_fr_fr.latin1.vim b/runtime/lang/menu_fr_fr.latin1.vim
index bd045d7ec..ef741d71b 100644
--- a/runtime/lang/menu_fr_fr.latin1.vim
+++ b/runtime/lang/menu_fr_fr.latin1.vim
@@ -4,6 +4,7 @@
 " Contributors:		David Blanchet <david.blanchet@free.fr>
 " 			Gabriel Dupras <gabrieldupras@gmail.com>
 " Last Change:		2021 Feb 16
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_hu_hu.iso_8859-2.vim b/runtime/lang/menu_hu_hu.iso_8859-2.vim
index 27c460f3b..262f0440f 100644
--- a/runtime/lang/menu_hu_hu.iso_8859-2.vim
+++ b/runtime/lang/menu_hu_hu.iso_8859-2.vim
@@ -2,6 +2,7 @@
 " Original Translation:	Zoltán Árpádffy
 " Maintained By:	Kontra Gergely <kgergely@mcl.hu>
 " Last Change:		2020 Apr 23
+" Original translations
 " I'm working on defining (unaccented) hotkeys for everything.
 " I want to remove y and z hotkeys, because on the hungarian keymap they're at
 " a differrent place.
diff --git a/runtime/lang/menu_hu_hu.utf-8.vim b/runtime/lang/menu_hu_hu.utf-8.vim
index 092abc085..b76af0d0c 100644
--- a/runtime/lang/menu_hu_hu.utf-8.vim
+++ b/runtime/lang/menu_hu_hu.utf-8.vim
@@ -5,6 +5,7 @@
 "
 " This file was converted from menu_hu_hu.iso_8859-2.vim.  See there for
 " remarks.
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_is_is.latin1.vim b/runtime/lang/menu_is_is.latin1.vim
index 9616c6cfb..bcb709683 100644
--- a/runtime/lang/menu_is_is.latin1.vim
+++ b/runtime/lang/menu_is_is.latin1.vim
@@ -2,6 +2,7 @@
 " Maintainer:		Jón Arnar Briem <jonbriem@gmail.com>
 " Originally By:	Jón Arnar Briem <jonbriem@gmail.com>
 " Last Change:	Sun, 24 Mar 2019 22:40:00 CEST
+" Original translations
 " vim:set foldmethod=marker tabstop=8:
 
 " Quit when menu translations have already been done.
diff --git a/runtime/lang/menu_it_it.latin1.vim b/runtime/lang/menu_it_it.latin1.vim
index 927c3c9e6..9ce8b8742 100644
--- a/runtime/lang/menu_it_it.latin1.vim
+++ b/runtime/lang/menu_it_it.latin1.vim
@@ -3,6 +3,7 @@
 "			Vlad Sandrini <vlad.gently@gmail.com>
 "			Luciano Montanaro <mikelima@cirulla.net>
 " Last Change:	2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 1c2c66ec3..3df1b2567 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -3,6 +3,7 @@
 " Menu Translations:	Japanese (EUC-JP)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
 " Last Change:		18-Jul-2018.
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 "
 " Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 583586898..1f3c429a1 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -3,6 +3,7 @@
 " Menu Translations:	Japanese (UTF-8)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
 " Last Change:		18-Jul-2018.
+" Original translations
 "
 " Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 4c8bdcfa1..b5b9ffa14 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -3,6 +3,7 @@
 " Menu Translations:	Japanese (CP932)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
 " Last Change:		18-Jul-2018.
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 "
 " Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
diff --git a/runtime/lang/menu_ko_kr.euckr.vim b/runtime/lang/menu_ko_kr.euckr.vim
index 381638482..59e95802a 100644
--- a/runtime/lang/menu_ko_kr.euckr.vim
+++ b/runtime/lang/menu_ko_kr.euckr.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_ko_kr.utf-8.vim b/runtime/lang/menu_ko_kr.utf-8.vim
index d036853c5..6da5f73b8 100644
--- a/runtime/lang/menu_ko_kr.utf-8.vim
+++ b/runtime/lang/menu_ko_kr.utf-8.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_nl_nl.latin1.vim b/runtime/lang/menu_nl_nl.latin1.vim
index e1d4506c8..d613d5821 100644
--- a/runtime/lang/menu_nl_nl.latin1.vim
+++ b/runtime/lang/menu_nl_nl.latin1.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Nederlands
 " Maintainer:		Bram Moolenaar
 " Last Change:	2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_no_no.latin1.vim b/runtime/lang/menu_no_no.latin1.vim
index 1a5bb4011..4e3e6f08b 100644
--- a/runtime/lang/menu_no_no.latin1.vim
+++ b/runtime/lang/menu_no_no.latin1.vim
@@ -2,6 +2,7 @@
 " Maintainer:		Øyvind A. Holm <sunny@sunbase.org>
 " Last Change:		2020 Apr 23
 " menu_no_no.latin1.vim 289 2004-05-16 18:00:52Z sunny
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_pl_pl.iso_8859-2.vim b/runtime/lang/menu_pl_pl.iso_8859-2.vim
index 7bb7294ae..a92389ecb 100644
--- a/runtime/lang/menu_pl_pl.iso_8859-2.vim
+++ b/runtime/lang/menu_pl_pl.iso_8859-2.vim
@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_pl_pl.utf-8.vim b/runtime/lang/menu_pl_pl.utf-8.vim
index 871b4fad9..01bd585d2 100644
--- a/runtime/lang/menu_pl_pl.utf-8.vim
+++ b/runtime/lang/menu_pl_pl.utf-8.vim
@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_polish_poland.1250.vim b/runtime/lang/menu_polish_poland.1250.vim
index 9dde00dd4..50777036e 100644
--- a/runtime/lang/menu_polish_poland.1250.vim
+++ b/runtime/lang/menu_polish_poland.1250.vim
@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_pt_br.vim b/runtime/lang/menu_pt_br.vim
index 1e425008d..0c6ff93f8 100644
--- a/runtime/lang/menu_pt_br.vim
+++ b/runtime/lang/menu_pt_br.vim
@@ -1,7 +1,7 @@
 " Menu Translations: Português do Brasil
 " Maintainer: José de Paula <jose@infoviaweb.com>
 " Last Change: 2020 Apr 23
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_pt_pt.vim b/runtime/lang/menu_pt_pt.vim
index c3265c006..423d9188a 100644
--- a/runtime/lang/menu_pt_pt.vim
+++ b/runtime/lang/menu_pt_pt.vim
@@ -1,6 +1,7 @@
 " Menu Translations: Português
 " adaptado de pt_br.
 " Maintainer: Duarte Henriques <duarte_henriques@myrealbox.com>
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_ru.utf-8.vim b/runtime/lang/menu_ru.utf-8.vim
index 20b0b2d5a..b5e4b79c6 100644
--- a/runtime/lang/menu_ru.utf-8.vim
+++ b/runtime/lang/menu_ru.utf-8.vim
@@ -1,3 +1,3 @@
 " Menu Translations:	Russian
 
-source <sfile>:p:h/menu_ru_ru.vim
+source <sfile>:p:h/menu_ru_ru.utf-8.vim
diff --git a/runtime/lang/menu_ru_ru.koi8-r.vim b/runtime/lang/menu_ru_ru.koi8-r.vim
index e66b728e7..10eb68ae3 100644
--- a/runtime/lang/menu_ru_ru.koi8-r.vim
+++ b/runtime/lang/menu_ru_ru.koi8-r.vim
@@ -1,7 +1,8 @@
 " Menu Translations:	Russian
 " Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	vassily ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		29 May 2013
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
 " URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
 "
 " $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
@@ -36,7 +37,7 @@ menutrans &Help				
 " Help menu
 menutrans &Overview<Tab><F1>		&ïÂÚÏÒ<Tab><F1>
 menutrans &User\ Manual			òÕËÏ×Ï&ÄÓÔ×Ï\ ÐÏÌØÚÏ×ÁÔÅÌÑ
-menutrans &How-to\ links		&ëÁË\ ÜÔÏ\ ÓÄÅÌÁÔØ\.\.\.
+menutrans &How-To\ Links		&ëÁË\ ÜÔÏ\ ÓÄÅÌÁÔØ\.\.\.
 menutrans &Find\.\.\.			&ðÏÉÓË
 "--------------------
 menutrans &Credits			&âÌÁÇÏÄÁÒÎÏÓÔÉ
@@ -58,7 +59,7 @@ menutrans &Close<Tab>:close		&
 menutrans &Save<Tab>:w			&óÏÈÒÁÎÉÔØ<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav	óÏÈÒÁÎÉÔØ\ &ËÁË\.\.\.<Tab>:sav
 "--------------------
-menutrans Split\ &Diff\ with\.\.\.	óÒ&Á×ÎÉÔØ\ Ó\.\.\.
+menutrans Split\ &Diff\ With\.\.\.	óÒ&Á×ÎÉÔØ\ Ó\.\.\.
 menutrans Split\ Patched\ &By\.\.\.	óÒÁ×ÎÉÔØ\ Ó\ ÐÒÉÍÅÎÅÎÉÅÍ\ ÚÁÐ&ÌÁÔËÉ\.\.\.
 "--------------------
 menutrans &Print			îÁ&ÐÅÞÁÔÁÔØ
@@ -97,12 +98,12 @@ menutrans &Keymap			
 menutrans Select\ Fo&nt\.\.\.		÷ÙÂÏÒ\ &ÛÒÉÆÔÁ\.\.\.
 ">>>----------------- Edit/Global settings
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	ðÏÄÓ×ÅÔËÁ\ &ÎÁÊÄÅÎÎÙÈ\ ÓÏÏÔ×ÅÔÓÔ×ÉÊ<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		&òÅÇÉÓÔÒÏÎÅÚÁ×ÉÓÉÍÙÊ\ ÐÏÉÓË<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		ðÏËÁÚÙ×ÁÔØ\ ÐÁÒÎÙÅ\ &ÜÌÅÍÅÎÔÙ<Tab>:set\ sm!
-menutrans &Context\ lines				óÔÒ&ÏË\ ×ÏËÒÕÇ\ ËÕÒÓÏÒÁ
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&òÅÇÉÓÔÒÏÎÅÚÁ×ÉÓÉÍÙÊ\ ÐÏÉÓË<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	ðÏËÁÚÙ×ÁÔØ\ ÐÁÒÎÙÅ\ &ÜÌÅÍÅÎÔÙ<Tab>:set\ sm!
+menutrans &Context\ Lines				óÔÒ&ÏË\ ×ÏËÒÕÇ\ ËÕÒÓÏÒÁ
 menutrans &Virtual\ Edit				÷ÉÒ&ÔÕÁÌØÎÏÅ\ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ
 menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		òÅÖÉÍ\ &÷ÓÔÁ×ËÉ<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		&óÏ×ÍÅÓÔÉÍÏÓÔØ\ Ó\ Vi<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&óÏ×ÍÅÓÔÉÍÏÓÔØ\ Ó\ Vi<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\.				&ðÕÔØ\ ÄÌÑ\ ÐÏÉÓËÁ\ ÆÁÊÌÏ×\.\.\.
 menutrans Ta&g\ Files\.\.\.				æÁÊÌÙ\ &ÍÅÔÏË\.\.\.
 "
@@ -113,18 +114,18 @@ menutrans Toggle\ &Right\ Scrollbar			
 ">>>->>>------------- Edit/Global settings/Virtual edit
 menutrans Never						÷ÙËÌÀÞÅÎÏ
 menutrans Block\ Selection				ðÒÉ\ ×ÙÄÅÌÅÎÉÉ\ ÂÌÏËÁ
-menutrans Insert\ mode					÷\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
+menutrans Insert\ Mode					÷\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
 menutrans Block\ and\ Insert				ðÒÉ\ ×ÙÄÅÌÅÎÉÉ\ ÂÌÏËÁ\ É\ ×\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
 menutrans Always					÷ËÌÀÞÅÎÏ\ ×ÓÅÇÄÁ
 ">>>----------------- Edit/File settings
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&îÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!	ïÔÎÏÓÉÔÅ&ÌØÎÁÑ\ ÎÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nru!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	ïÔÎÏÓÉÔÅ&ÌØÎÁÑ\ ÎÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nru!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		ïÔÏÂÒÁ&ÖÅÎÉÅ\ ÎÅ×ÉÄÉÍÙÈ\ ÓÉÍ×ÏÌÏ×<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		&ðÅÒÅÎÏÓ\ ÄÌÉÎÎÙÈ\ ÓÔÒÏË<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	ðÅÒÅÎÏÓ\ &ÃÅÌÙÈ\ ÓÌÏ×<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		ðÒÏ&ÂÅÌÙ\ ×ÍÅÓÔÏ\ ÔÁÂÕÌÑÃÉÉ<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		á×ÔÏÍÁÔÉÞÅÓËÏÅ\ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ &ÏÔÓÔÕÐÏ×<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		æÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ ÏÔÓÔÕÐÏ×\ ×\ &ÓÔÉÌÅ\ C<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&ðÅÒÅÎÏÓ\ ÄÌÉÎÎÙÈ\ ÓÔÒÏË<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	ðÅÒÅÎÏÓ\ &ÃÅÌÙÈ\ ÓÌÏ×<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	ðÒÏ&ÂÅÌÙ\ ×ÍÅÓÔÏ\ ÔÁÂÕÌÑÃÉÉ<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	á×ÔÏÍÁÔÉÞÅÓËÏÅ\ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ &ÏÔÓÔÕÐÏ×<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	æÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ ÏÔÓÔÕÐÏ×\ ×\ &ÓÔÉÌÅ\ C<Tab>:set\ cin!
 ">>>---
 menutrans &Shiftwidth					÷ÅÌÉ&ÞÉÎÁ\ ÏÔÓÔÕÐÁ
 menutrans Soft\ &Tabstop				ûÉÒÉÎÁ\ &ÔÁÂÕÌÑÃÉÉ
@@ -134,55 +135,64 @@ menutrans &File\ Format\.\.\.				&
 "
 "
 " Tools menu
-menutrans &Jump\ to\ this\ tag<Tab>g^]			&ðÅÒÅÈÏÄ\ Ë\ ÍÅÔËÅ<Tab>g^]
-menutrans Jump\ &back<Tab>^T				&÷ÅÒÎÕÔØÓÑ\ ÎÁÚÁÄ<Tab>^T
-menutrans Build\ &Tags\ File				óÏÚÄÁÔØ\ &ÆÁÊÌ\ ÍÅÔÏË
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&ðÅÒÅÊÔÉ\ Ë\ ÍÅÔËÅ<Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&÷ÅÒÎÕÔØÓÑ\ ÎÁÚÁÄ<Tab>^T
+menutrans Build\ &Tags\ File				óÏÚÄÁÔØ\ ÆÁÊÌ\ ÍÅ&ÔÏË
 "-------------------
-menutrans &Folding					òÁÂÏÔÁ\ ÓÏ\ &ÓËÌÁÄËÁÍÉ
+menutrans &Folding					&óËÌÁÄËÉ
 menutrans &Spelling					ðÒ&Á×ÏÐÉÓÁÎÉÅ
 menutrans &Diff						&ïÔÌÉÞÉÑ\ (diff)
 "-------------------
-menutrans &Make<Tab>:make				ëÏ&ÍÐÉÌÑÃÉÑ<Tab>:make
+menutrans &Make<Tab>:make				ëÏ&ÍÐÉÌÉÒÏ×ÁÔØ<Tab>:make
 menutrans &List\ Errors<Tab>:cl				óÐÉÓÏË\ Ï&ÛÉÂÏË<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			óÐÉÓÏË\ ×ÓÅ&È\ ÏÛÉÂÏË\ É\ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ<Tab>:cl!
+menutrans L&ist\ Messages<Tab>:cl!			óÐÉÓÏË\ ÓÏÏ&ÂÝÅÎÉÊ<Tab>:cl!
 menutrans &Next\ Error<Tab>:cn				óÌÅÄÕ&ÀÝÁÑ\ ÏÛÉÂËÁ<Tab>:cn
 menutrans &Previous\ Error<Tab>:cp			ð&ÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ<Tab>:cp
 menutrans &Older\ List<Tab>:cold			âÏÌÅÅ\ ÓÔÁÒ&ÙÊ\ ÓÐÉÓÏË\ ÏÛÉÂÏË<Tab>:cold
 menutrans N&ewer\ List<Tab>:cnew			âÏÌÅÅ\ Ó×Å&ÖÉÊ\ ÓÐÉÓÏË\ ÏÛÉÂÏË<Tab>:cnew
 menutrans Error\ &Window				ïË&ÎÏ\ ÏÛÉÂÏË
-menutrans Se&T\ Compiler				÷ÙÂÏÒ\ &ËÏÍÐÉÌÑÔÏÒÁ
+menutrans Se&t\ Compiler				÷ÙÂÏÒ\ &ËÏÍÐÉÌÑÔÏÒÁ
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		ðÏËÁ&ÚÁÔØ\ ÎÁÓÔÒÏÊËÉ\ ËÏÍÐÉ&ÌÑÔÏÒÁ\ ×\ ÍÅÎÀ 
 "-------------------
 menutrans &Convert\ to\ HEX<Tab>:%!xxd			ð&ÅÒÅ×ÅÓÔÉ\ ×\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r			ðÅÒÅ×ÅÓÔÉ\ É&Ú\ HEX<Tab>:%!xxd\ -r
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			ðÅÒÅ×ÅÓÔÉ\ É&Ú\ HEX<Tab>:%!xxd\ -r
 ">>>---------------- Tools/Spelling
 menutrans &Spell\ Check\ On				&÷ËÌ\ ÐÒÏ×ÅÒËÕ\ ÐÒÁ×ÏÐÉÓÁÎÉÑ
 menutrans Spell\ Check\ &Off				÷Ù&ËÌ\ ÐÒÏ×ÅÒËÕ\ ÐÒÁ×ÏÐÉÓÁÎÉÑ
-menutrans To\ &Next\ error<Tab>]s			&óÌÅÄÕÀÝÁÑ\ ÏÛÉÂËÁ
-menutrans To\ &Previous\ error<Tab>[s			&ðÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ
-menutrans Suggest\ &Corrections<Tab>z=			ðÒÅÄÌÏÖÉÔØ\ ÉÓÐ&ÒÁ×ÌÅÎÉÑ
-menutrans &Repeat\ correction<Tab>:spellrepall		ðÏ×&ÔÏÒÉÔØ\ ÉÓÐÒÁ×ÌÅÎÉÅ\ ÄÌÑ\ ×ÓÅÈ
+menutrans To\ &Next\ Error<Tab>]s			&óÌÅÄÕÀÝÁÑ\ ÏÛÉÂËÁ<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&ðÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			ðÒÅÄÌÏÖÉÔØ\ ÉÓÐ&ÒÁ×ÌÅÎÉÑ<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		ðÏ×&ÔÏÒÉÔØ\ ÉÓÐÒÁ×ÌÅÎÉÅ\ ÄÌÑ\ ×ÓÅÈ<Tab>spellrepall
 "-------------------
-menutrans Set\ language\ to\ "en"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en"
-menutrans Set\ language\ to\ "en_au"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_au"
-menutrans Set\ language\ to\ "en_ca"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_ca"
-menutrans Set\ language\ to\ "en_gb"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_gb"
-menutrans Set\ language\ to\ "en_nz"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_nz"
-menutrans Set\ language\ to\ "en_us"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_us"
+menutrans Set\ Language\ to\ "en"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en"
+menutrans Set\ Language\ to\ "en_au"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_us"
 menutrans &Find\ More\ Languages			&îÁÊÔÉ\ ÂÏÌØÛÅ\ ÑÚÙËÏ×
 let g:menutrans_set_lang_to =				'õÓÔÁÎÏ×ÉÔØ ÑÚÙË'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'éÓÐÒÁ×ÉÔØ\ "%s"\ ÎÁ'
+let g:menutrans_spell_add_ARG_to_word_list =		'äÏÂÁ×ÉÔØ\ "%s"\ ×\ ÓÌÏ×ÁÒØ'
+let g:menutrans_spell_ignore_ARG =			'ðÒÏÐÕÓÔÉÔØ\ "%s"'
 ">>>---------------- Folds
-menutrans &Enable/Disable\ folds<Tab>zi			÷ËÌ/×ÙËÌ\ &ÓËÌÁÄËÉ<Tab>zi
+menutrans &Enable/Disable\ Folds<Tab>zi			÷ËÌ/×ÙËÌ\ &ÓËÌÁÄËÉ<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv			ïÔËÒÙÔØ\ ÓÔÒÏËÕ\ Ó\ &ËÕÒÓÏÒÏÍ<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		ïÔËÒÙÔØ\ &ÔÏÌØËÏ\ ÓÔÒÏËÕ\ Ó\ ËÕÒÓÏÒÏÍ<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm			úÁËÒÙÔØ\ &ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM			úÁËÒÙÔØ\ &×ÓÅ\ ÓËÌÁÄËÉ<Tab>zM
-menutrans &Open\ all\ folds<Tab>zR			ïÔËÒ&ÙÔØ\ ×ÓÅ\ ÓËÌÁÄËÉ<Tab>zR
-menutrans O&pen\ more\ folds<Tab>zr			ïÔË&ÒÙÔØ\ ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zr
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		ïÔËÒÙÔØ\ &ÔÏÌØËÏ\ ÓÔÒÏËÕ\ Ó\ ËÕÒÓÏÒÏÍ<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			úÁËÒÙÔØ\ &ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			úÁËÒÙÔØ\ &×ÓÅ\ ÓËÌÁÄËÉ<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			ïÔËÒ&ÙÔØ\ ×ÓÅ\ ÓËÌÁÄËÉ<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			ïÔË&ÒÙÔØ\ ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zr
 menutrans Fold\ Met&hod					&íÅÔÏÄ\ ÓËÌÁÄÏË
 menutrans Create\ &Fold<Tab>zf				óÏ&ÚÄÁÔØ\ ÓËÌÁÄËÕ<Tab>zf
 menutrans &Delete\ Fold<Tab>zd				õ&ÄÁÌÉÔØ\ ÓËÌÁÄËÕ<Tab>zd
 menutrans Delete\ &All\ Folds<Tab>zD			õÄÁÌÉÔØ\ ×Ó&Å\ ÓËÌÁÄËÉ<Tab>zD
-menutrans Fold\ col&umn\ width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
+menutrans Fold\ col&umn\ Width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
 ">>>->>>----------- Tools/Folds/Fold Method
 menutrans M&anual					÷ÒÕ&ÞÎÕÀ
 menutrans I&ndent					ï&ÔÓÔÕÐ
@@ -201,15 +211,15 @@ menutrans &Open<Tab>:copen				&
 "
 " Syntax menu
 "
-menutrans &Show\ filetypes\ in\ menu			ðÏËÁÚÁÔØ\ ÍÅÎÀ\ ÄÌÑ\ ×ÙÂÏÒÁ\ ÔÉÐÁ\ &ÆÁÊÌÁ
+menutrans &Show\ File\ Types\ in\ Menu			ðÏËÁÚÁÔØ\ ÍÅÎÀ\ ×ÙÂÏÒÁ\ ÔÉÐÁ\ &ÆÁÊÌÁ
 menutrans Set\ '&syntax'\ only				&éÚÍÅÎÑÔØ\ ÔÏÌØËÏ\ ÚÎÁÞÅÎÉÅ\ 'syntax'
 menutrans Set\ '&filetype'\ too				éÚÍÅÎÑÔØ\ &ÔÁËÖÅ\ ÚÎÁÞÅÎÉÅ\ 'filetype'
 menutrans &Off						&ïÔËÌÀÞÉÔØ
 menutrans &Manual					÷ÒÕ&ÞÎÕÀ
 menutrans A&utomatic					&á×ÔÏÍÁÔÉÞÅÓËÉ
-menutrans on/off\ for\ &This\ file			÷ËÌ/×ÙËÌ\ ÄÌÑ\ &ÜÔÏÇÏ\ ÆÁÊÌÁ
-menutrans Co&lor\ test					ðÒÏ×ÅÒËÁ\ &Ã×ÅÔÏ×
-menutrans &Highlight\ test				ðÒÏ×ÅÒËÁ\ ÐÏÄ&Ó×ÅÔËÉ
+menutrans On/Off\ for\ &This\ File			÷ËÌ/×ÙËÌ\ ÄÌÑ\ &ÜÔÏÇÏ\ ÆÁÊÌÁ
+menutrans Co&lor\ Test					ðÒÏ×ÅÒËÁ\ &Ã×ÅÔÏ×
+menutrans &Highlight\ Test				ðÒÏ×ÅÒËÁ\ ÐÏÄ&Ó×ÅÔËÉ
 menutrans &Convert\ to\ HTML				ó&ÄÅÌÁÔØ\ HTML\ Ó\ ÐÏÄÓ×ÅÔËÏÊ
 "
 "
@@ -246,8 +256,8 @@ menutrans Min\ Widt&h<Tab>^W1\|				
 ">>>----------------- Window/Move To
 menutrans &Top<Tab>^WK					÷&×ÅÒÈ<Tab>^WK
 menutrans &Bottom<Tab>^WJ				÷&ÎÉÚ<Tab>^WJ
-menutrans &Left\ side<Tab>^WH				÷&ÌÅ×Ï<Tab>^WH
-menutrans &Right\ side<Tab>^WL				÷&ÐÒÁ×Ï<Tab>^WL
+menutrans &Left\ Side<Tab>^WH				÷&ÌÅ×Ï<Tab>^WH
+menutrans &Right\ Side<Tab>^WL				÷&ÐÒÁ×Ï<Tab>^WL
 "
 "
 " The popup menu
@@ -260,9 +270,11 @@ menutrans &Paste					
 menutrans &Delete					&õÄÁÌÉÔØ
 menutrans Select\ Blockwise				âÌÏËÏ×ÏÅ\ ×ÙÄÅÌÅÎÉÅ
 menutrans Select\ &Word					÷ÙÄÅÌÉÔØ\ &ÓÌÏ×Ï
+menutrans Select\ &Sentence				÷ÙÄÅÌÉÔØ\ &ÐÒÅÄÌÏÖÅÎÉÅ
+menutrans Select\ Pa&ragraph				÷ÙÄÅÌÉÔØ\ ÐÁÒÁ&ÇÒÁÆ
 menutrans Select\ &Line					÷ÙÄÅÌÉÔØ\ ÓÔ&ÒÏËÕ
 menutrans Select\ &Block				÷ÙÄÅÌÉÔØ\ &ÂÌÏË
-menutrans Select\ &All					÷&ÙÄÅÌÉÔØ\ &×Ó£
+menutrans Select\ &All					÷ÙÄÅÌÉÔØ\ &×Ó£
 "
 " The GUI toolbar
 "
@@ -280,10 +292,9 @@ if has("toolbar")
     tmenu ToolBar.Cut					÷ÙÒÅÚÁÔØ
     tmenu ToolBar.Copy					ëÏÐÉÒÏ×ÁÔØ
     tmenu ToolBar.Paste					÷ËÌÅÉÔØ
-    tmenu ToolBar.Find					ðÏÉÓË...
-    tmenu ToolBar.FindNext				ðÏÉÓË ÓÌÅÄÕÀÝÅÇÏ ÓÏÏÔ×ÅÔÓÔ×ÉÑ
-    tmenu ToolBar.FindPrev				ðÏÉÓË ÐÒÅÄÙÄÕÝÅÇÏ ÓÏÏÔ×ÅÔÓÔ×ÉÑ
-    tmenu ToolBar.Replace				úÁÍÅÎÉÔØ...
+    tmenu ToolBar.FindNext				îÁÊÔÉ ÓÌÅÄÕÀÝÅÅ
+    tmenu ToolBar.FindPrev				îÁÊÔÉ ÐÒÅÄÙÄÕÝÅÅ
+    tmenu ToolBar.Replace				îÁÊÔÉ ÉÌÉ ÚÁÍÅÎÉÔØ...
     tmenu ToolBar.LoadSesn				úÁÇÒÕÚÉÔØ ÓÅÁÎÓ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
     tmenu ToolBar.SaveSesn				óÏÈÒÁÎÉÔØ ÓÅÁÎÓ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
     tmenu ToolBar.RunScript				÷ÙÐÏÌÎÉÔØ ÓÃÅÎÁÒÉÊ Vim
diff --git a/runtime/lang/menu_ru_ru.utf-8.vim b/runtime/lang/menu_ru_ru.utf-8.vim
index 20b0b2d5a..45ef2becf 100644
--- a/runtime/lang/menu_ru_ru.utf-8.vim
+++ b/runtime/lang/menu_ru_ru.utf-8.vim
@@ -1,3 +1,337 @@
 " Menu Translations:	Russian
+" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Original translations
+" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
+"
+" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
+"
+" Adopted for RuVim project by Vassily Ragosin.
+" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
+" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+"
+"
+" Quit when menu translations have already been done.
+"
+if exists("did_menu_trans")
+   finish
+endif
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
 
-source <sfile>:p:h/menu_ru_ru.vim
+scriptencoding utf-8
+
+" Top
+menutrans &File				&Файл
+menutrans &Edit				П&равка
+menutrans &Tools			&Инструменты
+menutrans &Syntax			&Синтаксис
+menutrans &Buffers			&Буферы
+menutrans &Window			&Окно
+menutrans &Help				С&правка
+"
+"
+"
+" Help menu
+menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
+menutrans &User\ Manual			Руково&дство\ пользователя
+menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
+menutrans &Find\.\.\.			&Поиск
+"--------------------
+menutrans &Credits			&Благодарности
+menutrans Co&pying			&Распространение
+menutrans &Sponsor/Register		Помо&щь/Регистрация
+menutrans O&rphans			&Сироты
+"--------------------
+menutrans &Version			&Информация\ о\ программе
+menutrans &About			&Заставка
+"
+"
+" File menu
+menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		&Новый<Tab>:enew
+menutrans &Close<Tab>:close		&Закрыть<Tab>:close
+"--------------------
+menutrans &Save<Tab>:w			&Сохранить<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
+"--------------------
+menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
+"--------------------
+menutrans &Print			На&печатать
+menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
+"
+"
+" Edit menu
+menutrans &Undo<Tab>u			О&тменить<Tab>u
+menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
+menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
+"--------------------
+menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
+menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
+menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
+menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
+menutrans &Delete<Tab>x			&Удалить<Tab>x
+menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
+"--------------------
+" Athena GUI only
+menutrans &Find<Tab>/			&Поиск<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
+" End Athena GUI only
+menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
+"--------------------
+menutrans Settings\ &Window		Окно\ настройки\ &опций
+menutrans Startup\ &Settings		Настройки\ запус&ка
+menutrans &Global\ Settings		&Глобальные\ настройки
+menutrans F&ile\ Settings		Настройки\ &файлов
+menutrans C&olor\ Scheme		&Цветовая\ схема
+menutrans &Keymap			Раскладка\ кл&авиатуры
+menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
+">>>----------------- Edit/Global settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
+menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
+menutrans &Virtual\ Edit				Вир&туальное\ редактирование
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
+menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
+"
+menutrans Toggle\ &Toolbar				&Инструментальная\ панель
+menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
+menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
+menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
+">>>->>>------------- Edit/Global settings/Virtual edit
+menutrans Never						Выключено
+menutrans Block\ Selection				При\ выделении\ блока
+menutrans Insert\ Mode					В\ режиме\ Вставки
+menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
+menutrans Always					Включено\ всегда
+">>>----------------- Edit/File settings
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
+">>>---
+menutrans &Shiftwidth					Вели&чина\ отступа
+menutrans Soft\ &Tabstop				Ширина\ &табуляции
+menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
+menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
+"
+"
+"
+" Tools menu
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
+menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
+"-------------------
+menutrans &Folding					&Складки
+menutrans &Spelling					Пр&авописание
+menutrans &Diff						&Отличия\ (diff)
+"-------------------
+menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
+menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
+menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
+menutrans Error\ &Window				Ок&но\ ошибок
+menutrans Se&t\ Compiler				Выбор\ &компилятора
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
+"-------------------
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
+">>>---------------- Tools/Spelling
+menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
+menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
+menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
+"-------------------
+menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
+menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
+menutrans &Find\ More\ Languages			&Найти\ больше\ языков
+let g:menutrans_set_lang_to =				'Установить язык'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
+let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
+let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
+">>>---------------- Folds
+menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
+menutrans Fold\ Met&hod					&Метод\ складок
+menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
+menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
+menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
+">>>->>>----------- Tools/Folds/Fold Method
+menutrans M&anual					Вру&чную
+menutrans I&ndent					О&тступ
+menutrans E&xpression					&Выражение
+menutrans S&yntax					&Синтаксис
+menutrans Ma&rker					&Маркеры
+">>>--------------- Tools/Diff
+menutrans &Update					О&бновить
+menutrans &Get\ Block					Изменить\ &этот\ буфер
+menutrans &Put\ Block					Изменить\ &другой\ буфер
+">>>--------------- Tools/Diff/Error window
+menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
+menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
+menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
+"
+"
+" Syntax menu
+"
+menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
+menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
+menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
+menutrans &Off						&Отключить
+menutrans &Manual					Вру&чную
+menutrans A&utomatic					&Автоматически
+menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
+menutrans Co&lor\ Test					Проверка\ &цветов
+menutrans &Highlight\ Test				Проверка\ под&светки
+menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
+"
+"
+" Buffers menu
+"
+menutrans &Refresh\ menu				О&бновить\ меню
+menutrans Delete					У&далить
+menutrans &Alternate					&Соседний
+menutrans &Next						С&ледующий
+menutrans &Previous					&Предыдущий
+menutrans [No\ File]					[Нет\ файла]
+"
+"
+" Window menu
+"
+menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
+menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
+menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
+"
+menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
+"
+menutrans Move\ &To					&Переместить
+menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
+"
+menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
+menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
+">>>----------------- Window/Move To
+menutrans &Top<Tab>^WK					В&верх<Tab>^WK
+menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
+menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
+"
+"
+" The popup menu
+"
+"
+menutrans &Undo						О&тменить
+menutrans Cu&t						&Вырезать
+menutrans &Copy						&Копировать
+menutrans &Paste					Вк&леить
+menutrans &Delete					&Удалить
+menutrans Select\ Blockwise				Блоковое\ выделение
+menutrans Select\ &Word					Выделить\ &слово
+menutrans Select\ &Sentence				Выделить\ &предложение
+menutrans Select\ Pa&ragraph				Выделить\ пара&граф
+menutrans Select\ &Line					Выделить\ ст&року
+menutrans Select\ &Block				Выделить\ &блок
+menutrans Select\ &All					Выделить\ &всё
+"
+" The GUI toolbar
+"
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open					Открыть файл
+    tmenu ToolBar.Save					Сохранить файл
+    tmenu ToolBar.SaveAll				Сохранить все файлы
+    tmenu ToolBar.Print					Напечатать
+    tmenu ToolBar.Undo					Отменить
+    tmenu ToolBar.Redo					Вернуть
+    tmenu ToolBar.Cut					Вырезать
+    tmenu ToolBar.Copy					Копировать
+    tmenu ToolBar.Paste					Вклеить
+    tmenu ToolBar.FindNext				Найти следующее
+    tmenu ToolBar.FindPrev				Найти предыдущее
+    tmenu ToolBar.Replace				Найти или заменить...
+    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
+    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
+    tmenu ToolBar.RunScript				Выполнить сценарий Vim
+    tmenu ToolBar.Make					Компиляция
+    tmenu ToolBar.Shell					Оболочка
+    tmenu ToolBar.RunCtags				Создать файл меток
+    tmenu ToolBar.TagJump				Перейти к метке
+    tmenu ToolBar.Help					Справка
+    tmenu ToolBar.FindHelp				Найти справку
+  endfun
+endif
+"
+"
+" Dialog texts
+"
+" Find in help dialog
+"
+let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
+"
+" Searh path dialog
+"
+let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
+"
+" Tag files dialog
+"
+let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
+"
+" Text width dialog
+"
+let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
+"
+" File format dialog
+"
+let g:menutrans_fileformat_dialog = "Выберите формат файла."
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
+"
+let menutrans_no_file = "[Нет файла]"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/lang/menu_ru_ru.vim b/runtime/lang/menu_ru_ru.vim
index 22a1c1693..b5e4b79c6 100644
--- a/runtime/lang/menu_ru_ru.vim
+++ b/runtime/lang/menu_ru_ru.vim
@@ -1,336 +1,3 @@
 " Menu Translations:	Russian
-" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		16 May 2018
-" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
-"
-" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
-"
-" Adopted for RuVim project by Vassily Ragosin.
-" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
-" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-"
-"
-" Quit when menu translations have already been done.
-"
-if exists("did_menu_trans")
-   finish
-endif
-let did_menu_trans = 1
-let s:keepcpo= &cpo
-set cpo&vim
 
-scriptencoding utf-8
-
-" Top
-menutrans &File				&Файл
-menutrans &Edit				П&равка
-menutrans &Tools			&Инструменты
-menutrans &Syntax			&Синтаксис
-menutrans &Buffers			&Буферы
-menutrans &Window			&Окно
-menutrans &Help				С&правка
-"
-"
-"
-" Help menu
-menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
-menutrans &User\ Manual			Руково&дство\ пользователя
-menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
-menutrans &Find\.\.\.			&Поиск
-"--------------------
-menutrans &Credits			&Благодарности
-menutrans Co&pying			&Распространение
-menutrans &Sponsor/Register		Помо&щь/Регистрация
-menutrans O&rphans			&Сироты
-"--------------------
-menutrans &Version			&Информация\ о\ программе
-menutrans &About			&Заставка
-"
-"
-" File menu
-menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		&Новый<Tab>:enew
-menutrans &Close<Tab>:close		&Закрыть<Tab>:close
-"--------------------
-menutrans &Save<Tab>:w			&Сохранить<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
-"--------------------
-menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
-"--------------------
-menutrans &Print			На&печатать
-menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
-menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
-"
-"
-" Edit menu
-menutrans &Undo<Tab>u			О&тменить<Tab>u
-menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
-menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
-"--------------------
-menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
-menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
-menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
-menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
-menutrans &Delete<Tab>x			&Удалить<Tab>x
-menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
-"--------------------
-" Athena GUI only
-menutrans &Find<Tab>/			&Поиск<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
-" End Athena GUI only
-menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
-"--------------------
-menutrans Settings\ &Window		Окно\ настройки\ &опций
-menutrans Startup\ &Settings		Настройки\ запус&ка
-menutrans &Global\ Settings		&Глобальные\ настройки
-menutrans F&ile\ Settings		Настройки\ &файлов
-menutrans C&olor\ Scheme		&Цветовая\ схема
-menutrans &Keymap			Раскладка\ кл&авиатуры
-menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
-">>>----------------- Edit/Global settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
-menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
-menutrans &Virtual\ Edit				Вир&туальное\ редактирование
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
-menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
-"
-menutrans Toggle\ &Toolbar				&Инструментальная\ панель
-menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
-menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
-menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
-">>>->>>------------- Edit/Global settings/Virtual edit
-menutrans Never						Выключено
-menutrans Block\ Selection				При\ выделении\ блока
-menutrans Insert\ Mode					В\ режиме\ Вставки
-menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
-menutrans Always					Включено\ всегда
-">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
-">>>---
-menutrans &Shiftwidth					Вели&чина\ отступа
-menutrans Soft\ &Tabstop				Ширина\ &табуляции
-menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
-menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
-"
-"
-"
-" Tools menu
-menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
-menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
-menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
-"-------------------
-menutrans &Folding					&Складки
-menutrans &Spelling					Пр&авописание
-menutrans &Diff						&Отличия\ (diff)
-"-------------------
-menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
-menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
-menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
-menutrans Error\ &Window				Ок&но\ ошибок
-menutrans Se&t\ Compiler				Выбор\ &компилятора
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
-"-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
-">>>---------------- Tools/Spelling
-menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
-menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
-menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
-"-------------------
-menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
-menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
-menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
-menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
-menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
-menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
-menutrans &Find\ More\ Languages			&Найти\ больше\ языков
-let g:menutrans_set_lang_to =				'Установить язык'
-"
-"
-" The Spelling popup menu
-"
-"
-let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
-let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
-let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
-">>>---------------- Folds
-menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
-menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
-menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
-menutrans Fold\ Met&hod					&Метод\ складок
-menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
-menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
-menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
-">>>->>>----------- Tools/Folds/Fold Method
-menutrans M&anual					Вру&чную
-menutrans I&ndent					О&тступ
-menutrans E&xpression					&Выражение
-menutrans S&yntax					&Синтаксис
-menutrans Ma&rker					&Маркеры
-">>>--------------- Tools/Diff
-menutrans &Update					О&бновить
-menutrans &Get\ Block					Изменить\ &этот\ буфер
-menutrans &Put\ Block					Изменить\ &другой\ буфер
-">>>--------------- Tools/Diff/Error window
-menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
-menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
-menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
-"
-"
-" Syntax menu
-"
-menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
-menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
-menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
-menutrans &Off						&Отключить
-menutrans &Manual					Вру&чную
-menutrans A&utomatic					&Автоматически
-menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
-menutrans Co&lor\ Test					Проверка\ &цветов
-menutrans &Highlight\ Test				Проверка\ под&светки
-menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
-"
-"
-" Buffers menu
-"
-menutrans &Refresh\ menu				О&бновить\ меню
-menutrans Delete					У&далить
-menutrans &Alternate					&Соседний
-menutrans &Next						С&ледующий
-menutrans &Previous					&Предыдущий
-menutrans [No\ File]					[Нет\ файла]
-"
-"
-" Window menu
-"
-menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
-menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
-menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
-"
-menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
-"
-menutrans Move\ &To					&Переместить
-menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
-"
-menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
-menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
-menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
-">>>----------------- Window/Move To
-menutrans &Top<Tab>^WK					В&верх<Tab>^WK
-menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
-menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
-"
-"
-" The popup menu
-"
-"
-menutrans &Undo						О&тменить
-menutrans Cu&t						&Вырезать
-menutrans &Copy						&Копировать
-menutrans &Paste					Вк&леить
-menutrans &Delete					&Удалить
-menutrans Select\ Blockwise				Блоковое\ выделение
-menutrans Select\ &Word					Выделить\ &слово
-menutrans Select\ &Sentence				Выделить\ &предложение
-menutrans Select\ Pa&ragraph				Выделить\ пара&граф
-menutrans Select\ &Line					Выделить\ ст&року
-menutrans Select\ &Block				Выделить\ &блок
-menutrans Select\ &All					Выделить\ &всё
-"
-" The GUI toolbar
-"
-if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open					Открыть файл
-    tmenu ToolBar.Save					Сохранить файл
-    tmenu ToolBar.SaveAll				Сохранить все файлы
-    tmenu ToolBar.Print					Напечатать
-    tmenu ToolBar.Undo					Отменить
-    tmenu ToolBar.Redo					Вернуть
-    tmenu ToolBar.Cut					Вырезать
-    tmenu ToolBar.Copy					Копировать
-    tmenu ToolBar.Paste					Вклеить
-    tmenu ToolBar.FindNext				Найти следующее
-    tmenu ToolBar.FindPrev				Найти предыдущее
-    tmenu ToolBar.Replace				Найти или заменить...
-    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
-    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
-    tmenu ToolBar.RunScript				Выполнить сценарий Vim
-    tmenu ToolBar.Make					Компиляция
-    tmenu ToolBar.Shell					Оболочка
-    tmenu ToolBar.RunCtags				Создать файл меток
-    tmenu ToolBar.TagJump				Перейти к метке
-    tmenu ToolBar.Help					Справка
-    tmenu ToolBar.FindHelp				Найти справку
-  endfun
-endif
-"
-"
-" Dialog texts
-"
-" Find in help dialog
-"
-let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
-"
-" Searh path dialog
-"
-let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
-"
-" Tag files dialog
-"
-let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
-"
-" Text width dialog
-"
-let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
-"
-" File format dialog
-"
-let g:menutrans_fileformat_dialog = "Выберите формат файла."
-let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
-"
-let menutrans_no_file = "[Нет файла]"
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+source <sfile>:p:h/menu_ru_ru.utf-8.vim
diff --git a/runtime/lang/menu_sk_sk.iso_8859-2.vim b/runtime/lang/menu_sk_sk.iso_8859-2.vim
index 02b3f0e15..c2ff90ab9 100644
--- a/runtime/lang/menu_sk_sk.iso_8859-2.vim
+++ b/runtime/lang/menu_sk_sk.iso_8859-2.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_sl_si.cp1250.vim b/runtime/lang/menu_sl_si.cp1250.vim
index 5b5482d38..16af3a7eb 100644
--- a/runtime/lang/menu_sl_si.cp1250.vim
+++ b/runtime/lang/menu_sl_si.cp1250.vim
@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prejšnji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angleški\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angleški\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angleški\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angleški\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angleški\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angleški\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nemški\ "de"
+    menutrans Set\ language\ to\ "en"			Èrkovalnik:\ angleški\ "en"
+    menutrans Set\ language\ to\ "en_au"		Èrkovalnik:\ angleški\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		Èrkovalnik:\ angleški\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		Èrkovalnik:\ angleški\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		Èrkovalnik:\ angleški\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		Èrkovalnik:\ angleški\ "en_us"
+    menutrans Set\ language\ to\ "sl"			Èrkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			Èrkovalnik:\ nemški\ "de"
     menutrans Set\ language\ to\ 			Èrkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogoèi/onemogoèi\ zvijanje<Tab>zi " Omogoèi/onemogoèi\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalèkom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalèkom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ veè\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ veè\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogoèi/onemogoèi\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ veè\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ veè\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Roèno
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/oznaèbami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			Širina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			Širina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Pošlji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR
diff --git a/runtime/lang/menu_sl_si.latin2.vim b/runtime/lang/menu_sl_si.latin2.vim
index cf4b10ba7..99f2aa16d 100644
--- a/runtime/lang/menu_sl_si.latin2.vim
+++ b/runtime/lang/menu_sl_si.latin2.vim
@@ -3,6 +3,7 @@
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 
diff --git a/runtime/lang/menu_sl_si.utf-8.vim b/runtime/lang/menu_sl_si.utf-8.vim
index ac5035c7f..e21913097 100644
--- a/runtime/lang/menu_sl_si.utf-8.vim
+++ b/runtime/lang/menu_sl_si.utf-8.vim
@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prejšnji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angleški\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angleški\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angleški\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angleški\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angleški\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angleški\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nemški\ "de"
+    menutrans Set\ language\ to\ "en"			Črkovalnik:\ angleški\ "en"
+    menutrans Set\ language\ to\ "en_au"		Črkovalnik:\ angleški\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		Črkovalnik:\ angleški\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		Črkovalnik:\ angleški\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		Črkovalnik:\ angleški\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		Črkovalnik:\ angleški\ "en_us"
+    menutrans Set\ language\ to\ "sl"			Črkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			Črkovalnik:\ nemški\ "de"
     menutrans Set\ language\ to\ 			Črkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zvijanje<Tab>zi " Omogoči/onemogoči\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalčkom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalčkom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ več\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ več\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ več\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ več\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Ročno
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/označbami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			Å irina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			Å irina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Pošlji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR
diff --git a/runtime/lang/menu_slovak_slovak_republic.1250.vim b/runtime/lang/menu_slovak_slovak_republic.1250.vim
index ce5e15cb3..965cc9174 100644
--- a/runtime/lang/menu_slovak_slovak_republic.1250.vim
+++ b/runtime/lang/menu_slovak_slovak_republic.1250.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_sr_rs.ascii.vim b/runtime/lang/menu_sr_rs.ascii.vim
index e5b66449e..f62fc826d 100644
--- a/runtime/lang/menu_sr_rs.ascii.vim
+++ b/runtime/lang/menu_sr_rs.ascii.vim
@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pesic on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -11,6 +12,8 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
+scriptencoding latin1
+
 " Help menu
 menutrans &Help		      Pomo&c
 menutrans &Overview<Tab><F1>  &Pregled<Tab><F1>
@@ -25,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Sacuvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Sacuvaj\ &kao\.\.\.<Tab>:sav
@@ -41,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Uredjivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Ponisti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&brisi<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -57,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Nadji\ i\ &zameni\.\.\.
 menutrans Settings\ &Window	 P&rozor\ podesavanja
 menutrans Startup\ &Settings	 Po&desavanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&sta\ podesavanja
-menutrans F&ile\ Settings	 Podesavanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Podesavanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvlacenja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &Sirina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prikazi\ seme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\Seme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prikazi\ pres&likavanja\ tastature\ u\ meniju
@@ -69,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &sablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ velicinu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ pratecu\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prikazi\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &uredjivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -86,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Rezim\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Rezim\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -107,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Skoci\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Skoci\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&brisi\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  Sirina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&brisi\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  Sirina\ &reda\ cvijutka
 "menutrans &Diff		      &Uporedjivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gresaka<Tab>:cl
@@ -144,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Pronadji\ jos\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Pokazi\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Pokazi\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Nacin\ podvijanja
-menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Rucno
@@ -179,7 +182,7 @@ menutrans Delete	   &Obrisi
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Sledeci
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -187,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Sledeci<Tab>^Ww
@@ -208,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Ponisti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -216,7 +219,7 @@ menutrans &Delete	      I&zbrisi
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &rec
 menutrans Select\ &Sentence       Izaberi\ r&ecenicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -262,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &takodje\ i\ 'filetype'
 menutrans &Off       &Iskljuceno
 menutrans &Manual    &Rucno
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -276,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili rec cije pojasnjenje trazite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog rezima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu sirinu teksta (0 sprecava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otkazi"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/runtime/lang/menu_sr_rs.iso_8859-2.vim b/runtime/lang/menu_sr_rs.iso_8859-2.vim
index e7e0db58e..9b1d93346 100644
--- a/runtime/lang/menu_sr_rs.iso_8859-2.vim
+++ b/runtime/lang/menu_sr_rs.iso_8859-2.vim
@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pe¹iæ on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Saèuvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Saèuvaj\ &kao\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Ureðivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Poni¹ti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&bri¹i<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Na
 menutrans Settings\ &Window	 P&rozor\ pode¹avanja
 menutrans Startup\ &Settings	 Po&de¹avanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&¹ta\ pode¹avanja
-menutrans F&ile\ Settings	 Pode¹avanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Pode¹avanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvlaèenja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &©irina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prika¾i\ ¹eme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\©eme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prika¾i\ pres&likavanja\ tastature\ u\ meniju
@@ -71,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &¹ablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ velièinu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ prateæu\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prika¾i\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &ureðivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re¾im\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re¾im\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Re¾im\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Re¾im\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Skoèi\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Skoèi\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&bri¹i\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obri¹i\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  ©irina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&bri¹i\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obri¹i\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  ©irina\ &reda\ cvijutka
 "menutrans &Diff		      &Uporeðivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gre¹aka<Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Pronaði\ jo¹\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omoguæi/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omoguæi/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Poka¾i\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Poka¾i\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi¹e\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi¹&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi¹e\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi¹&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Naèin\ podvijanja
-menutrans Fold\ Col&umn\ Width	©irina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	©irina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Ruèno
@@ -181,7 +182,7 @@ menutrans Delete	   &Obri
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Sledeæi
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Sledeæi<Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Poni¹ti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -218,7 +219,7 @@ menutrans &Delete	      I&zbri
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &reè
 menutrans Select\ &Sentence       Izaberi\ r&eèenicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prika¾i\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prika¾i\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &takoðe\ i\ 'filetype'
 menutrans &Off       &Iskljuèeno
 menutrans &Manual    &Ruèno
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili reè èije poja¹njenje tra¾ite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog re¾ima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu ¹irinu teksta (0 spreèava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otka¾i"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/runtime/lang/menu_sr_rs.iso_8859-5.vim b/runtime/lang/menu_sr_rs.iso_8859-5.vim
index f2b1ee37a..536dd27a8 100644
--- a/runtime/lang/menu_sr_rs.iso_8859-5.vim
+++ b/runtime/lang/menu_sr_rs.iso_8859-5.vim
@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: ¸ÒÐÝ ¿ÕèØû on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &
 menutrans &About	      &¾\ ßàÞÓàÐÜã
 
 " File menu
-menutrans &File			    &´ÐâÞâÕÚÐ
+menutrans &File			    &ÄÐøÛ
 menutrans &Open\.\.\.<Tab>:e	    &¾âÒÞàØ\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &¿ÞÔÕÛØ-ÞâÒÞàØ\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	¾âÒÞàØ\ ÚÐàâØæã\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &½ÞÒÐ<Tab>:enew
+menutrans &New<Tab>:enew	    &½ÞÒ<Tab>:enew
 menutrans &Close<Tab>:close	    &·ÐâÒÞàØ<Tab>:close
 menutrans &Save<Tab>:w		    &ÁÐçãÒÐø<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  ÁÐçãÒÐø\ &ÚÐÞ\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa		    
 
 " Edit menu
 menutrans &Edit			 &ÃàÕòØÒÐúÕ
-menutrans &Undo<Tab>u		 &²àÐâØ<Tab>u
-menutrans &Redo<Tab>^R		 &¿ÞÒàÐâØ<Tab>^R
+menutrans &Undo<Tab>u		 &¿ÞÝØèâØ<Tab>u
+menutrans &Redo<Tab>^R		 &²àÐâØ\ Ø×ÜÕÝã<Tab>^R
 menutrans Rep&eat<Tab>\.	 ¿&ÞÝÞÒØ<Tab>\.
 menutrans Cu&t<Tab>"+x		 ¸áÕ&æØ<Tab>"+x
 menutrans &Copy<Tab>"+y		 &ºÞßØàÐø<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &ÃÑÐæØ<Tab>"+gP
-menutrans &Paste<Tab>"+P	&ÃÑÐæØ<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 ÁâÐÒØ\ ßàÕ&Ô<Tab>[p
+menutrans &Paste<Tab>"+P	&ÃÑÐæØ<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 ÁâÐÒØ\ ØáßàÕ&Ô<Tab>[p
 menutrans Put\ &After<Tab>]p	 ÁâÐÒØ\ &Ø×Ð<Tab>]p
 menutrans &Delete<Tab>x		 ¸×&ÑàØèØ<Tab>x
 menutrans &Select\ all<Tab>ggVG  ¸×ÐÑÕàØ\ áÒ&Õ<Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. 
 menutrans Settings\ &Window	 ¿&àÞ×Þà\ ßÞÔÕèÐÒÐúÐ
 menutrans Startup\ &Settings	 ¿Þ&ÔÕèÐÒÐúÐ\ ßàØ\ ßÞÚàÕâÐúã		
 menutrans &Global\ Settings	 ¾ß&èâÐ\ ßÞÔÕèÐÒÐúÐ
-menutrans F&ile\ Settings	 ¿ÞÔÕèÐÒÐúÐ\ ×Ð\ ÔÐ&âÞâÕÚÕ
-menutrans &Shiftwidth		 &¿ÞÜÕàÐø
+menutrans F&ile\ Settings	 ¿ÞÔÕèÐÒÐúÐ\ ×Ð\ äÐø&ÛÞÒÕ
+menutrans &Shiftwidth		 &ºÞàÐÚ\ ãÒÛÐçÕúÐ
 menutrans Soft\ &Tabstop	 &¼ÕÚÐ\ âÐÑãÛÐæØøÐ
 menutrans Te&xt\ Width\.\.\.	 &ÈØàØÝÐ\ âÕÚáâÐ\.\.\.
-menutrans &File\ Format\.\.\.	 &²àáâÐ\ ÔÐâÞâÕÚÕ\.\.\.
+menutrans &File\ Format\.\.\.	 &²àáâÐ\ äÐøÛÐ\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	¿àØÚÐÖØ\ èÕÜÕ\ ÑÞ&øÐ\ ã\ ÜÕÝØøã
 menutrans C&olor\ Scheme	\ÈÕÜÕ\ ÑÞ&øÐ
 menutrans Show\ &Keymaps\ in\ Menu	¿àØÚÐÖØ\ ßàÕá&ÛØÚÐÒÐúÐ\ âÐáâÐâãàÕ\ ã\ ÜÕÝØøã
@@ -71,15 +72,15 @@ menutrans &Keymap	
 menutrans Select\ Fo&nt\.\.\.	 ¸×ÑÞà\ &äÞÝâÐ\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ½ÐÓÛÐáØ\ &ÞÑàÐ×æÕ\ (ÔÐ/ÝÕ)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¸áâØæÐúÕ\ &èÐÑÛÞÝÐ\ (ÔÐ/ÝÕ)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! ·ÐÝÕÜÐàØ\ ÒÕÛØçØÝã\ &áÛÞÒÐ\ (ÔÐ/ÝÕ)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! ¿àÞÒÕàØ\ ßàÐâÕûã\ &×ÐÓàÐÔã\ (ÔÐ/ÝÕ)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! ¿àØÚÐÖØ\ ãßÐàÕÝã\ &×ÐÓàÐÔã\ (ÔÐ/ÝÕ)<Tab>:set\ sm!
 menutrans &Context\ lines  ²ØÔùØÒØ\ &àÕÔÞÒØ
 menutrans &Virtual\ Edit   ²ØàâãÕÛÝÞ\ &ãàÕòØÒÐúÕ
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   ÀÕÖØÜ\ ã&ÝÞáÐ\ (ÔÐ/ÝÕ)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   ÀÕÖØÜ\ Ã&ÜÕâÐúÕ\ (ÔÐ/ÝÕ)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ áÐÓÛÐáÝÞ\ (ÔÐ/ÝÕ)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. ¿ãâÐúÐ\ &ßàÕâàÐÓÕ\.\.\.
-menutrans Ta&g\ Files\.\.\.   &´ÐâÞâÕÚÕ\ Þ×ÝÐÚÐ\.\.\.
+menutrans Ta&g\ Files\.\.\.   &ÄÐøÛÞÒØ\ Þ×ÝÐÚÐ\.\.\.
 menutrans Toggle\ &Toolbar    »ØÝØøÐ\ áÐ\ &ÐÛÐâÚÐÜÐ\ (ÔÐ/ÝÕ)
 menutrans Toggle\ &Bottom\ Scrollbar   ´ÞúÐ\ Û&ØÝØøÐ\ ÚÛØ×ÐúÐ\ (ÔÐ/ÝÕ)
 menutrans Toggle\ &Left\ Scrollbar  &»ÕÒÐ\ ÛØÝØøÐ\ ÚÛØ×ÐúÐ\ (ÔÐ/ÝÕ)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      ½ØÚÐÔ
 menutrans Block\ Selection    ¸×ÑÞà\ ÑÛÞÚÐ
-menutrans Insert\ mode	      ÀÕÖØÜ\ ãÝÞáÐ
-menutrans Block\ and\ Insert  ±ÛÞÚ\ Ø\ ãÝÞá
+menutrans Insert\ mode	      ÀÕÖØÜ\ ÃÜÕâÐúÕ
+menutrans Block\ and\ Insert  ±ÛÞÚ\ Ø\ ÃÜÕâÐúÕ
 menutrans Always	      ÃÒÕÚ
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None 
 menutrans &Tools	&°ÛÐâÚÕ
 menutrans &Jump\ to\ this\ tag<Tab>g^] ÁÚÞçØ\ ÝÐ\ &ÞÒã\ Þ×ÝÐÚã<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 ÁÚÞçØ\ &ÝÐâàÐÓ<Tab>^T
-menutrans Build\ &Tags\ File	 ¸×ÓàÐÔØ\ &ÔÐâÞâÕÚã\ Þ×ÝÐÚÐ
+menutrans Build\ &Tags\ File	 ¸×ÓàÐÔØ\ &äÐøÛ\ Þ×ÝÐÚÐ
 menutrans &Spelling	 ¿àÐ&ÒÞßØá
 menutrans &Folding	      &¿ÞÔÒØøÐúÕ
-menutrans Create\ &Fold<Tab>zf		  Á&âÒÞàØ\ ßÞÔÒØøãâÐÚ<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  ¾&ÑàØèØ\ ßÞÔÒØøãâÐÚ<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  ¾ÑàØèØ\ áÒÕ\ ßÞ&ÔÒØøãâÚÕ<Tab>zD
-menutrans Fold\ column\ &width		  ÈØàØÝÐ\ &àÕÔÐ\ ßÞÔÒØøãâÚÐ
+menutrans Create\ &Fold<Tab>zf		  Á&âÒÞàØ\ áÒØøãâÐÚ<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  ¾&ÑàØèØ\ áÒØøãâÐÚ<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  ¾ÑàØèØ\ áÒÕ\ áÒ&ØøãâÚÕ<Tab>zD
+menutrans Fold\ column\ &width		  ÈØàØÝÐ\ &àÕÔÐ\ æÒØøãâÚÐ
 "menutrans &Diff		      &ÃßÞàÕòØÒÐúÕ
 menutrans &Make<Tab>:make     'mak&Õ'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     ÁßØáÐÚ\ &ÓàÕèÐÚÐ<Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	
 menutrans &Find\ More\ Languages	¿àÞÝÐòØ\ øÞè\ øÕ×ØÚÐ 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &¾ÜÞÓãûØ/ßàÕÚØÝØ\ ßÞÔÒØøÐúÕ<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &¾ÜÞÓãûØ/ßàÕÚØÝØ\ áÒØøÐúÕ<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &¿ÞÚÐÖØ\ àÕÔ\ áÐ\ ÚãàáÞàÞÜ<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx ¿ÞÚÐÖØ\ &áÐÜÞ\ àÕÔ\ áÐ\ ÚãàáÞàÞÜ<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &·ÐâÒÞàØ\ ÒØèÕ\ ßÞÔÒØøãâÐÚÐ<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    ·ÐâÒÞàØ\ á&ÒÕ\ ßÞÔÒØøãâÚÕ<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    ¾âÒÞàØ\ ÒØè&Õ\ ßÞÔÒØøãâÐÚÐ<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     ¾&âÒÞàØ\ áÒÕ\ ßÞÔÒØøãâÚÕ<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &·ÐâÒÞàØ\ ÒØèÕ\ áÒØøãâÐÚÐ<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    ·ÐâÒÞàØ\ á&ÒÕ\ áÒØøãâÚÕ<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    ¾âÒÞàØ\ ÒØè&Õ\ áÒØøãâÐÚÐ<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     ¾&âÒÞàØ\ áÒÕ\ áÒØøãâÚÕ<Tab>zR
 menutrans Fold\ Met&hod		       &½ÐçØÝ\ ßÞÔÒØøÐúÐ
-menutrans Fold\ Col&umn\ Width	ÈØàØÝÐ\ ÚÞÛÞÝÕ\ ØáßàÕÔ\ ßÞÔÒØøãâÐÚÐ
+menutrans Fold\ Col&umn\ Width	ÈØàØÝÐ\ ÚÞÛÞÝÕ\ ØáßàÕÔ\ áÒØøãâÐÚÐ
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&ÀãçÝÞ
@@ -181,7 +182,7 @@ menutrans Delete	   &
 menutrans &Alternate	   °&ÛâÕàÝÐâØÒÝØ
 menutrans &Next		   &ÁÛÕÔÕûØ
 menutrans &Previous	   &¿àÕâåÞÔÝØ
-menutrans [No\ File]	   [½ÕÜÐ\ ÔÐâÞâÕÚÕ]
+menutrans [No\ File]	   [½ÕÜÐ\ äÐøÛÐ]
 
 " Window menu
 menutrans &Window		    &¿àÞ×Þà
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &
 menutrans S&plit<Tab>^Ws	    &¿ÞÔÕÛØ<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    ¿ÞÔÕÛØ\ áÐ\ &ÐÛâÕàÝÐâØÒÝØÜ<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   ¿ÞÔÕÛØ\ &ãáßàÐÒÝÞ<Tab>^Wv
-menutrans Split\ File\ E&xplorer    ¿ÞÔÕÛØ\ ×Ð\ ßàÕÓÛÕÔ\ &ÔÐâÞâÕÚÐ
+menutrans Split\ File\ E&xplorer    ¿ÞÔÕÛØ\ ×Ð\ ßàÕÓÛÕÔ\ &äÐøÛÞÒÐ
 menutrans &Close<Tab>^Wc	    &·ÐâÒÞàØ<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  ·ÐâÒÞàØ\ &ÞáâÐÛÕ<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &ÁÛÕÔÕûØ<Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 
 menutrans &Right\ side<Tab>^WL	 Ã&ÔÕáÝÞ<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &²àÐâØ
+menutrans &Undo		      &¿ÞÝØèâØ
 menutrans Cu&t		      &¸áÕæØ
 menutrans &Copy		      &ºÞßØàÐø
 menutrans &Paste	      &ÃÑÐæØ
@@ -218,7 +219,7 @@ menutrans &Delete	      
 menutrans Select\ Blockwise   ±ØàÐø\ Ñ&ÛÞÚÞÒáÚØ
 menutrans Select\ &Word       ¸×ÐÑÕàØ\ &àÕç
 menutrans Select\ &Sentence       ¸×ÐÑÕàØ\ à&ÕçÕÝØæã
-menutrans Select\ Pa&ragraph       ¸×ÐÑÕàØ\ &ßÐàÐÓàÐä
+menutrans Select\ Pa&ragraph       ¸×ÐÑÕàØ\ &ßÐáãá
 menutrans Select\ &Line       ¸×ÐÑÕàØ\ à&ÕÔ
 menutrans Select\ &Block      ¸×ÐÑÕàØ\ &ÑÛÞÚ
 menutrans Select\ &All	      ¸×ÐÑÕàØ\ &áÒÕ
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &ÁØÝâÐÚáÐ
-menutrans &Show\ File\ Types\ in\ Menu  ¿àØÚÐÖØ\ âØßÞÒÕ\ ÔÐâÞâÕÚÐ\ ã\ &ÜÕÝØøã
+menutrans &Show\ File\ Types\ in\ Menu  ¿àØÚÐÖØ\ âØßÞÒÕ\ äÐøÛÞÒÐ\ ã\ &ÜÕÝØøã
 menutrans Set\ '&syntax'\ only   ¿ÞÔÕ&áØ\ áÐÜÞ\ 'syntax' 
 menutrans Set\ '&filetype'\ too  ¿ÞÔÕáØ\ &âÐÚÞòÕ\ Ø\ 'filetype'
 menutrans &Off       &¸áÚùãçÕÝÞ
 menutrans &Manual    &ÀãçÝÞ
 menutrans A&utomatic    &°ãâÞÜÐâáÚØ
-menutrans on/off\ for\ &This\ file     ´Ð/ÝÕ\ ×Ð\ ÞÒã\ &ÔÐâÞâÕÚã
+menutrans on/off\ for\ &This\ file     ´Ð/ÝÕ\ ×Ð\ ÞÒÐø\ &äÐøÛ
 menutrans Co&lor\ test     ¿àÞÒÕàÐ\ &ÑÞøÐ
 menutrans &Highlight\ test ¿àÞÒÕàÐ\ ØáâØ&æÐúÐ
 menutrans &Convert\ to\ HTML  ¿àÕâÒÞàØ\ &ã\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML  
 " dialog texts
 let menutrans_help_dialog = "ÃÝÕáØâÕ ÝÐàÕÔÑã ØÛØ àÕç çØøÕ ßÞøÐèúÕúÕ âàÐÖØâÕ:\n\n´ÞÔÐøâÕ i_ ×Ð ÝÐàÕÔÑÕ ãÝÞáÐ (Ýßà. i_CTRL-X)\n´ÞÔÐøâÕ c_ ×Ð ÝÐàÕÔÑÕ ÚÞÜÐÝÔÝÞÓ àÕÖØÜÐ (Ýßà. á_<Del>)\n´ÞÔÐøâÕ ' ×Ð ØÜÕÝÐ ÞßæØøÐ (Ýßà. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "ÃÝÕáØâÕ ßãâ ßàÕâàÐÓÕ ×Ð ÔÐâÞâÕÚÕ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ ÔØàÕÚâÞàØøãÜÐ."
+let g:menutrans_path_dialog = "ÃÝÕáØâÕ ßãâÐúã ßàÕâàÐÓÕ ×Ð äÐøÛÞÒÕ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ ÔØàÕÚâÞàØøãÜÐ."
 
-let g:menutrans_tags_dialog = "ÃÝÕáØâÕ ØÜÕÝÐ ÔÐâÞâÕÚÐ áÐ Þ×ÝÐÚÐÜÐ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ."
+let g:menutrans_tags_dialog = "ÃÝÕáØâÕ ØÜÕÝÐ äÐøÛÞÒÐ áÐ Þ×ÝÐÚÐÜÐ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ."
 
 let g:menutrans_textwidth_dialog = "ÃÝÕáØâÕ ÝÞÒã èØàØÝã âÕÚáâÐ (0 áßàÕçÐÒÐ ßàÕÛÞÜ)"
 
-let g:menutrans_fileformat_dialog = "¸×ÐÑÕàØâÕ äÞàÜÐâ ×ÐßØáÐ ÔÐâÞâÕÚÕ"
+let g:menutrans_fileformat_dialog = "¸×ÐÑÕàØâÕ äÞàÜÐâ ×ÐßØáÐ äÐøÛÐ"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&¾âÚÐÖØ"
 
-let menutrans_no_file = "[½ÕÜÐ ÔÐâÞâÕÚÕ]"
+let menutrans_no_file = "[½ÕÜÐ äÐøÛÐ]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/runtime/lang/menu_sr_rs.utf-8.vim b/runtime/lang/menu_sr_rs.utf-8.vim
index 7f4c89911..3d89168c3 100644
--- a/runtime/lang/menu_sr_rs.utf-8.vim
+++ b/runtime/lang/menu_sr_rs.utf-8.vim
@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Иван Пешић on 2017-12-28 12:05+0400
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_sv_se.latin1.vim b/runtime/lang/menu_sv_se.latin1.vim
index 53e1f4079..b10cfd33d 100644
--- a/runtime/lang/menu_sv_se.latin1.vim
+++ b/runtime/lang/menu_sv_se.latin1.vim
@@ -1,6 +1,7 @@
 " Menu Translations:    Swedish
 " Maintainer:		Johan Svedberg <johan@svedberg.com>
 " Last Change:		2020 Apr 22
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/runtime/lang/menu_tr_tr.cp1254.vim b/runtime/lang/menu_tr_tr.cp1254.vim
index d1c3d973f..db575c288 100644
--- a/runtime/lang/menu_tr_tr.cp1254.vim
+++ b/runtime/lang/menu_tr_tr.cp1254.vim
@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish
diff --git a/runtime/lang/menu_tr_tr.iso_8859-9.vim b/runtime/lang/menu_tr_tr.iso_8859-9.vim
index 0065bc523..9cfe4f044 100644
--- a/runtime/lang/menu_tr_tr.iso_8859-9.vim
+++ b/runtime/lang/menu_tr_tr.iso_8859-9.vim
@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish
@@ -8,7 +9,7 @@ endif
 let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
-scriptencoding iso-8859-9
+scriptencoding iso8859-9
 
 " Top
 menutrans &File	&Dosya
diff --git a/runtime/lang/menu_tr_tr.utf-8.vim b/runtime/lang/menu_tr_tr.utf-8.vim
index 02a095643..ef0f29070 100644
--- a/runtime/lang/menu_tr_tr.utf-8.vim
+++ b/runtime/lang/menu_tr_tr.utf-8.vim
@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Original translations
 
 if exists("did_menu_trans")
    finish
diff --git a/runtime/lang/menu_uk_ua.cp1251.vim b/runtime/lang/menu_uk_ua.cp1251.vim
index 2e751c888..d6729344c 100644
--- a/runtime/lang/menu_uk_ua.cp1251.vim
+++ b/runtime/lang/menu_uk_ua.cp1251.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Ukrainian
 " Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Last Change:		11 Oct 2001
+" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT
 
 "
 " Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any
diff --git a/runtime/lang/menu_uk_ua.koi8-u.vim b/runtime/lang/menu_uk_ua.koi8-u.vim
index c44700eff..107be9be0 100644
--- a/runtime/lang/menu_uk_ua.koi8-u.vim
+++ b/runtime/lang/menu_uk_ua.koi8-u.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Ukrainian
 " Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Last Change:		11 Oct 2001
+" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT
 
 "
 " Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any
diff --git a/runtime/lang/menu_uk_ua.utf-8.vim b/runtime/lang/menu_uk_ua.utf-8.vim
new file mode 100644
index 000000000..c34e551c7
--- /dev/null
+++ b/runtime/lang/menu_uk_ua.utf-8.vim
@@ -0,0 +1,252 @@
+" Menu Translations:	Ukrainian
+" Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+" Last Change:		11 Oct 2001
+" Original translations
+
+"
+" Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any
+" complains, and even if you won't complain, read it anyway.
+"
+
+" Quit when menu translations have already been done.
+if exists("did_menu_trans")
+  finish
+endif
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+scriptencoding utf-8
+
+" Help menu
+menutrans &Help			&Допомога
+menutrans &Overview<Tab><F1>	&Загальна\ Інформація<Tab><F1>
+menutrans &User\ Manual		&Керівництво\ для\ користувача
+menutrans &How-to\ links	&Як-Зробити?
+"menutrans &GUI			&GIU
+menutrans &Credits		&Подяки
+menutrans Co&pying		&Розповсюдження
+menutrans O&rphans		&Допомога\ сиротам
+menutrans &Version		&Версія
+menutrans &About		Про\ &програму
+
+" File menu
+menutrans &File				&Файл
+menutrans &Open\.\.\.<Tab>:e	    &Відкрити\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp &Розділити\ вікно\.\.\.<Tab>:sp
+menutrans &New<Tab>:enew	    &Новий<Tab>:enew
+menutrans &Close<Tab>:close	    &Закрити<Tab>:close
+menutrans &Save<Tab>:w		    За&пам'ятати<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Запам'ятати\ &як\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ with\.\.\.	По&рівняти\ з\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	За&латати\.\.\.
+menutrans &Print					&Друкувати
+menutrans Sa&ve-Exit<Tab>:wqa		Записати\ і\ ви&йти<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Вихід<Tab>:qa
+
+" Edit menu
+menutrans &Edit				&Редагувати
+menutrans &Undo<Tab>u			&Відмінити<Tab>u
+menutrans &Redo<Tab>^R			&Повернути<Tab>^R
+menutrans Rep&eat<Tab>\.		П&овторити<Tab>\.
+menutrans Cu&t<Tab>"+x			Ви&різати<Tab>"+x
+menutrans &Copy<Tab>"+y			&Копіювати<Tab>"+y
+menutrans &Paste<Tab>"+gP		В&ставити<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Вставити\ попе&реду<Tab>[p
+menutrans Put\ &After<Tab>]p		Вставити\ п&ісля<Tab>]p
+menutrans &Select\ all<Tab>ggVG		Ви&брати\ усе<Tab>ggVG
+menutrans &Find\.\.\.			&Знайти\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.	За&мінити\.\.\.
+menutrans Settings\ &Window		Вікно\ &налаштувань
+menutrans &Global\ Settings		Загальні\ на&лаштування
+menutrans F&ile\ Settings		Налаштування\ для\ &файлу
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерація\ рядків<Tab>:set\ nu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Режим\ на&длишкового\ відображення<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		Режим\ &переносу<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	Переносити\ усе\ &слово<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!			Користуватися\ символом\ &табуляції<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		Автоматичний\ &відступ<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!		Відступи\ для\ мови\ &C<Tab>:set\ cin!
+menutrans &Shiftwidth								&Зсув
+menutrans Te&xt\ Width\.\.\.						&Ширина\ тексту\.\.\.
+menutrans &File\ Format\.\.\.			&Формат\ файлу\.\.\.
+menutrans Soft\ &Tabstop				Позиція\ &табуляції
+menutrans C&olor\ Scheme		&Кольори
+menutrans Select\ Fo&nt\.\.\.		Вибрати\ &шрифт\.\.\.
+
+
+menutrans &Keymap			Режим\ клавіатури
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Виділяти\ &зразок<Tab>:set\ hls!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		&Розрізняти\ \великі\ та\ малі\ літери<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		&Негайний\ пошук<Tab>:set\ sm!
+menutrans &Context\ lines	Кількість\ &важливих\ рядків
+menutrans &Virtual\ Edit	Курсор\ &рухається\ без\ меж
+
+menutrans Never			Ніколи
+menutrans Block\ Selection	Вибір\ Блоку
+menutrans Insert\ mode		Режим\ вставки
+menutrans Block\ and\ Insert	Вибір\ і\ вставка
+menutrans Always		Завжди
+
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	Режим\ &вставки<Tab>:set\ im!
+menutrans Search\ &Path\.\.\.	&Шлях\ пошуку\.\.\.
+menutrans Ta&g\ Files\.\.\.	Файли\ &поміток\.\.\.
+
+
+"
+" GUI options
+menutrans Toggle\ &Toolbar		Панель\ &інструментів
+menutrans Toggle\ &Bottom\ Scrollbar	&Нижня\ лінійка\ зсуву
+menutrans Toggle\ &Left\ Scrollbar	&Ліва\ лінійка\ зсуву
+menutrans Toggle\ &Right\ Scrollbar	&Права\ лінійка\ зсуву
+
+" Programming menu
+menutrans &Tools			&Інструменти
+menutrans &Jump\ to\ this\ tag<Tab>g^]	&Перейти\ до\ помітки<Tab>g^]
+menutrans Jump\ &back<Tab>^T		По&вернутися<Tab>^T
+menutrans Build\ &Tags\ File		&Створити\ файл\ поміток
+" Folding
+menutrans &Folding				&Згортки
+menutrans &Enable/Disable\ folds<Tab>zi		&Дозволити/заборонити\ згортки<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			&Бачити\ рядок\ з\ курсором<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx			Бачити\ &лише\ рядок\ з\ курсором<Tab>zMzx
+menutrans C&lose\ more\ folds<Tab>zm				Закрити\ &більше\ згортків<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM				Закрити\ &усі\ згортки<Tab>zM
+menutrans &Open\ all\ folds<Tab>zR				Відкрити\ у&сі\ згортки<Tab>zR
+menutrans O&pen\ more\ folds<Tab>zr				Відкрити\ б&ільше\ згортків<Tab>zr
+
+menutrans Create\ &Fold<Tab>zf				С&творити\ згорток<Tab>zf
+menutrans &Delete\ Fold<Tab>zd				&Видалити\ згорток<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD		Видалит&и\ усі\ згортки<Tab>zD
+menutrans Fold\ column\ &width				&Товщина\ рядка\ згортків
+menutrans Fold\ Met&hod		&Метод\ згортання
+menutrans M&anual			&Ручний
+menutrans I&ndent			&Відступ
+menutrans E&xpression       В&ираз
+menutrans S&yntax			&Синтаксично
+menutrans Ma&rker			По&значки
+
+" Diff
+menutrans &Diff					По&рівняння
+menutrans &Update				&Поновити
+menutrans &Get\ Block			&Запозичити\ різницю
+menutrans &Put\ Block			&Впровадити\ різницю
+
+" Make and stuff...
+menutrans &Make<Tab>:make		&Будувати(make)<Tab>:make
+menutrans &List\ Errors<Tab>:cl		&Список\ помилок<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!	Сп&исок\ повідомлень<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn		&Наступна\ помилка<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp	&Попередня\ помилка<Tab>:cp
+menutrans &Older\ List<Tab>:cold	&Бувші\ помилки<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew	&Майбутні\ помилки<Tab>:cnew
+menutrans Error\ &Window	    &Вікно\ помилок
+menutrans &Update<Tab>:cwin			&Поновити<Tab>:cwin
+menutrans &Close<Tab>:cclose		&Закрити<Tab>:cclose
+menutrans &Open<Tab>:copen			&Відкрити<Tab>:copen
+
+menutrans &Set\ Compiler				Встановити\ &компілятор
+menutrans &Convert\ to\ HEX<Tab>:%!xxd     Перевести\ в\ шістнадцяткові\ коди<Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r     Повернути\ в\ двійкову\ форму<Tab>:%!xxd\ -r
+
+" Names for buffer menu.
+menutrans &Buffers	&Буфери
+menutrans &Refresh\ menu &Поновити
+menutrans Delete	&Видалити
+menutrans &Alternate	&Вторинний
+menutrans &Next		&Слідуючий
+menutrans &Previous	&Попередній
+menutrans [No\ File]	[Немає\ Файла]
+
+" Window menu
+menutrans &Window			&Вікно
+menutrans &New<Tab>^Wn			&Нове<Tab>^Wn
+menutrans S&plit<Tab>^Ws		&Розділити<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^	Розділити\ для\ &вторинного\ файлу<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	Розділити\ &поперек<Tab>^Wv
+"menutrans Split\ &Vertically<Tab>^Wv	&Розділити\ поперек<Tab>^Wv
+menutrans Split\ File\ E&xplorer		Розділити\ для\ &перегляду\ файлів
+
+menutrans &Close<Tab>^Wc		&Закрити<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Закрити\ усі\ &інші<Tab>^Wo
+menutrans Ne&xt<Tab>^Ww			&Наступне<Tab>^Ww
+menutrans P&revious<Tab>^WW		&Попереднє<Tab>^WW
+menutrans &Equal\ Size<Tab>^W=		&Вирівняти\ розмір<Tab>^W=
+menutrans &Max\ Height<Tab>^W_		Най&більша\ висота<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_		Най&менша\ висота<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|		Найбі&льша\ ширина<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|		Наймен&ша\ ширина<Tab>^W1\|
+menutrans Move\ &To			&Змістити
+menutrans &Top<Tab>^WK			До&гори<Tab>^WK
+menutrans &Bottom<Tab>^WJ		До&низу<Tab>^WJ
+menutrans &Left\ side<Tab>^WH		У&ліво<Tab>^WH
+menutrans &Right\ side<Tab>^WL		В&право<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR		&Циклічно\ догори<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr		Ц&иклічно\ униз<Tab>^Wr
+
+" The popup menu
+menutrans &Undo			&Відмінити
+menutrans Cu&t			Ви&різати
+menutrans &Copy			&Копіювати
+menutrans &Paste		В&ставити
+menutrans &Delete		Ви&далити
+menutrans Select\ &Word		Вибрати\ &слово
+menutrans Select\ &Line		Вибрати\ &рядок
+menutrans Select\ &Block	Вибрати\ &блок
+menutrans Select\ &All		Вибрати\ &усе
+
+
+
+" The GUI toolbar
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open		Відкрити файл
+    tmenu ToolBar.Save		Запам'ятати файл
+    tmenu ToolBar.SaveAll		Запам'ятати усі файли
+    tmenu ToolBar.Print		Друкувати
+    tmenu ToolBar.Undo		Відмінити
+    tmenu ToolBar.Redo		Повернути
+    tmenu ToolBar.Cut		Вирізати
+    tmenu ToolBar.Copy		Копіювати
+    tmenu ToolBar.Paste		Вставити
+    tmenu ToolBar.Find		Знайти...
+    tmenu ToolBar.FindNext	Знайти наступний
+    tmenu ToolBar.FindPrev	Знайти попередній
+    tmenu ToolBar.Replace	Замінити...
+    tmenu ToolBar.LoadSesn	Завантажити сеанс редагування
+    tmenu ToolBar.SaveSesn	Запам'ятати сеанс редагування
+    tmenu ToolBar.RunScript	Виконати файл команд
+    tmenu ToolBar.Make		Збудувати проект
+    tmenu ToolBar.Shell		Shell
+    tmenu ToolBar.RunCtags	Створити файл поміток
+    tmenu ToolBar.TagJump	Перейти до помітки
+    tmenu ToolBar.Help		Допомога
+    tmenu ToolBar.FindHelp	Пошук у допомозі
+  endfun
+endif
+
+" Syntax menu
+menutrans &Syntax &Синтаксис
+menutrans Set\ '&syntax'\ only	Встановлювати\ лише\ '&syntax'
+menutrans Set\ '&filetype'\ too	Встановлювати\ '&filetype'\ також
+menutrans &Off			&Вимкнено
+menutrans &Manual		&Ручний
+menutrans A&utomatic		&Автоматично
+menutrans on/off\ for\ &This\ file		Перемкнути\ для\ цього\ &файла
+menutrans Co&lor\ test		Перевірка\ &кольорів
+menutrans &Highlight\ test	&Перевірка\ виділення
+menutrans &Convert\ to\ HTML	Створити\ &HTML
+
+" dialog texts
+let menutrans_no_file = "[Немає\ Файла]"
+let menutrans_help_dialog = "Вкажіть команду або слово для пошуку:\n\nДодайте i_ для команд режиму вставки (напр. i_CTRL-X)\nДодайте i_ для командного режиму (напр. с_<Del>)\nДодайте ' для позначення назви опції (напр. 'shiftwidth')"
+let g:menutrans_path_dialog = "Вкажіть шлях пошуку файлів\nРозділяйте назви директорій комами."
+let g:menutrans_tags_dialog = "Вкажіть назви файлів поміток\nРозділяйте назви комами."
+let g:menutrans_textwidth_dialog = "Вкажіть нову ширину тексту (0 для відміни фоматування)"
+let g:menutrans_fileformat_dialog = "Виберіть формат файлу"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/lang/menu_vi_vn.vim b/runtime/lang/menu_vi_vn.vim
index 563ffa248..cc108d2b5 100644
--- a/runtime/lang/menu_vi_vn.vim
+++ b/runtime/lang/menu_vi_vn.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Vietnamese
 " Maintainer:		Phan Vinh Thinh <teppi@vnlinux.org>
 " Last Change:		12 Mar 2005
+" Original translations
 " URL:			http://iatp.vspu.ac.ru/phan/vietvim/lang/menu_vi_vn.vim
 "
 "
diff --git a/runtime/lang/menu_zh_cn.utf-8.vim b/runtime/lang/menu_zh_cn.utf-8.vim
index f7b086d27..f9881f54d 100644
--- a/runtime/lang/menu_zh_cn.utf-8.vim
+++ b/runtime/lang/menu_zh_cn.utf-8.vim
@@ -1,7 +1,8 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2020 Apr 23
+" Last Change:          2022 Feb 19
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -435,8 +436,8 @@ menutrans Set\ '&filetype'\ Too			也设置\ 'filetype'(&F)
   menutrans Sorting\ Method					排序方式
   " Netrw.Style.Sorting Method menuitems {{{3
   menutrans Name<tab>s		文件名<tab>s
-  menutrans Time<tab>s  	修改时间<tab>s
-  menutrans Size<tab>s  	大小<tab>s
+  menutrans Time<tab>s		修改时间<tab>s
+  menutrans Size<tab>s		大小<tab>s
   menutrans Exten<tab>s		扩展名<tab>s
   " }}}
   " }}}
diff --git a/runtime/lang/menu_zh_tw.utf-8.vim b/runtime/lang/menu_zh_tw.utf-8.vim
index 7bef83ce9..693e28d4d 100644
--- a/runtime/lang/menu_zh_tw.utf-8.vim
+++ b/runtime/lang/menu_zh_tw.utf-8.vim
@@ -1,6 +1,7 @@
 " Menu Translations:	Traditional Chinese
 " Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
 " Last Change:		2012 May 01
+" Original translations
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")
diff --git a/src/version.c b/src/version.c
index eaf29a440..709bf7e99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4420,
 /**/
     4419,
 /**/