updated for version 7.1a

4 files changed, 330 insertions, 13 deletions

diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index cfb2769b5..193826bdc 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -109,7 +109,7 @@ menutrans &Keymap			键盘映射(&K)
 menutrans &Tools			工具(&T)
 menutrans &Jump\ to\ this\ tag<Tab>g^]	跳转到这个\ tag(&J)<Tab>g^]
 menutrans Jump\ &back<Tab>^T		跳转返回(&B)<Tab>^T
-menutrans Build\ &Tags\ File		建立 Tags 文件(&T)
+menutrans Build\ &Tags\ File		建立\ Tags\ 文件(&T)
 
 " Tools.Spelling Menu
 menutrans &Spelling				拼写检查(&S)
@@ -209,7 +209,7 @@ menutrans Min\ Widt&h<Tab>^W1\|		最小宽度(&H)<Tab>^W1\|
 menutrans &Undo			撤销(&U)
 menutrans Cu&t			剪切(&T)
 menutrans &Copy			复制(&C)
-menutrans &Paste		粘帖(&P)
+menutrans &Paste		粘贴(&P)
 menutrans &Delete		删除(&D)
 menutrans Select\ Blockwise	选择块
 menutrans Select\ &Word		选择单词(&W)
@@ -233,7 +233,7 @@ if has("toolbar")
     tmenu ToolBar.Redo		重做
     tmenu ToolBar.Cut		剪切到剪贴板
     tmenu ToolBar.Copy		复制到剪贴板
-    tmenu ToolBar.Paste		从剪贴板粘帖
+    tmenu ToolBar.Paste		从剪贴板粘贴
     tmenu ToolBar.Find		查找...
     tmenu ToolBar.FindNext	查找下一个
     tmenu ToolBar.FindPrev	查找上一个
diff --git a/runtime/lang/menu_pt_br.vim b/runtime/lang/menu_pt_br.vim
index eaad26fb9..28a62b78d 100644
--- a/runtime/lang/menu_pt_br.vim
+++ b/runtime/lang/menu_pt_br.vim
@@ -1,6 +1,6 @@
-" Menu Translations: Portugu阺
-" Maintainer: Jos� de Paula <jose_de_paula@ig.com.br>
-" Last Change: 2003 Jun 12
+" Menu Translations: Portugu阺 do Brasil
+" Maintainer: Jos� de Paula <jose@infoviaweb.com>
+" Last Change: 2006-09-19 02:30:00-03:00
 "
 
 " Quit when menu translations have already been done.
@@ -25,6 +25,7 @@ menutrans &Find\.\.\.		&Procurar\.\.\.
 menutrans &Credits		&Cr閐itos
 menutrans O&rphans		&觬f鉶s
 menutrans Co&pying		&Licen鏰
+menutrans &Sponsor/Register	&Doar/Registrar
 menutrans &Version		&Vers鉶
 menutrans &About		&Sobre
 
@@ -58,7 +59,8 @@ menutrans Find\ and\ Rep&lace\.\.\.	Procurar\ e\ substit&uir\.\.\.
 menutrans Find\ and\ Rep&lace<Tab>:%s	Procurar\ e\ substit&uir<Tab>:%s
 menutrans Find\ and\ Rep&lace		Procurar\ e\ substit&uir
 menutrans Find\ and\ Rep&lace<Tab>:s	Procurar\ e\ substituir<Tab>:s
-menutrans Settings\ &Window		Op&珲es
+menutrans Settings\ &Window		&Op珲es
+menutrans Startup\ &Settings		&Inicializa玢o
 
 " Edit/Global Settings
 menutrans &Global\ Settings		Op珲es\ &Globais
@@ -117,7 +119,7 @@ menutrans default	padr鉶
 
 menutrans Select\ Fo&nt\.\.\.		Selecionar\ fo&nte\.\.\.
 
-menutrans &Keymap	Mapa\ de\ teclado
+menutrans &Keymap	&Mapa\ de\ teclado
 menutrans None		Nenhum
 
 " Programming menu
