Mercurial > vim
changeset 13960:bbff863d3cae
Updated runtime files.
commit https://github.com/vim/vim/commit/7c63fbc46e218cad266641a743a6c1353c2f00d4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 17 13:15:23 2018 +0200
Updated runtime files.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 17 May 2018 13:30:06 +0200 |
| parents | d61f3e89755d |
| children | dc648848f8be |
| files | runtime/doc/todo.txt runtime/doc/version8.txt runtime/lang/menu_it_it.latin1.vim runtime/lang/menu_ru_ru.vim runtime/menu.vim runtime/syntax/cabal.vim src/po/ru.cp1251.po src/po/ru.po |
| diffstat | 8 files changed, 658 insertions(+), 355 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2018 May 15 +*todo.txt* For Vim version 8.0. Last change: 2018 May 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -36,9 +36,9 @@ entered there will not be repeated below -------------------- Known bugs and current work ----------------------- Terminal emulator window: -- Duplicated lines when making terminal only window. (Dominique, #2909) - Still some stuff to implement and bugs to fix, see src/terminal.c -- Add more functionality for terminal API? (Ozaki Kiichi 2018 May 13, #2907) + +Patch to refactor efm_to_regpat(). (Yegappan Lakshmanan, 2018 May 16, #2924) Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May 13, #2910) Can't reproduce? @@ -104,6 +104,12 @@ CreateFile() returns ERROR_SHARING_VIOLA Should add a test for every command line argument. Check coverage for what is missing: --nofork, -A , -b, -h, etc. +Completing a command sometimes results in duplicates, since 7.4.672. +(Yegappan Lakshmanan, 2018 May 16) +Duplication of completion suggestions for ":!hom". Issue #539. +Patch by Christian, 2016 Jan 29 +Another patch in #2733. + Improve the installer for MS-Windows. There are a few alternatives: - Add silent install option. (Shane Lee, #751) - Installer from Cream (Steve Hall). @@ -306,10 +312,6 @@ Start with filetype detection: testdir/t Window not closed when deleting buffer. (Harm te Hennepe, 2017 Aug 27, #2029) -Duplication of completion suggestions for ":!hom". Issue #539. -Patch by Christian, 2016 Jan 29 -Another patch in #2733. -> Add options_default() / options_restore() to set several options to Vim defaults for a plugin. Comments from Zyx, 2017 May 10. Perhaps use a vimcontext / endvimcontext command block.
--- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -1,4 +1,4 @@ -*version8.txt* For Vim version 8.0. Last change: 2018 May 13 +*version8.txt* For Vim version 8.0. Last change: 2018 May 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -25533,5 +25533,130 @@ Problem: Compiler warning for signed/ Solution: Change the type of jv_argv. Files: src/channel.c, src/structs.h +Patch 8.0.1828 +Problem: Get no clue why :gui does not fork. +Solution: Add a channel log message. +Files: src/channel.c + +Patch 8.0.1829 +Problem: MS-Windows: script for vimdiff can't handle ! chars. +Solution: Escape the ! chars. (Hans Ginzel, closes #2896) +Files: src/dosinst.c + +Patch 8.0.1830 +Problem: Switching to Terminal-Normal mode does not redraw. (Dominique + Pelle) +Solution: Also redraw when not updating the snapshot. (closes #2904) +Files: src/terminal.c + +Patch 8.0.1831 +Problem: Sometimes the quickfix title is incorrectly prefixed with ':'. +Solution: Prepend the colon in another way. (Yegappan Lakshmanan, closes + #2905) +Files: src/evalfunc.c, src/quickfix.c, src/testdir/test_quickfix.vim + +Patch 8.0.1832 +Problem: Cannot use :unlet for an environment variable. +Solution: Make it work. Use unsetenv() if available. (Yasuhiro Matsumoto, + closes #2855) +Files: runtime/doc/eval.txt, src/config.h.in, src/configure.ac, + src/auto/configure, src/eval.c, src/misc1.c, src/proto/misc1.pro, + src/testdir/test_unlet.vim + +Patch 8.0.1833 +Problem: X11: ":echo 3.14" gives E806. +Solution: set LC_NUMERIC to "C". (Dominique Pelle, closes #2368) +Files: src/gui_x11.c + +Patch 8.0.1834 +Problem: GUI: find/replace dialog does not handle some chars properly. +Solution: Escape '?' when needed. Always escape backslash. (closes #2418, + closes #2435) +Files: src/gui.c + +Patch 8.0.1835 +Problem: Print document name does not support multi-byte. +Solution: Use StartDocW() if needed. (Yasuhiro Matsumoto, closes #2478) +Files: src/os_mswin.c + +Patch 8.0.1836 +Problem: Buffer-local window options may not be recent if the buffer is + still open in another window. +Solution: Copy the options from the window instead of the outdated window + options. (Bjorn Linse, closes #2336) +Files: src/buffer.c, src/testdir/test_options.vim + +Patch 8.0.1837 +Problem: One character cmdline abbreviation not triggered after '<,'>. +Solution: Skip over the special range. (Christian Brabandt, closes #2320) +Files: src/ex_getln.c, src/testdir/test_mapping.vim + +Patch 8.0.1838 +Problem: Cursor in wrong position when switching to Terminal-Normal mode. + (Dominique Pelle) +Solution: Move to the end of the line if coladvance() fails. Do not take a + snapshot a second time. +Files: src/terminal.c + +Patch 8.0.1839 +Problem: Script to check .po file doesn't check for plural header. +Solution: Add a check that the plural header is present when needed. +Files: src/po/check.vim + +Patch 8.0.1840 +Problem: getwinpos() is not tested. +Solution: Add a test. (Dominique Pelle, closes #2911) +Files: src/testdir/test_gui.vim + +Patch 8.0.1841 +Problem: HP-UX does not have setenv(). +Solution: Use vim_setenv(). (John Marriott) +Files: src/misc1.c + +Patch 8.0.1842 +Problem: Popup menu inside terminal window isn't cleared. +Solution: Use NOT_VALID in pum_undisplay(). (suggested by Christian + Brabandt, closes #2908) +Files: src/popupmnu.c + +Patch 8.0.1843 +Problem: Entry for 'wrap' in options window is wrong. (John Little) +Solution: Make the change apply locally. +Files: runtime/optwin.vim + +Patch 8.0.1844 +Problem: Superfluous quickfix code, missing examples. +Solution: Remove unneeded code. Add a few examples. Add a bit more + testing. (Yegappan Lakshmanan, closes #2916) +Files: runtime/doc/quickfix.txt, src/quickfix.c, + src/testdir/test_quickfix.vim + +Patch 8.0.1845 +Problem: Various comment updates needed, missing white space. +Solution: Update comments, add white space. +Files: src/getchar.c, src/testdir/test_cscope.vim, src/gui_mac.c + +Patch 8.0.1846 +Problem: Python interface is incompatible with lldb. +Solution: For OutputType set the base to be PyFile_Type. (Boxu Zhang) + Partly disabled to avoid a crash. +Files: src/if_py_both.h, src/if_python.c, src/if_python3.c + +Patch 8.0.1847 +Problem: Some build options don't have an example. +Solution: Add a couple more examples and compiler flags. +Files: src/Makefile + +Patch 8.0.1848 +Problem: 'termwinscroll' does not work properly. (Dominique Pelle) +Solution: Subtract removed scrollback from the scrollback count. Add a test + for 'termwinscroll'. (closes #2909) +Files: src/terminal.c, src/testdir/test_terminal.vim + +Patch 8.0.1849 +Problem: Compiler warning for unused arguments and missing prototype. +Solution: Add UNUSED. Add static. +Files: src/mbyte.c, src/if_ruby.c + vim:tw=78:ts=8:ft=help:norl:
--- 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: 2012 May 01 +" Last Change: 2018 May 16 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -16,87 +16,92 @@ scriptencoding iso-8859-1 " Help / Aiuto menut &Help &Aiuto + menut &Overview<Tab><F1> &Panoramica<Tab><F1> menut &User\ Manual Manuale\ &Utente menut &How-to\ links Co&Me\.\.\. -"menut &GUI &GUI +menut &Find\.\.\. &Cerca\.\.\. +" -SEP1- menut &Credits Cr&Editi menut Co&pying C&Opie -menut &Sponsor/Register &Sponsor/registrazione +menut &Sponsor/Register &Sponsor/Registrazione menut O&rphans O&Rfani -"menut &Find\.\.\. &Cerca\.\.\. -"NOTA: fa conflitto con 'cerca' nel menu 'modifica' +" -SEP2- menut &Version &Versione menut &About &Intro let g:menutrans_help_dialog = "Batti un comando o una parola per cercare aiuto:\n\nPremetti i_ per comandi in modo Input (ad.es.: i_CTRL-X)\nPremetti c_ per comandi che editano la linea-comandi (ad.es.: c_<Del>)\nPremetti ' per un nome di opzione (ad.es.: 'shiftwidth')" -" File menu -"menut &File &File -" +" File / File +menut &File &File + menut &Open\.\.\.<Tab>:e &Apri\.\.\.<Tab>:e -menut Sp&lit-Open\.\.\.<Tab>:sp A&Pri\ nuova\ finestra\.\.\.<Tab>:sp -menut Open\ Tab\.\.\.<Tab>:tabnew Apri\ nuova\ &Linguetta\.\.\.<Tab>:tabnew -menut &New<Tab>:enew &Nuovo<Tab>:enew -menut &Close<Tab>:close &Chiudi<Tab>:close +menut Sp&lit-Open\.\.\.<Tab>:sp A&Pri\ nuova\ finestra\.\.\.<Tab>:sp +menut Open\ Tab\.\.\.<Tab>:tabnew Apri\ nuova\ &Linguetta\.\.\.<Tab>:tabnew +menut &New<Tab>:enew &Nuovo<Tab>:enew +menut &Close<Tab>:close &Chiudi<Tab>:close +" -SEP1- menut &Save<Tab>:w &Salva<Tab>:w -menut Save\ &As\.\.\.<Tab>:sav Salva\ &Con\ nome\.\.\.<Tab>:sav - -if has("diff") - menut Split\ &Diff\ with\.\.\. Finestra\ &Differenza\ con\.\.\. - menut Split\ Patched\ &By\.\.\. Finestra\ patc&H\ da\.\.\. -endif - -menut &Print S&tampa +menut Save\ &As\.\.\.<Tab>:sav Salva\ &Con\ nome\.\.\.<Tab>:sav +" -SEP2- +menut Split\ &Diff\ with\.\.\. &Differenza\ con\.\.\. +menut Split\ Patched\ &By\.\.\. Patc&H\ da\.\.\. +" -SEP3- +menut &Print S&tampa +" -SEP4- menut Sa&ve-Exit<Tab>:wqa Sa&Lva\ ed\ esci<Tab>:wqa menut E&xit<Tab>:qa &Esci<Tab>:qa " Edit / Modifica +menut &Edit &Modifica -menut &Edit &Modifica menut &Undo<Tab>u &Annulla<Tab>u menut &Redo<Tab>^R &Ripristina<Tab>^R -menut Rep&eat<Tab>\. Ri&Peti<Tab>\. +menut Rep&eat<Tab>\. Ri&Peti<Tab>\. +" -SEP1- menut Cu&t<Tab>"+x &Taglia<Tab>"+x menut &Copy<Tab>"+y &Copia<Tab>"+y -menut &Paste<Tab>"+gP &Incolla<Tab>"+gP +menut &Paste<Tab>"+gP &Incolla<Tab>"+gP menut Put\ &Before<Tab>[p &Metti\ davanti<Tab>[p menut Put\ &After<Tab>]p M&Etti\ dietro<Tab>]p menut &Delete<Tab>x Cance&Lla<Tab>x menut &Select\ all<Tab>ggVG Seleziona\ &Tutto<Tab>ggVG -menut &Select\ All<Tab>ggVG Seleziona\ &Tutto<Tab>ggVG +" -SEP2- menut &Find\.\.\. &Cerca\.\.\. -menut Find\ and\ Rep&lace\.\.\. &Sostituisci\.\.\. -menut Settings\ &Window &Finestra\ impostazioni -menut Startup\ &Settings Impostazioni\ di\ &Avvio -menut &Global\ Settings Impostazioni\ &Globali -menut Question Domanda +menut &Find\.\.\.<Tab>/ &Cerca\.\.\.<Tab>/ +menut Find\ and\ Rep&lace\.\.\. &Sostituisci\.\.\. +menut Find\ and\ Rep&lace\.\.\.<Tab>:%s &Sostituisci\.\.\.<Tab>:%s +menut Find\ and\ Rep&lace\.\.\.<Tab>:s &Sostituisci\.\.\.<Tab>:s +" -SEP3- +menut Settings\ &Window &Finestra\ Impostazioni +menut Startup\ &Settings Impostazioni\ di\ &Avvio +menut &Global\ Settings Impostazioni\ &Globali +menut Question Domanda -" Edit / Modifica Impostazioni Globali -menut &Global\ Settings Impostazioni\ &Globali +" Edit / Modifica / Impostazioni Globali + menut Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Evidenzia\ ricerche\ S/No<Tab>:set\ hls! -menut Toggle\ &Ignore-case<Tab>:set\ ic! &Ignora\ maiusc\.-minusc\.\ S/No<Tab>:set\ ic! -menut Toggle\ &Showmatch<Tab>:set\ sm! Indica\ &Corrispondente\ S/No<Tab>:set\ sm! +menut Toggle\ &Ignoring\ Case<Tab>:set\ ic! &Ignora\ maiusc\.-minusc\.\ S/No<Tab>:set\ ic! +menut Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Indica\ &Corrispondenze\ S/No<Tab>:set\ sm! -menut &Context\ lines &Linee\ di\ contesto -menut &Virtual\ Edit &Edit\ virtuale +menut &Context\ lines &Linee\ di\ contesto -menut Never Mai -menut Block\ Selection Selezione\ blocco -menut Insert\ mode Modo\ insert -menut Block\ and\ Insert Selezione\ blocco+inserimento -menut Always Sempre +menut &Virtual\ Edit &Edit\ virtuale +menut Never Mai +menut Block\ Selection Selezione\ Blocco +menut Insert\ mode Modo\ Insert +menut Block\ and\ Insert Selezione\ Blocco\ e\ Inserimento +menut Always Sempre -menut Toggle\ Insert\ &Mode<Tab>:set\ im! &Modo\ insert\ S/No<Tab>:set\ im! -menut Toggle\ Vi\ C&ompatible<Tab>:set\ cp! C&Ompatibile\ VI\ S/No<Tab>:set\ cp! +menut Toggle\ Insert\ &Mode<Tab>:set\ im! &Modo\ Insert\ S/No<Tab>:set\ im! +menut Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! C&Ompatibilit\ VI\ S/No<Tab>:set\ cp! menut Search\ &Path\.\.\. &Percorso\ di\ ricerca\.\.\. menut Ta&g\ Files\.\.\. File\ ta&G\.\.\. -" -" Opzioni GUI -menut Toggle\ &Toolbar Barra\ s&Trumenti\ S/No +" -SEP1- +menut Toggle\ &Toolbar Barra\ s&Trumenti\ S/No menut Toggle\ &Bottom\ Scrollbar Barra\ scorrimento\ in\ &Fondo\ S/No -menut Toggle\ &Left\ Scrollbar Barra\ scorrimento\ a\ &Sinistra\ S/No -menut Toggle\ &Right\ Scrollbar Barra\ scorrimento\ a\ &Destra\ S/No +menut Toggle\ &Left\ Scrollbar Barra\ scorrimento\ a\ &Sinistra\ S/No +menut Toggle\ &Right\ Scrollbar Barra\ scorrimento\ a\ &Destra\ S/No let g:menutrans_path_dialog = "Batti percorso di ricerca per i file.\nSepara fra loro i nomi di directory con una virgola." let g:menutrans_tags_dialog = "Batti nome dei file di tag.\nSepara fra loro i nomi di directory con una virgola." @@ -105,67 +110,103 @@ let g:menutrans_tags_dialog = "Batti nom menut F&ile\ Settings &Impostazioni\ file " Boolean options -menut Toggle\ Line\ &Numbering<Tab>:set\ nu! &Numerazione\ \ S/No<Tab>:set\ nu! -menut Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! Numerazione\ relati&Va\ S/No<Tab>:set\ rnu! +menut Toggle\ Line\ &Numbering<Tab>:set\ nu! &Numerazione\ S/No<Tab>:set\ nu! +menut Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! Numerazione\ relati&Va\ S/No<Tab>:set\ rnu! menut Toggle\ &List\ Mode<Tab>:set\ list! Modo\ &List\ S/No<Tab>:set\ list! -menut Toggle\ Line\ &Wrap<Tab>:set\ wrap! Linee\ &Continuate\ S/No<Tab>:set\ wrap! -menut Toggle\ W&rap\ at\ word<Tab>:set\ lbr! A\ capo\ alla\ &Parola\ S/No<Tab>:set\ lbr! -menut Toggle\ &expand-tab<Tab>:set\ et! &Espandi\ tabulazione\ S/No<Tab>:set\ et! -menut Toggle\ &auto-indent<Tab>:set\ ai! Indentazione\ &Automatica\ S/No<Tab>:set ai! -menut Toggle\ &C-indenting<Tab>:set\ cin! Indentazione\ stile\ &C\ S/No<Tab>:set cin! - -" altre opzioni -menut &Shiftwidth &Spazi\ rientranza -menut Soft\ &Tabstop &Tabulazione\ software -menut Te&xt\ Width\.\.\. Lunghe&Zza\ riga\.\.\. -menut &File\ Format\.\.\. Formato\ &File\.\.\. +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! +" -SEP2- +menut &Shiftwidth &Spazi\ rientranza +"menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR> &Spazi\ rientranza.2<Tab>:set\ sw=2\ sw?<CR> +"menut &Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR> &Spazi\ rientranza.3<Tab>:set\ sw=3\ sw?<CR> +"menut &Shiftwidth.4<Tab>:set\ sw=4\ sw?<CR> &Spazi\ rientranza.4<Tab>:set\ sw=4\ sw?<CR> +"menut &Shiftwidth.5<Tab>:set\ sw=5\ sw?<CR> &Spazi\ rientranza.5<Tab>:set\ sw=5\ sw?<CR> +"menut &Shiftwidth.6<Tab>:set\ sw=6\ sw?<CR> &Spazi\ rientranza.6<Tab>:set\ sw=6\ sw?<CR> +"menut &Shiftwidth.8<Tab>:set\ sw=8\ sw?<CR> &Spazi\ rientranza.8<Tab>:set\ sw=8\ sw?<CR> +menut Soft\ &Tabstop &Tabulazione\ software +"menut Soft\ &Tabstop.2<Tab>:set\ sts=2\ sts? &Tabulazione\ software.2<Tab>:set\ sts=2\ sts? +"menut Soft\ &Tabstop.3<Tab>:set\ sts=3\ sts? &Tabulazione\ software.3<Tab>:set\ sts=3\ sts? +"menut Soft\ &Tabstop.4<Tab>:set\ sts=4\ sts? &Tabulazione\ software.4<Tab>:set\ sts=4\ sts? +"menut Soft\ &Tabstop.5<Tab>:set\ sts=5\ sts? &Tabulazione\ software.5<Tab>:set\ sts=5\ sts? +"menut Soft\ &Tabstop.6<Tab>:set\ sts=6\ sts? &Tabulazione\ software.6<Tab>:set\ sts=6\ sts? +"menut Soft\ &Tabstop.8<Tab>:set\ sts=8\ sts? &Tabulazione\ software.8<Tab>:set\ sts=8\ sts? +menut Te&xt\ Width\.\.\. Lunghe&Zza\ riga\.\.\. +menut &File\ Format\.\.\. Formato\ &File\.\.\. let g:menutrans_textwidth_dialog = "Batti nuova lunghezza linea (0 per inibire la formattazione): " +let g:menutrans_fileformat_dialog = "Scegli formato con cui scrivere il file" +let g:menutrans_fileformat_choices = " &Unix \n &Dos \n &Mac \n &Annullare " -let g:menutrans_fileformat_dialog = "Scegli formato con cui scrivere il file" - +menut Show\ C&olor\ Schemes\ in\ Menu Mostra\ Schemi\ C&olore\ in\ Men menut C&olor\ Scheme Schema\ c&Olori -menut default normale -menut DEFAULT NORMALE -menut evening notturno -menut EVENING NOTTURNO -menut morning diurno -menut MORNING DIURNO +menut blue bl +menut darkblue bl\ scuro +menut desert deserto +menut elflord signore\ degli\ elfi +menut evening sera +menut industry industria +menut morning mattino +menut peachpuff pesca menut shine brillante +menut slate ardesia +menut BLUE BL +menut DARKBLUE BL\ SCURO +menut DESERT DESERTO +menut ELFLORD SIGNORE\ DEGLI\ ELFI +menut EVENING SERA +menut INDUSTRY INDUSTRIA +menut MORNING MATTINO +menut PEACHPUFF PESCA menut SHINE BRILLANTE -menut peachpuff pesca -menut PEACHPUF PESCA +menut SLATE ARDESIA -menut &Keymap &Mappa\ tastiera +menut Show\ &Keymaps\ in\ Menu Mostra\ Ma&ppe\ tastiera\ in\ Men +menut &Keymap Ma&ppa\ tastiera -menut None nessuna -menut accents accenti -menut ACCENTS ACCENTI -menut hebrew ebraico -menut HEBREW EBRAICO -menut hebrew_iso-8859-8 ebraico_iso-8859-8 -menut hebrew_cp1255 ebraico_cp1255 -menut hebrew_utf-8 ebraico_utf-8 -menut hebrewp_iso-8859-8 ebraico_p_iso-8859-8 -menut HEBREW- EBRAICO+ -menut hebrewp EBRAICOP -menut HEBREWP EBRAICOP -menut russian-jcuken cirillico-jcuken -menut russian-jcukenwin cirillico-jcuken-win -menut RUSSIAN CIRILLICO -menut RUSSIAN- CIRILLICO- +menut None nessuna +menut accents accenti +menut arabic arabo +menut armenian-eastern armeno-orientale +menut armenian-western armeno-occidentale +menut belarusian-jcuken bielorusso-jcuken +menut czech ceco +menut greek greco +menut hebrew ebraico +menut hebrewp ebraicop +menut magyar ungherese +menut persian persiano +menut serbian serbo +menut serbian-latin serbo-latino +menut slovak slovacco +menut ACCENTS ACCENTI +menut ARABIC ARABO +menut ARMENIAN-EASTERN ARMENO-ORIENTALE +menut ARMENIAN-WESTERN ARMENO-OCCIDENTALE +menut BELARUSIAN-JCUKEN BIELORUSSO-JCUKEN +menut CZECH CECO +menut GREEK GRECO +menut HEBREW EBRAICO +menut HEBREWP EBRAICOP +menut MAGYAR UNGHERESE +menut PERSIAN PERSIANO +menut SERBIAN SERBO +menut SERBIAN-LATIN SERBO-LATINO +menut SLOVAK SLOVACCO menut Select\ Fo&nt\.\.\. Scegli\ &Font\.\.\. -" Menu strumenti programmazione -menut &Tools &Strumenti +" Men strumenti programmazione +menut &Tools &Strumenti menut &Jump\ to\ this\ tag<Tab>g^] &Vai\ a\ questa\ tag<Tab>g^] menut Jump\ &back<Tab>^T Torna\ &Indietro<Tab>^T menut Build\ &Tags\ File Costruisci\ file\ &Tags\ - -" Menu ortografia / Spelling +" -SEP1- +" Men ortografia / Spelling menut &Spelling &Ortografia menut &Spell\ Check\ On Attiva\ &Controllo\ ortografico @@ -180,46 +221,43 @@ menut Set\ language\ to\ "en_ca" Imposta menut Set\ language\ to\ "en_gb" Imposta\ lingua\ a\ "en_gb" menut Set\ language\ to\ "en_nz" Imposta\ lingua\ a\ "en_nz" menut Set\ language\ to\ "en_us" Imposta\ lingua\ a\ "en_us" -menut Set\ language\ to\ "it" Imposta\ lingua\ a\ "it" -menut Set\ language\ to\ "it_it" Imposta\ lingua\ a\ "it_it" -menut Set\ language\ to\ "it_ch" Imposta\ lingua\ a\ "it_ch" menut &Find\ More\ Languages &Trova\ altre\ lingue -" Menu piegature / Fold -if has("folding") - menut &Folding &Piegature - " apri e chiudi piegature - menut &Enable/Disable\ folds<Tab>zi Pi&egature\ S/No<Tab>zi - menut &View\ Cursor\ Line<Tab>zv &Vedi\ linea\ col\ Cursore<Tab>zv - menut Vie&w\ Cursor\ Line\ only<Tab>zMzx Vedi\ &Solo\ linea\ col\ Cursore<Tab>zMzx - menut C&lose\ more\ folds<Tab>zm C&Hiudi\ pi\ piegature<Tab>zm - menut &Close\ all\ folds<Tab>zM &Chiudi\ tutte\ le\ piegature<Tab>zM - menut O&pen\ more\ folds<Tab>zr A&Pri\ pi\ piegature<Tab>zr - menut &Open\ all\ folds<Tab>zR &Apri\ tutte\ le\ piegature<Tab>zR - " metodo piegatura - menut Fold\ Met&hod Meto&Do\ piegatura - menut M&anual &Manuale - menut I&ndent &Nidificazione - menut E&xpression &Espressione\ Reg\. - menut S&yntax &Sintassi - menut &Diff &Differenza - menut Ma&rker Mar&Catura - " crea e cancella piegature - menut Create\ &Fold<Tab>zf Crea\ &Piegatura<Tab>zf - menut &Delete\ Fold<Tab>zd &Leva\ piegatura<Tab>zd - menut Delete\ &All\ Folds<Tab>zD Leva\ &Tutte\ le\ piegature<Tab>zD - " movimenti all'interno delle piegature - menut Fold\ col&umn\ width Larghezza\ piegat&Ure\ in\ colonne -endif " has folding +" Men piegature / Fold +menut &Folding &Piegature +" apri e chiudi piegature +menut &Enable/Disable\ folds<Tab>zi Pi&egature\ S/No<Tab>zi +menut &View\ Cursor\ Line<Tab>zv &Vedi\ linea\ col\ Cursore<Tab>zv +menut Vie&w\ Cursor\ Line\ only<Tab>zMzx Vedi\ &Solo\ linea\ col\ Cursore<Tab>zMzx +menut C&lose\ more\ folds<Tab>zm C&Hiudi\ pi\ piegature<Tab>zm +menut &Close\ all\ folds<Tab>zM &Chiudi\ tutte\ le\ piegature<Tab>zM +menut O&pen\ more\ folds<Tab>zr A&Pri\ pi\ piegature<Tab>zr +menut &Open\ all\ folds<Tab>zR &Apri\ tutte\ le\ piegature<Tab>zR +" -SEP1- +" metodo piegatura +menut Fold\ Met&hod Meto&Do\ piegatura +menut M&anual &Manuale +menut I&ndent &Nidificazione +menut E&xpression &Espressione\ Reg\. +menut S&yntax &Sintassi +menut &Diff &Differenza +menut Ma&rker Mar&Catura -if has("diff") - menut &Diff &Differenza - " - menut &Update &Aggiorna - menut &Get\ Block &Importa\ differenze - menut &Put\ Block &Esporta\ differenze -endif " has diff +" crea e cancella piegature +menut Create\ &Fold<Tab>zf Crea\ &Piegatura<Tab>zf +menut &Delete\ Fold<Tab>zd &Leva\ piegatura<Tab>zd +menut Delete\ &All\ Folds<Tab>zD Leva\ &Tutte\ le\ piegature<Tab>zD +" -SEP2- +" movimenti all'interno delle piegature +menut Fold\ col&umn\ width Larghezza\ piegat&Ure\ in\ colonne +menut &Diff &Differenza +" +menut &Update &Aggiorna +menut &Get\ Block &Importa\ differenze +menut &Put\ Block &Esporta\ differenze + +" -SEP2- menut &Make<Tab>:make Esegui\ &Make<Tab>:make menut &List\ Errors<Tab>:cl Lista\ &Errori<Tab>:cl @@ -235,56 +273,59 @@ menut &Update<Tab>:cwin A&Ggiorna<Tab>: menut &Open<Tab>:copen &Apri<Tab>:copen menut &Close<Tab>:cclose &Chiudi<Tab>:cclose +" -SEP3- menut &Convert\ to\ HEX<Tab>:%!xxd &Converti\ a\ esadecimale<Tab>:%!xxd menut Conve&rt\ back<Tab>:%!xxd\ -r Conve&rti\ da\ esadecimale<Tab>:%!xxd\ -r menut Se&T\ Compiler Impo&Sta\ Compilatore " Buffers / Buffer -menut &Buffers &Buffer +menut &Buffers &Buffer -menut &Refresh\ menu A&ggiorna\ menu -menut &Delete &Elimina +menut &Refresh\ menu A&ggiorna\ men +menut &Delete &Elimina menut &Alternate &Alternato menut &Next &Successivo -menut &Previous &Precedente +menut &Previous &Precedente menut [No\ File] [Nessun\ File] + " Syntax / Sintassi -menut &Syntax &Sintassi -menut &Show\ filetypes\ in\ menu Mo&Stra\ tipi\ di\ file\ nel\ menu -menut Set\ '&syntax'\ only &S\ Attiva\ solo\ \ 'syntax' -menut Set\ '&filetype'\ too &F\ Attiva\ anche\ 'filetype' -menut &Off &Disattiva -menut &Manual &Manuale -menut A&utomatic A&Utomatico -menut on/off\ for\ &This\ file Attiva\ S/No\ su\ ques&To\ file -menut Co&lor\ test Test\ &Colori -menut &Highlight\ test Test\ &Evidenziamento -menut &Convert\ to\ HTML Converti\ ad\ &HTML +menut &Syntax &Sintassi + +menut &Show\ File\ Types\ in\ menu Mo&Stra\ tipi\ di\ file\ nel\ men +menut Set\ '&syntax'\ only &S\ Attiva\ solo\ \ 'syntax' +menut Set\ '&filetype'\ too &F\ Attiva\ anche\ 'filetype' +menut &Off &Disattiva +menut &Manual &Manuale +menut A&utomatic A&Utomatico +menut on/off\ for\ &This\ file Attiva\ S/No\ su\ ques&To\ file +menut Co&lor\ test Test\ &Colori +menut &Highlight\ test Test\ &Evidenziamento +menut &Convert\ to\ HTML Converti\ ad\ &HTML let g:menutrans_no_file = "[Senza nome]" " Window / Finestra -menut &Window &Finestra +menut &Window &Finestra menut &New<Tab>^Wn &Nuova<Tab>^Wn -menut S&plit<Tab>^Ws &Dividi\ lo\ schermo<Tab>^Ws -menut Sp&lit\ To\ #<Tab>^W^^ D&Ividi\ verso\ #<Tab>^W^^ +menut S&plit<Tab>^Ws &Dividi\ lo\ schermo<Tab>^Ws +menut Sp&lit\ To\ #<Tab>^W^^ D&Ividi\ verso\ #<Tab>^W^^ menut Split\ &Vertically<Tab>^Wv Di&Vidi\ verticalmente<Tab>^Wv -menut Split\ File\ E&xplorer Aggiungi\ finestra\ e&Xplorer - -menut &Close<Tab>^Wc &Chiudi<Tab>^Wc -menut Close\ &Other(s)<Tab>^Wo C&Hiudi\ altra(e)<Tab>^Wo - -menut Move\ &To &Muovi\ verso +menut Split\ File\ E&xplorer Aggiungi\ finestra\ e&Xplorer +" -SEP1- +menut &Close<Tab>^Wc &Chiudi<Tab>^Wc +menut Close\ &Other(s)<Tab>^Wo C&Hiudi\ altra(e)<Tab>^Wo +" -SEP2- +menut Move\ &To &Muovi\ verso menut &Top<Tab>^WK &Cima<Tab>^WK -menut &Bottom<Tab>^WJ &Fondo<Tab>^WJ +menut &Bottom<Tab>^WJ &Fondo<Tab>^WJ menut &Left\ side<Tab>^WH Lato\ &Sinistro<Tab>^WH menut &Right\ side<Tab>^WL Lato\ &Destro<Tab>^WL menut Rotate\ &Up<Tab>^WR Ruota\ verso\ l'&Alto<Tab>^WR menut Rotate\ &Down<Tab>^Wr Ruota\ verso\ il\ &Basso<Tab>^Wr - +" -SEP3- menut &Equal\ Size<Tab>^W= &Uguale\ ampiezza<Tab>^W= menut &Max\ Height<Tab>^W_ &Altezza\ massima<Tab>^W_ menut M&in\ Height<Tab>^W1_ A&Ltezza\ minima<Tab>^W1_ @@ -292,63 +333,57 @@ menut Max\ &Width<Tab>^W\| Larghezza\ m menut Min\ Widt&h<Tab>^W1\| Larghezza\ minima<Tab>^W1\| " The popup menu -menut &Undo &Annulla -menut Cu&t &Taglia -menut &Copy &Copia +menut &Undo &Annulla +" -SEP1- +menut Cu&t &Taglia +menut &Copy &Copia menut &Paste &Incolla menut &Delete &Elimina - -menut Select\ Blockwise Seleziona\ in\ blocco +" -SEP2- +menut Select\ Blockwise Seleziona\ in\ blocco menut Select\ &Word Seleziona\ &Parola menut Select\ &Line Seleziona\ &Linea -menut Select\ &Block Seleziona\ &Blocco +menut Select\ &Block Seleziona\ &Blocco menut Select\ &All Seleziona\ t&Utto " The GUI Toolbar / Barra Strumenti -if has("toolbar") - if exists("*Do_toolbar_tmenu") - delfun Do_toolbar_tmenu - endif - fun Do_toolbar_tmenu() - tmenu ToolBar.Open Apri - tmenu ToolBar.Save Salva - tmenu ToolBar.SaveAll Salva Tutto - tmenu ToolBar.Print Stampa - tmenu ToolBar.Undo Annulla - tmenu ToolBar.Redo Ripristina - tmenu ToolBar.Cut Taglia - tmenu ToolBar.Copy Copia - tmenu ToolBar.Paste Incolla - - if !has("gui_athena") - tmenu ToolBar.Find Cerca - tmenu ToolBar.FindNext Cerca Successivo - tmenu ToolBar.FindPrev Cerca Precedente - tmenu ToolBar.Replace Sostituisci - endif - -if 0 " disabled; These are in the Windows menu - tmenu ToolBar.New Nuova finestra - tmenu ToolBar.WinSplit Dividi finestra - tmenu ToolBar.WinMax Massima ampiezza - tmenu ToolBar.WinMin Minima ampiezza - tmenu ToolBar.WinVSplit Dividi verticalmente - tmenu ToolBar.WinMaxWidth Massima larghezza - tmenu ToolBar.WinMinWidth Minima larghezza - tmenu ToolBar.WinClose Chiudi finestra -endif - - tmenu ToolBar.LoadSesn Carica Sessione - tmenu ToolBar.SaveSesn Salva Sessione - tmenu ToolBar.RunScript Esegui Script - tmenu ToolBar.Make Make - tmenu ToolBar.Shell Shell - tmenu ToolBar.RunCtags Esegui Ctags - tmenu ToolBar.TagJump Vai a Tag - tmenu ToolBar.Help Aiuto - tmenu ToolBar.FindHelp Cerca in Aiuto - endfun -endif +menut Open Apri +menut Save Salva +menut SaveAll Salva\ Tutto +menut Print Stampa +" -SEP1- +menut Undo Annulla +menut Redo Ripristina +" -SEP2- +menut Cut Taglia +menut Copy Copia +menut Paste Incolla +" -sep3- +menut Find Cerca +menut FindNext Cerca Successivo +menut FindPrev Cerca Precedente +menut Replace Sostituisci +" -sep4- +menut New Nuova\ finestra +menut WinSplit Dividi\ finestra +menut WinMax Massima\ ampiezza +menut WinMin Minima\ ampiezza +menut WinVSplit Dividi\ verticalmente +menut WinMaxWidth Massima\ larghezza +menut WinMinWidth Minima\ larghezza +menut WinClose Chiudi\ finestra +" -SEP5- +menut LoadSesn Carica\ Sessione +menut SaveSesn Salva\ Sessione +menut RunScript Esegui\ Script +" -SEP6- +menut Make Make +menut Shell Shell +menut RunCtags Esegui\ Ctags +menut TagJump Vai\ a\ Tag +" -SEP7- +menut Help Aiuto +menut FindHelp Cerca\ in\ Aiuto let &cpo = s:keepcpo unlet s:keepcpo
--- a/runtime/lang/menu_ru_ru.vim +++ b/runtime/lang/menu_ru_ru.vim @@ -1,7 +1,7 @@ " 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 " 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 +36,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 +58,7 @@ 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\ &Diff\ With\.\.\. Ср&авнить\ с\.\.\. menutrans Split\ Patched\ &By\.\.\. Сравнить\ с\ применением\ зап&латки\.\.\. "-------------------- menutrans &Print На&печатать @@ -97,12 +97,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 +113,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 +134,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 +210,15 @@ menutrans &Open<Tab>:copen &Открыть<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 +255,8 @@ 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 +menutrans &Left\ Side<Tab>^WH В&лево<Tab>^WH +menutrans &Right\ Side<Tab>^WL В&право<Tab>^WL " " " The popup menu @@ -260,9 +269,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 +291,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
--- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -2,7 +2,7 @@ " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2017 Nov 09 +" Last Change: 2018 May 17 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. @@ -946,7 +946,10 @@ if has("spell") let s:suglist = spellsuggest(w, 10) endif if len(s:suglist) > 0 - let s:changeitem = 'Change\ "' . escape(w, ' .'). '"\ to' + if !exists("g:menutrans_spell_change_ARG_to") + let g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to' + endif + let s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .')) let s:fromword = w let pri = 1 " set 'cpo' to include the <CR> @@ -958,10 +961,16 @@ if has("spell") let pri += 1 endfor - let s:additem = 'Add\ "' . escape(w, ' .') . '"\ to\ Word\ List' + if !exists("g:menutrans_spell_add_ARG_to_word_list") + let g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List' + endif + let s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .')) exe 'anoremenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>' - let s:ignoreitem = 'Ignore\ "' . escape(w, ' .') . '"' + if !exists("g:menutrans_spell_ignore_ARG") + let g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"' + endif + let s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .')) exe 'anoremenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>' anoremenu 1.8 PopUp.-SpellSep- :
--- a/runtime/syntax/cabal.vim +++ b/runtime/syntax/cabal.vim @@ -1,8 +1,22 @@ " Vim syntax file -" Language: Haskell Cabal Build file -" Maintainer: Vincent Berthoux <twinside@gmail.com> -" File Types: .cabal -" Last Change: 2010 May 18 +" Language: Haskell Cabal Build file +" Author: Vincent Berthoux <twinside@gmail.com> +" Maintainer: Marcin Szamotulski <profunctor@pm.me> +" Previous Maintainer: Vincent Berthoux <twinside@gmail.com> +" File Types: .cabal +" Last Change: 15 May 2018 +" v1.5: Incorporated changes from +" https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim +" Use `syn keyword` instead of `syn match`. +" Added cabalStatementRegion to limit matches of keywords, which fixes +" the highlighting of description's value. +" Added cabalVersionRegion to limit the scope of cabalVersionOperator +" and cabalVersion matches. +" Added cabalLanguage keyword. +" Added calbalTitle, cabalAuthor and cabalMaintainer syntax groups. +" Added ! and ^>= operators (calbal 2.0) +" Added build-type keywords +" v1.4: Add benchmark support, thanks to Simon Meier " v1.3: Updated to the last version of cabal " Added more highlighting for cabal function, true/false " and version number. Also added missing comment highlighting. @@ -23,97 +37,205 @@ if exists("b:current_syntax") finish endif -syn keyword cabalCategory Library library Executable executable Flag flag -syn keyword cabalCategory source-repository Source-Repository +" this file uses line continuation +let s:cpo_save = &cpo +set cpo&vim + +" set iskeyword for this syntax script +syn iskeyword @,48-57,192-255,- -syn keyword cabalConditional if else -syn match cabalOperator "&&\|||\|!\|==\|>=\|<=" -syn keyword cabalFunction os arche impl flag -syn match cabalComment /--.*$/ -syn match cabalVersion "\d\+\(.\(\d\)\+\)\+" +" Case sensitive matches +syn case match + +syn keyword cabalConditional if else +syn keyword cabalFunction os arche impl flag +syn match cabalComment /--.*$/ -syn match cabalTruth "\ctrue" -syn match cabalTruth "\cfalse" +" Case insensitive matches +syn case ignore -syn match cabalCompiler "\cghc" -syn match cabalCompiler "\cnhc" -syn match cabalCompiler "\cyhc" -syn match cabalCompiler "\chugs" -syn match cabalCompiler "\chbc" -syn match cabalCompiler "\chelium" -syn match cabalCompiler "\cjhc" -syn match cabalCompiler "\clhc" - +syn keyword cabalCategory contained + \ executable + \ library + \ benchmark + \ test-suite + \ source-repository + \ flag + \ custom-setup +syn match cabalCategoryTitle contained /[^{]*\ze{\?/ +syn match cabalCategoryRegion + \ contains=cabalCategory,cabalCategoryTitle + \ nextgroup=cabalCategory skipwhite + \ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\)\+\s*\%(.*$\|$\)/ +syn keyword cabalTruth true false -syn match cabalStatement "\cauthor" -syn match cabalStatement "\cbranch" -syn match cabalStatement "\cbug-reports" -syn match cabalStatement "\cbuild-depends" -syn match cabalStatement "\cbuild-tools" -syn match cabalStatement "\cbuild-type" -syn match cabalStatement "\cbuildable" -syn match cabalStatement "\cc-sources" -syn match cabalStatement "\ccabal-version" -syn match cabalStatement "\ccategory" -syn match cabalStatement "\ccc-options" -syn match cabalStatement "\ccopyright" -syn match cabalStatement "\ccpp-options" -syn match cabalStatement "\cdata-dir" -syn match cabalStatement "\cdata-files" -syn match cabalStatement "\cdefault" -syn match cabalStatement "\cdescription" -syn match cabalStatement "\cexecutable" -syn match cabalStatement "\cexposed-modules" -syn match cabalStatement "\cexposed" -syn match cabalStatement "\cextensions" -syn match cabalStatement "\cextra-lib-dirs" -syn match cabalStatement "\cextra-libraries" -syn match cabalStatement "\cextra-source-files" -syn match cabalStatement "\cextra-tmp-files" -syn match cabalStatement "\cfor example" -syn match cabalStatement "\cframeworks" -syn match cabalStatement "\cghc-options" -syn match cabalStatement "\cghc-prof-options" -syn match cabalStatement "\cghc-shared-options" -syn match cabalStatement "\chomepage" -syn match cabalStatement "\chs-source-dirs" -syn match cabalStatement "\chugs-options" -syn match cabalStatement "\cinclude-dirs" -syn match cabalStatement "\cincludes" -syn match cabalStatement "\cinstall-includes" -syn match cabalStatement "\cld-options" -syn match cabalStatement "\clicense-file" -syn match cabalStatement "\clicense" -syn match cabalStatement "\clocation" -syn match cabalStatement "\cmain-is" -syn match cabalStatement "\cmaintainer" -syn match cabalStatement "\cmodule" -syn match cabalStatement "\cname" -syn match cabalStatement "\cnhc98-options" -syn match cabalStatement "\cother-modules" -syn match cabalStatement "\cpackage-url" -syn match cabalStatement "\cpkgconfig-depends" -syn match cabalStatement "\cstability" -syn match cabalStatement "\csubdir" -syn match cabalStatement "\csynopsis" -syn match cabalStatement "\ctag" -syn match cabalStatement "\ctested-with" -syn match cabalStatement "\ctype" -syn match cabalStatement "\cversion" +" cabalStatementRegion which limits the scope of cabalStatement keywords, this +" way they are not highlighted in description. +syn region cabalStatementRegion start=+^\s*\(--\)\@<!\k\+\s*:+ end=+:+ +syn keyword cabalStatement contained containedin=cabalStatementRegion + \ default-language + \ default-extensions + \ author + \ branch + \ bug-reports + \ build-depends + \ build-tools + \ build-type + \ buildable + \ c-sources + \ cabal-version + \ category + \ cc-options + \ copyright + \ cpp-options + \ data-dir + \ data-files + \ default + \ description + \ executable + \ exposed-modules + \ exposed + \ extensions + \ extra-tmp-files + \ extra-doc-files + \ extra-lib-dirs + \ extra-libraries + \ extra-source-files + \ exta-tmp-files + \ for example + \ frameworks + \ ghc-options + \ ghc-prof-options + \ ghc-shared-options + \ homepage + \ hs-source-dirs + \ hugs-options + \ include-dirs + \ includes + \ install-includes + \ ld-options + \ license + \ license-file + \ location + \ main-is + \ maintainer + \ manual + \ module + \ name + \ nhc98-options + \ other-extensions + \ other-modules + \ package-url + \ pkgconfig-depends + \ setup-depends + \ stability + \ subdir + \ synopsis + \ tag + \ tested-with + \ type + \ version + \ virtual-modules + +" operators and version operators +syn match cabalOperator /&&\|||\|!/ +syn match cabalVersionOperator contained + \ /!\|==\|\^\?>=\|<=\|<\|>/ +" match version: `[%]\@<!` is to exclude `%20` in http addresses. +syn match cabalVersion contained + \ /[%$_-]\@<!\<\d\+\%(\.\d\+\)*\%(\.\*\)\?\>/ +" cabalVersionRegion which limits the scope of cabalVersion pattern. +syn match cabalVersionRegionA + \ contains=cabalVersionOperator,cabalVersion + \ keepend + \ /\%(==\|\^\?>=\|<=\|<\|>\)\s*\d\+\%(\.\d\+\)*\%(\.\*\)\?\>/ +" version inside `version: ...` +syn match cabalVersionRegionB + \ contains=cabalStatementRegion,cabalVersionOperator,cabalVersion + \ /^\s*\%(cabal-\)\?version\s*:.*$/ + +syn keyword cabalLanguage Haskell98 Haskell2010 + +" title region +syn match cabalName contained /:\@<=.*/ +syn match cabalNameRegion + \ contains=cabalStatementRegion,cabalName + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*name\s*:.*$/ + +" author region +syn match cabalAuthor contained /:\@<=.*/ +syn match cabalAuthorRegion + \ contains=cabalStatementRegion,cabalStatement,cabalAuthor + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*author\s*:.*$/ + +" maintainer region +syn match cabalMaintainer contained /:\@<=.*/ +syn match cabalMaintainerRegion + \ contains=cabalStatementRegion,cabalStatement,cabalMaintainer + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*maintainer\s*:.*$/ + +" license region +syn match cabalLicense contained /:\@<=.*/ +syn match cabalLicenseRegion + \ contains=cabalStatementRegion,cabalStatement,cabalLicense + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*license\s*:.*$/ + +" license-file region +syn match cabalLicenseFile contained /:\@<=.*/ +syn match cabalLicenseFileRegion + \ contains=cabalStatementRegion,cabalStatement,cabalLicenseFile + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*license-file\s*:.*$/ + +" tested-with region with compilers and versions +syn keyword cabalCompiler contained ghc nhc yhc hugs hbc helium jhc lhc +syn match cabalTestedWithRegion + \ contains=cabalStatementRegion,cabalStatement,cabalCompiler,cabalVersionRegionA + \ nextgroup=cabalStatementRegion + \ oneline + \ /^\c\s*tested-with\s*:.*$/ + +" build type keywords +syn keyword cabalBuildType contained + \ simple custom configure +syn match cabalBuildTypeRegion + \ contains=cabalStatementRegion,cabalStatement,cabalBuildType + \ nextgroup=cabalStatementRegion + \ /^\c\s*build-type\s*:.*$/ " Define the default highlighting. " Only when an item doesn't have highlighting yet - -hi def link cabalVersion Number -hi def link cabalTruth Boolean -hi def link cabalComment Comment -hi def link cabalStatement Statement -hi def link cabalCategory Type -hi def link cabalFunction Function -hi def link cabalConditional Conditional -hi def link cabalOperator Operator -hi def link cabalCompiler Constant +hi def link cabalName Title +hi def link cabalAuthor Normal +hi def link cabalMaintainer Normal +hi def link cabalCategoryTitle Title +hi def link cabalLicense Normal +hi def link cabalLicenseFile Normal +hi def link cabalBuildType Keyword +hi def link cabalVersion Number +hi def link cabalTruth Boolean +hi def link cabalComment Comment +hi def link cabalStatement Statement +hi def link cabalLanguage Type +hi def link cabalCategory Type +hi def link cabalFunction Function +hi def link cabalConditional Conditional +hi def link cabalOperator Operator +hi def link cabalVersionOperator Operator +hi def link cabalCompiler Constant let b:current_syntax = "cabal" +let &cpo = s:cpo_save +unlet! s:cpo_save + " vim: ts=8