summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-23 13:58:12 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-23 13:58:12 +0200
commit0d6fe631f75effbfca92a4f61bbc2fab7385af09 (patch)
tree97a8623667e9d9f6d4d75253e482cf7687c17717
parentea04a6e8baff2f27da7cdd54bf70a5525994f76d (diff)
downloadvim-git-0d6fe631f75effbfca92a4f61bbc2fab7385af09.tar.gz
patch 8.2.0620: error in menu translationsv8.2.0620
Problem: Error in menu translations. Solution: Insert a backslash before a space.
-rw-r--r--runtime/lang/menu_chinese_gb.936.vim8
-rw-r--r--runtime/lang/menu_it_it.latin1.vim10
-rw-r--r--src/version.c2
3 files changed, 11 insertions, 9 deletions
diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index d96ab3780..f20989f4c 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,7 +1,7 @@
" Menu Translations: Simplified Chinese
" Maintainer: Shun Bai <baishunde@gmail.com>
" Previous Maintainer: Yuheng Xie <elephant@linux.net.cn>
-" Last Change: 2019-09-10
+" Last Change: 2020 Apr 23
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -122,7 +122,7 @@ menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! ¿ª/¹Ø\ C\ ÓïÑÔʽËõ½ø(&C)<T
" other options
menutrans &Shiftwidth Ëõ½ø¿í¶È(&S)
-menutrans Soft\ &Tabstop ÈíÖƱíλ¿í¶È(Soft Tabstop)(&T)
+menutrans Soft\ &Tabstop ÈíÖƱíλ¿í¶È(Soft\ Tabstop)(&T)
menutrans Te&xt\ Width\.\.\. Îı¾¿í¶È(&X)\.\.\.
menutrans &File\ Format\.\.\. Îļþ¸ñʽ(&F)\.\.\.
@@ -435,8 +435,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_it_it.latin1.vim b/runtime/lang/menu_it_it.latin1.vim
index 8dec38bb1..927c3c9e6 100644
--- a/runtime/lang/menu_it_it.latin1.vim
+++ b/runtime/lang/menu_it_it.latin1.vim
@@ -2,7 +2,7 @@
" Maintainer: Antonio Colombo <azc100@gmail.com>
" Vlad Sandrini <vlad.gently@gmail.com>
" Luciano Montanaro <mikelima@cirulla.net>
-" Last Change: 2018 May 16
+" Last Change: 2020 Apr 23
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -116,8 +116,8 @@ menut Toggle\ &List\ Mode<Tab>:set\ list! Modo\ &List\ Sì/No<Tab>:set\ list!
menut Toggle\ Line\ &Wrapping<Tab>:set\ wrap! Linee\ &Continuate\ Sì/No<Tab>:set\ wrap!
menut Toggle\ W&rapping\ at\ word<Tab>:set\ lbr! A\ capo\ alla\ &Parola\ Sì/No<Tab>:set\ lbr!
menut Toggle\ Tab\ &expanding<Tab>:set\ et! &Espandi\ Tabulazione\ Sì/No<Tab>:set\ et!
-menut Toggle\ &Auto\ Indenting<Tab>:set\ ai! Indentazione\ &Automatica\ Sì/No<Tab>:set ai!
-menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin! Indentazione\ stile\ &C\ Sì/No<Tab>:set cin!
+menut Toggle\ &Auto\ Indenting<Tab>:set\ ai! Indentazione\ &Automatica\ Sì/No<Tab>:set\ ai!
+menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin! Indentazione\ stile\ &C\ Sì/No<Tab>:set\ cin!
" -SEP2-
menut &Shiftwidth &Spazi\ rientranza
"menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR> &Spazi\ rientranza.2<Tab>:set\ sw=2\ sw?<CR>
@@ -360,8 +360,8 @@ menut Copy Copia
menut Paste Incolla
" -sep3-
menut Find Cerca
-menut FindNext Cerca Successivo
-menut FindPrev Cerca Precedente
+menut FindNext Cerca\ Successivo
+menut FindPrev Cerca\ Precedente
menut Replace Sostituisci
" -sep4-
menut New Nuova\ finestra
diff --git a/src/version.c b/src/version.c
index ad34a91c0..a46ffb46f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 620,
+/**/
619,
/**/
618,