@@ -125,6 +127,7 @@ menutrans &Tools			&Ferramentas
 menutrans &Jump\ to\ this\ tag<Tab>g^]	&Pular\ para\ este\ tag<Tab>g^]
 menutrans Jump\ &back<Tab>^T		&Voltar<Tab>^T
 menutrans Build\ &Tags\ File		&Construir\ Arquivo\ de\ tags
+menutrans &Spelling			&Ortografia
 menutrans &Folding			&Dobra
 menutrans &Make<Tab>:make		&Make<Tab>:make
 menutrans &List\ Errors<Tab>:cl		&Lista\ de\ erros<Tab>:cl
@@ -134,10 +137,27 @@ menutrans &Previous\ Error<Tab>:cp	&Erro\ anterior<Tab>:cp
 menutrans &Older\ List<Tab>:cold	Listar\ erros\ &antigos<Tab>:cold
 menutrans N&ewer\ List<Tab>:cnew	Listar\ erros\ &novos<Tab>:cnew
 menutrans Error\ &Window		&Janela\ de\ erros
-menutrans &Set\ Compiler		Def&inir\ Compilador
+menutrans Se&T\ Compiler		Def&inir\ Compilador
 menutrans &Convert\ to\ HEX<Tab>:%!xxd	Converter\ para\ hexadecimal<Tab>:%!xxd
 menutrans Conve&rt\ back<Tab>:%!xxd\ -r	Conver&ter\ de\ volta<Tab>:%!xxd\ -r
 
+" Tools.Spelling menu
+menutrans &Spell Check On		&Ativar Corre玢o Ortogr醘ica
+menutrans &Spell Check Off		&Desativar Corre玢o Ortogr醘ica
+menutrans To &Next error<Tab>]s		&Pr髕imo Erro<Tab>]s
+menutrans To &Previous Error<Tab>[s	Erro A&nterior<Tab>[s
+menutrans Suggest &Corrections<Tab>z=	&Sugerir Corre珲es<Tab>z=
+menutrans &Repeat correction<Tab>:spellrepall	&Repetir Corre玢o<Tab>:spellrepall
+
+menutrans Set\ language\ to\ "en"               Ingl阺
+menutrans Set\ language\ to\ "en_au"            Ingl阺\ (en_au)
+menutrans Set\ language\ to\ "en_ca"            Ingl阺\ (en_ca)
+menutrans Set\ language\ to\ "en_gb"            Ingl阺\ (en_gb)
+menutrans Set\ language\ to\ "en_nz"            Ingl阺\ (en_nz)
+menutrans Set\ language\ to\ "en_us"            Ingl阺\ (en_us)
+
+menutrans &Find\ More\ Languages                &Buscar mais idiomas
+
 " Tools.Fold Menu
 menutrans &Enable/Disable\ folds<Tab>zi		&Ativar/Desativar\ dobras<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv		&Ver\ linha\ do\ cursor<Tab>zv
diff --git a/runtime/lang/menu_sl_si.utf-8.vim b/runtime/lang/menu_sl_si.utf-8.vim
new file mode 100644
index 000000000..306e449ef
--- /dev/null
+++ b/runtime/lang/menu_sl_si.utf-8.vim
@@ -0,0 +1,294 @@
+" Menu Translations:	Slovenian / Slovensko
+" Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+" Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+" Last Change:		Sat, 17 Jun 2006
+" vim:set foldmethod=marker tabstop=8:
+
+" TODO: add/check all '&'s
+
+" Quit when menu translations have already been done.
+if exists("did_menu_trans")
+  finish
+endif
+let did_menu_trans = 1
+
+scriptencoding utf-8
+
+" {{{ FILE / DATOTEKA
+menutrans &File				&Datoteka
+menutrans &Open\.\.\.<Tab>:e		&Odpri\ \.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	Odpri\ de&ljeno\ \.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	Odpri\ v\ zavi&hku\ \.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		&Nova<Tab>:enew
+menutrans &Close<Tab>:close		&Zapri<Tab>:close
+menutrans &Save<Tab>:w			&Shrani<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Shrani\ &kot\ \.\.\.<Tab>:sav
+menutrans &Print			Na&tisni
+menutrans Sa&ve-Exit<Tab>:wqa		Shrani\ in\ &kon膷aj<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Izhod<Tab>:qa
+
+if has("diff")
+    menutrans Split\ &Diff\ with\.\.\.	Primerjaj\ z\ (di&ff)\ \.\.\.
+    menutrans Split\ Patched\ &By\.\.\.	&Popravi\ z\ (patch)\ \.\.\.
+endif
+" }}} FILE / DATOTEKA
+
+" {{{ EDIT / UREDI
+menutrans &Edit				&Uredi
+menutrans &Undo<Tab>u			&Razveljavi<Tab>u
+menutrans &Redo<Tab>^R			&Obnovi<Tab>^R
+menutrans Rep&eat<Tab>\.		Po&novi<Tab>\.
+menutrans Cu&t<Tab>"+x			&Izre啪i<Tab>"+x
+menutrans &Copy<Tab>"+y			&Kopiraj<Tab>"+y
+menutrans &Paste<Tab>"+gP		&Prilepi<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Vrini\ pred<Tab>[p
+menutrans Put\ &After<Tab>]p		Vrini\ za<Tab>]p
+menutrans &Delete<Tab>x			Iz&bri拧i<Tab>x
+menutrans &Select\ all<Tab>ggVG		Izberi\ vse<Tab>ggVG
+menutrans &Find\.\.\.			Po&i拧膷i\ \.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.	Poi拧膷i\ in\ &zamenjaj\ \.\.\.
+
+" [-- SETTINGS --]
+menutrans Settings\ &Window				Nastavitve\ \.\.\.
+menutrans Startup\ &Settings				Za膷etne\ nastavitve
+menutrans &Global\ Settings				&Globalne\ nastavitve
+
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Vklju膷i/izklju膷i\ poudarjanje\ iskanega\ niza<Tab>:set\ hls!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		Vklju膷i/izklju膷i\ lo膷evanje\ velikih\ in\ malih\ 膷rk<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		Vklju膷i/izklju膷i\ kratek\ skok\ na\ pripadajo膷i\ oklepaj<Tab>:set\ sm!
+
+menutrans &Context\ lines				艩t\.\ vidnih\ vrstic\ pred/za\ kurzorjem
+
+menutrans &Virtual\ Edit				Dovoli\ polo啪aj\ kazal膷ka,\ kjer\ ni\ besedila
+menutrans Never						Nikoli
+menutrans Block\ Selection				Le\ med\ izbiranjem\ bloka
+menutrans Insert\ mode					Le\ v\ na膷inu\ za\ pisanje
+menutrans Block\ and\ Insert				Pri\ obojem
+menutrans Always					Vedno
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Vklju膷i/izklju膷i\ na膷in\ za\ pisanje<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		Vklju膷i/izklju膷i\ zdru啪ljivost\ z\ Vi-jem<Tab>:set\ cp!
+
+menutrans Search\ &Path\.\.\.				Pot\ za\ iskanje\ \.\.\.
+menutrans Ta&g\ Files\.\.\.				Ta&g-datoteke\.\.\.
+
+menutrans Toggle\ &Toolbar				Poka啪i/skrij\ Orodja
+menutrans Toggle\ &Bottom\ Scrollbar			Poka啪i/skrij\ spodnji\ drsnik
+menutrans Toggle\ &Left\ Scrollbar			Poka啪i/skrij\ levi\ drsnik
+menutrans Toggle\ &Right\ Scrollbar			Poka啪i/skrij\ desni\ drsnik
+
+" Edit/File Settings
+menutrans F&ile\ Settings				&Nastavitve\ datoteke
+
+" Boolean options
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	Poka啪i/skrij\ 拧tevilke\ vrstic<Tab>:set\ nu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Poka啪i/skrij\ nevidne\ znake<Tab>:set\ list! " space/tab
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		Vklju膷i/izklju膷i\ prelome\ vrstic<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	Vklju膷i/izklju膷i\ prelome\ vrstic\ med\ besedami<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!		Vklju膷i/izklju膷i\ zamenjavo\ tabulatorjev\ s\ presledki<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		Vklju膷i/izklju膷i\ avtomatsko\ zamikanje\ vrstic<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!		Vklju膷i/izklju膷i\ C-jevski\ na膷in\ zamikanja\ vrstic<Tab>:set\ cin!
+
+" other options
+menutrans &Shiftwidth					艩irina\ zamika\ vrstic
+menutrans Soft\ &Tabstop				艩irina\ &tabulatorja
+menutrans Te&xt\ Width\.\.\.				艩irina\ besedila\ \.\.\.
+menutrans &File\ Format\.\.\.				Format\ &datoteke\ \.\.\.
+menutrans C&olor\ Scheme				&Barvna\ shema\ \.\.\.
+menutrans &Keymap					&Keymap
+menutrans Select\ Fo&nt\.\.\.				Pisava\ \.\.\.
+" }}} EDIT / UREDI
+
+" {{{  TOOLS / ORODJA
+menutrans &Tools					&Orodja
+menutrans &Jump\ to\ this\ tag<Tab>g^]			&Sko膷i\ k\ tej\ zna膷ki<Tab>g^]
+menutrans Jump\ &back<Tab>^T				Sko膷i\ Na&zaj<Tab>^T
+menutrans Build\ &Tags\ File				Napravi\ datoteke\ z\ zna膷kami\ (tag)
+if has("spell")
+    menutrans &Spelling					膶rkovalnik
+    menutrans &Spell\ Check\ On				&Vklju膷i
+    menutrans Spell\ Check\ &Off			&Izklju膷i
+    menutrans To\ &Next\ error<Tab>]s			K\ &naslednji\ napaki<Tab>]s
+    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\ 			膶rkovalnik:\
+    menutrans &Find\ More\ Languages			&Ostali\ jeziki
+endif
+if has("folding")
+  menutrans &Folding					Zvijanje\ kode
+  " 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
+  " fold method
+  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans M&anual					&Ro膷no
+  menutrans I&ndent					Glede\ na\ &poravnavo
+  menutrans E&xpression					Z\ &izrazi\ (foldexpr)
+  menutrans S&yntax					Glede\ na\ &sintakso
+  menutrans &Diff					Razlike\ (&diff)
+  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
+  " moving around in folds
+  menutrans Fold\ column\ &width			艩irina\ drevesa\ z\ zvitki
+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 &Put\ Block					&Po拧lji\ (spremeni\ drugo\ okno)
+endif
+
+menutrans &Make<Tab>:make				Napravi\ (&make)<Tab>:make
+menutrans &List\ Errors<Tab>:cl				Poka啪i\ napake<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!			Poka啪i\ sporo膷ila<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn				K\ &naslednji\ napaki<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp			K\ &prej拧nji\ napaki<Tab>:cp
+menutrans &Older\ List<Tab>:cold			K\ &starej拧emu\ seznamu\ napak<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew			K\ &novej拧emu\ seznamu\ napak<Tab>:cnew
+
+menutrans Error\ &Window				Okno\ z\ napakami
+menutrans &Update<Tab>:cwin				&Posodobi<Tab>:cwin
+menutrans &Open<Tab>:copen				&Odpri<Tab>:copen
+menutrans &Close<Tab>:cclose				&Zapri<Tab>:cclose
+
+menutrans &Set\ Compiler				Nastavi\ &prevajalnik
+menutrans Se&T\ Compiler				Nastavi\ &prevajalnik " bug in original translation?
+
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			Pretvori\ v\ HE&X<Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r			Pretvori\ nazaj<Tab>:%!xxd\ -r
+" }}}  TOOLS / ORODJA
+
+" {{{ SYNTAX / BARVANJE KODE
+menutrans &Syntax				&Barvanje\ kode
+menutrans &Show\ filetypes\ in\ menu		Podprte\ vrste\ datotek
+menutrans Set\ '&syntax'\ only			Samo\ barvanje\ ('&syntax')
+menutrans Set\ '&filetype'\ too			Tudi\ obna拧anje\ ('&filetype')
+menutrans &Off					&Izklju膷eno
+menutrans &Manual				&Ro膷no
+menutrans A&utomatic				&Avtomatsko
+menutrans on/off\ for\ &This\ file		Vklju膷i/izklju膷i\ za\ to\ datoteko
+menutrans Co&lor\ test				Preizkus\ barv
+menutrans &Highlight\ test			Preizkus\ barvanja\ kode
+menutrans &Convert\ to\ HTML			Pretvori\ v\ &HTML
+" }}} SYNTAX / BARVANJE KODE
+
+" {{{ BUFFERS / MEDPOMNILNIK
+menutrans &Buffers					&Medpomnilnik " XXX: ni najbolje: okno bi bolj pristajalo, ampak okno je 啪e
+menutrans &Refresh\ menu				&Osve啪i
+menutrans Delete					&Bri拧i
+menutrans &Alternate					&Menjaj
+menutrans &Next						&Naslednji
+menutrans &Previous					&Prej拧nji
+menutrans [No\ File]					[Brez\ datoteke]
+" }}} BUFFERS / MEDPOMNILNIK
+
+" {{{ WINDOW / OKNO
+menutrans &Window			&Okno
+menutrans &New<Tab>^Wn			&Novo<Tab>^Wn
+menutrans S&plit<Tab>^Ws		Razdeli<Tab>^Ws
+menutrans Split\ &Vertically<Tab>^Wv	Razdeli\ navpi膷no<Tab>^Ws
+menutrans Split\ File\ E&xplorer	Razdeli:\ Vsebina\ mape
+menutrans Sp&lit\ To\ #<Tab>^W^^	Razdeli\ v\ #<Tab>^W^^
+menutrans &Close<Tab>^Wc		&Zapri<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Zapri\ &ostala<Tab>^Wo
+menutrans Move\ &To			Premakni
+menutrans &Top<Tab>^WK			&Gor<Tab>^WK
+menutrans &Bottom<Tab>^WJ		&Dol<Tab>^WJ
+menutrans &Left\ side<Tab>^WH		&Levo<Tab>^WH
+menutrans &Right\ side<Tab>^WL		&Desno<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR		Zavrti\ navzgor<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr		Zavrti\ navzdol<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W=		&Enaka\ velikost<Tab>^W=
+menutrans &Max\ Height<Tab>^W_		Najvi拧je<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_		Najni啪je<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|		Naj拧ir拧e<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|		Najo啪je<Tab>^W1\|
+" }}} WINDOW / OKNO
+
+" {{{ HELP / POMO膶
+menutrans &Help			&Pomo膷
+menutrans &Overview<Tab><F1>	Hitri\ pregled<Tab><F1>
+menutrans &User\ Manual		P&riro膷nik
+menutrans &How-to\ links	&How-to\ kazalo
+menutrans &Find\.\.\.		Po&i拧膷i\ \.\.\.	" conflicts with Edit.Find
+menutrans &Credits		&Avtorji
+menutrans Co&pying		&Licenca
+menutrans &Sponsor/Register	Registracija\ in\ &donacije
+menutrans O&rphans		&Sirotam
+menutrans &Version		&Verzija
+menutrans &About		&O\ programu
+" }}} HELP / POMO膶
+
+" {{{ POPUP
+menutrans &Undo				&Razveljavi
+menutrans Cu&t				&Izre啪i
+menutrans &Copy				&Kopieraj
+menutrans &Paste			&Prilepi
+menutrans &Delete			&Zbri拧i
+menutrans Select\ Blockwise		Izbiraj\ po\ blokih
+menutrans Select\ &Word			Izberi\ &besedo
+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
+" }}} POPUP
+
+" {{{ TOOLBAR
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open		Odpri datoteko
+    tmenu ToolBar.Save		Shrani datoteko
+    tmenu ToolBar.SaveAll	Shrani vse datoteke
+    tmenu ToolBar.Print		Natisni
+    tmenu ToolBar.Undo		Razveljavi
+    tmenu ToolBar.Redo		Obnovi
+    tmenu ToolBar.Cut		Izre啪i
+    tmenu ToolBar.Copy		Kopiraj
+    tmenu ToolBar.Paste		Prilepi
+    tmenu ToolBar.Find		Najdi ...
+    tmenu ToolBar.FindNext	Najdi naslednje
+    tmenu ToolBar.FindPrev	Najdi prej拧nje
+    tmenu ToolBar.Replace	Najdi in zamenjaj ...
+    tmenu ToolBar.LoadSesn	Nalo啪i sejo
+    tmenu ToolBar.SaveSesn	Shrani trenutno sejo
+    tmenu ToolBar.RunScript	Izberi Vim skripto za izvajanje
+    tmenu ToolBar.Make		Napravi trenutni projekt (:make)
+    tmenu ToolBar.RunCtags	Napravi zna膷ke v trenutnem direktoriju (!ctags -R.)
+    tmenu ToolBar.TagJump	Sko膷i k zna膷ki pod kurzorjem
+    tmenu ToolBar.Help		Pomo膷 za Vim
+    tmenu ToolBar.FindHelp	I拧膷i v pomo膷i za Vim
+  endfun
+endif
+" }}} TOOLBAR
+
+" {{{ DIALOG TEXTS
+let g:menutrans_no_file = "[Brez datoteke]"
+let g:menutrans_help_dialog = "Vnesite ukaz ali besedo, za katero 啪elite pomo膷:\n\nUporabite predpono i_ za ukaze v na膷inu za pisanje (npr.: i_CTRL-X)\nUporabite predpono c_ za ukaze v ukazni vrstici (command-line) (npr.: c_<Del>)\nUporabite predpono ' za imena opcij (npr.: 'shiftwidth')"
+let g:menutrans_path_dialog = "Vnesite poti za iskanje datotek.\nImena direktorijev lo膷ite z vejico."
+let g:menutrans_tags_dialog = "Vnesite imena datotek z zna膷kami ('tag').\nImana lo膷ite z vejicami."
+let g:menutrans_textwidth_dialog = "Vnesite novo 拧irino besedila (ali 0 za izklop formatiranja): "
+let g:menutrans_fileformat_dialog = "Izberite format datoteke"
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Prekli膷i"
+" }}}
diff --git a/runtime/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim
index 6819f4605..3ec825ce9 100644
--- a/runtime/lang/menu_zh_cn.gb2312.vim
+++ b/runtime/lang/menu_zh_cn.gb2312.vim
@@ -10,7 +10,10 @@ if exists("did_menu_trans")
 endif
 let did_menu_trans = 1
 
-scriptencoding gb2312
+" This causes trouble for a broken iconv (symptom: last character is always
+" ??).  Without this it works fine anyway, because gbk/cp936 is a superset of
+" gb2312. (suggested by Edward L. Fox)
+" scriptencoding gb2312
 
 " Help menu
 menutrans &Help			帮助(&H)
@@ -109,7 +112,7 @@ menutrans &Keymap			键盘映射(&K)
 menutrans &Tools			工具(&T)
 menutrans &Jump\ to\ this\ tag<Tab>g^]	跳转到这个\ tag(&J)<Tab>g^]
 menutrans Jump\ &back<Tab>^T		跳转返回(&B)<Tab>^T
-menutrans Build\ &Tags\ File		建立 Tags 文件(&T)
+menutrans Build\ &Tags\ File		建立\ Tags\ 文件(&T)
 
 " Tools.Spelling Menu
 menutrans &Spelling				拼写检查(&S)
@@ -209,7 +212,7 @@ menutrans Min\ Widt&h<Tab>^W1\|		最小宽度(&H)<Tab>^W1\|
 menutrans &Undo			撤销(&U)
 menutrans Cu&t			剪切(&T)
 menutrans &Copy			复制(&C)
-menutrans &Paste		粘帖(&P)
+menutrans &Paste		粘贴(&P)
 menutrans &Delete		删除(&D)
 menutrans Select\ Blockwise	选择块
 menutrans Select\ &Word		选择单词(&W)
@@ -233,7 +236,7 @@ if has("toolbar")
     tmenu ToolBar.Redo		重做
     tmenu ToolBar.Cut		剪切到剪贴板
     tmenu ToolBar.Copy		复制到剪贴板
-    tmenu ToolBar.Paste		从剪贴板粘帖
+    tmenu ToolBar.Paste		从剪贴板粘贴
     tmenu ToolBar.Find		查找...
     tmenu ToolBar.FindNext	查找下一个
     tmenu ToolBar.FindPrev	查找上一个