changeset 14193:c460506890ba

Update runtime files. commit https://github.com/vim/vim/commit/675e8d6adb88d5b38087870dfda51c0205070741 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 24 20:42:01 2018 +0200 Update runtime files.
author Christian Brabandt <cb@256bit.org>
date Sun, 24 Jun 2018 20:45:07 +0200
parents a99aeab81d2a
children 6fbb8dfb3389
files runtime/doc/autocmd.txt runtime/doc/eval.txt runtime/doc/quickref.txt runtime/doc/remote.txt runtime/doc/tags runtime/doc/todo.txt runtime/lang/menu_da.utf-8.vim runtime/syntax/php.vim runtime/syntax/sqloracle.vim src/po/af.po src/po/ca.po src/po/cs.cp1250.po src/po/cs.po src/po/de.po src/po/en_GB.po src/po/eo.po src/po/es.po src/po/fi.po src/po/fr.po src/po/ga.po src/po/it.po src/po/ja.euc-jp.po src/po/ja.po src/po/ja.sjis.po src/po/ko.UTF-8.po src/po/ko.po src/po/nb.po src/po/nl.po src/po/no.po src/po/pl.UTF-8.po src/po/pl.cp1250.po src/po/pl.po src/po/pt_BR.po src/po/ru.cp1251.po src/po/ru.po src/po/sk.cp1250.po src/po/sk.po src/po/sr.po src/po/sv.po src/po/uk.cp1251.po src/po/uk.po src/po/vi.po src/po/zh_CN.UTF-8.po src/po/zh_CN.cp936.po src/po/zh_CN.po src/po/zh_TW.UTF-8.po src/po/zh_TW.po
diffstat 47 files changed, 1218 insertions(+), 1256 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -4,7 +4,7 @@
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
-Automatic commands					*autocommand*
+Automatic commands				*autocommand* *autocommands*
 
 For a basic explanation, see section |40.3| in the user manual.
 
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7053,6 +7053,7 @@ searchpair({start}, {middle}, {end} [, {
 		When evaluating {skip} causes an error the search is aborted
 		and -1 returned.
 		{skip} can be a string, a lambda, a funcref or a partial.
+		Anything else makes the function fail.
 
 		For {stopline} and {timeout} see |search()|.
 
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -957,6 +957,8 @@ Short explanation of each option:		*opti
 'undoreload'	  'ur'	    max nr of lines to save for undo on a buffer reload
 'updatecount'	  'uc'	    after this many characters flush swap file
 'updatetime'	  'ut'	    after this many milliseconds flush swap file
+'varsofttabstop'  'vsts'    a list of number of spaces when typing <Tab>
+'vartabstop'	  'vts'	    a list of number of spaces for <Tab>s
 'verbose'	  'vbs'     give informative messages
 'verbosefile'	  'vfile'   file to write messages in
 'viewdir'	  'vdir'    directory where to store files with :mkview
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -63,7 +63,7 @@ The following command line arguments are
    --servername {name}		Become the server {name}.  When used together
 				with one of the --remote commands: connect to
 				server {name} instead of the default (see
-				below).
+				below).  The name used will be uppercase.
 								*--remote-send*
    --remote-send {keys}		Send {keys} to server and exit.  The {keys}
    				are not mapped.  Special key names are
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1144,6 +1144,8 @@
 'updatetime'	options.txt	/*'updatetime'*
 'ur'	options.txt	/*'ur'*
 'ut'	options.txt	/*'ut'*
+'varsofttabstop'	options.txt	/*'varsofttabstop'*
+'vartabstop'	options.txt	/*'vartabstop'*
 'vb'	options.txt	/*'vb'*
 'vbs'	options.txt	/*'vbs'*
 'vdir'	options.txt	/*'vdir'*
@@ -1160,6 +1162,8 @@
 'virtualedit'	options.txt	/*'virtualedit'*
 'visualbell'	options.txt	/*'visualbell'*
 'vop'	options.txt	/*'vop'*
+'vsts'	options.txt	/*'vsts'*
+'vts'	options.txt	/*'vts'*
 'w1200'	vi_diff.txt	/*'w1200'*
 'w300'	vi_diff.txt	/*'w300'*
 'w9600'	vi_diff.txt	/*'w9600'*
@@ -1354,6 +1358,7 @@
 +toolbar	various.txt	/*+toolbar*
 +unix	eval.txt	/*+unix*
 +user_commands	various.txt	/*+user_commands*
++vartabs	various.txt	/*+vartabs*
 +vertsplit	various.txt	/*+vertsplit*
 +viminfo	various.txt	/*+viminfo*
 +virtualedit	various.txt	/*+virtualedit*
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -43,32 +43,19 @@ Prompt buffer:
 - delay next prompt until plugin gives OK?
 
 Terminal debugger:
-- Using terminal window: after "cont" in gdb window CTRL-C interrupts, but
-  after :Continue it does not.  Mode of UI is changed?  :Stop does work.
-- patch from Christian to handle changing 'background'
-  and a patch to show breakpoint nr in sign. (June 14)
 - Make prompt-buffer variant work better.
+- When only gdb window exists, on "quit" edit another buffer.
 - Termdebug does not work when Vim was build with mzscheme: gdb hangs just
   after "run".  Everything else works, including communication channel.  Not
   initializing mzscheme avoid the problem, thus it's not some #ifdef.
-- Show breakpoint number in the sign? (Uri Moszkowicz, 2018 Jun 13, #3007)
-- Allow for users to create their own gdb mappings.  Perhaps by making the gdb
-  buffer global?  (Uri Moszkowicz, #3012) Or with a function to send a command
-  to gdb.
 
 Terminal emulator window:
 - With a vertical split only one window is updated. (Linwei, 2018 Jun 2,
   #2977)
-- When typing : at the more prompt, instead of entering a new Vim command, the
-  : is inserted in the terminal window.  Should skip terminal_loop here.
-  ()
 - When pasting should call vterm_keyboard_start_paste(), e.g. when using
   K_MIDDLEMOUSE, calling insert_reg().
 - Users expect parsing the :term argument like a shell does, also support
   single quotes.  E.g. with:  :term grep 'alice says "hello"'  (#1999)
-- When running a shell in a terminal to run Vim tests, CTRL-W : the command
-  line keeps getting cleard.  Doing the same in another window is OK. (Jason
-  Franklin, 2018 Jun 17)
 - How to access selection in Terminal running a shell? (damnskippy, 2018 May
   27, #29620  When terminal doesn't use the mouse, use modeless selection.
 - Win32: Redirecting input does not work, half of Test_terminal_redir_file()
@@ -102,26 +89,11 @@ Errors found with random data:
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-Patch to make "is" and "as" work better. (Jason Franklin, 2018 May 19)
-
-Patch to add tests for user and language completion. (Dominique Pelle, 2018
-Jun 2, #2978)  typo wk -> we
-Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
-Aug 16)
-
-Patch to add tests for libcall() and libcallnr(). (Dominique Pelle, #2982)
-
-Patch to fix that v:shell_error is always zero when using terminal for shell
-command. (Ichizok, 2018 Jun 8, #2994)
-
-Patch to make test for terminal out&error more reliable. (Ichizok, 2018 Jun 8,
-#2991)
-
 Patch to fix duplicate entry in tagfiles() and add a test. (Dominique Pelle,
 #2979)
 
 Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
-Related to bracketed paste.
+Related to bracketed paste.  I cannot reproduce it.
 
 Using ":file" in quickfix window during an autocommand doesn't work. 
 (Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
@@ -134,6 +106,15 @@ Patch for xterm and vt320 builtin termca
 Patch to add more testing for :cd command. (Dominique Pelle, 2018 May 30,
 #2972)
 
+Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan
+Shafran, 2018 Jun 23, #3072)
+
+Patch to set w_curswant when setting the cursor in language interfaces.
+(David Hotham, 2018 Jun 22, #3060)
+
+Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin,
+2018 May 30)
+
 Patch to make mode() return something different for Normal mode when coming
 from Insert mode with CTRL-O. (#3000)
 
@@ -158,6 +139,13 @@ Tests failing for "make testgui" with GT
 - Test_setbufvar_options()
 - Test_exit_callback_interval()
 
+Patch to stack and pop the window title and icon. (IWAMOTO Kouichi, 2018 Jun
+22, #3059)
+8   For xterm need to open a connection to the X server to get the window
+    title, which can be slow.  Can also get the title with "<Esc>[21t", no
+    need to use X11 calls.  This returns "<Esc>]l{title}<Esc>\".
+Using title stack probably works better.
+
 Make balloon_show() work outside of 'balloonexpr'?  Users expect it to work:
 #2948. (related to #1512?)
 On Win32 it stops showing, because showState is already ShS_SHOWING.
@@ -198,9 +186,6 @@ deleting autocmds, not when adding them.
 Quickfix window height is not kept with a vertical split. (Lifepillar, 2018
 Jun 10, #2998)
 
-Patch for variable tabstops.  On github (Christian Brabandt, 2014 May 15)
-Update 2018 March 12, #2711
-
 Improve the installer for MS-Windows.  There are a few alternatives:
 - Add silent install option. (Shane Lee, #751)
 - Installer from Cream (Steve Hall).
@@ -321,6 +306,8 @@ highlighted. (van-de-bugger, 2018 Jan 23
 Patch to parse ":line" in tags file and use it for search. (Daniel Hahler,
 #2546)  Fixes #1057.  Missing a test.
 
+":file" does not show anything when 'shortmess' contains 'F'. (#3070)
+
 Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4)
 
 No profile information for function that executes ":quit". (Daniel Hahler,
@@ -463,6 +450,10 @@ The ++ options for the :edit command are
 When recovering a file, put the swap file name in b:recovered_swapfile.  Then
 a command can delete it.
 
+When a swap file exists, is not for a running process, is from the same
+machine and recovering results in the same text, we could silently delete it.
+#1237
+
 Overlong utf-8 sequence is displayed wrong. (Harm te Hennepe, 2017 Sep 14,
 #2089)  Patch with possible solution by Björn Linse.
 
@@ -3430,9 +3421,6 @@ 7   When compiled with "xterm_clipboard"
 7   X11: Some people prefer to use CLIPBOARD instead of PRIMARY for the normal
     selection.  Add an "xclipboard" argument to the 'clipboard' option? (Mark
     Waggoner)
-8   For xterm need to open a connection to the X server to get the window
-    title, which can be slow.  Can also get the title with "<Esc>[21t", no
-    need to use X11 calls.  This returns "<Esc>]l{title}<Esc>\".
 6   When the xterm reports the number of colors, a redraw occurs.  This is
     annoying on a slow connection.  Wait for the xterm to report the number of
     colors before drawing the screen.  With a timeout.
new file mode 100644
--- /dev/null
+++ b/runtime/lang/menu_da.utf-8.vim
@@ -0,0 +1,372 @@
+" Menu Translations:	Danish / Dansk
+" Maintainer:		scootergrisen
+" Last Change:		2018 Jun 23
+
+" 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
+menut &Help	Hjælp
+
+menut &Overview<Tab><F1>	Overblik<Tab><F1>
+menut &User\ Manual	Brugermanual
+menut &How-to\ links	How-to-links
+menut &Find\.\.\.	Find\.\.\.
+" -SEP1-
+menut &Credits	Anerkendelser
+menut Co&pying	Kopiering
+menut &Sponsor/Register	Sponsorer/registrer
+menut O&rphans	Forældreløse\ børn
+" -SEP2-
+menut &Version	Version
+menut &About	Om
+
+let g:menutrans_help_dialog = "Indtast en kommando eller ord for at finde hjælp om:\n\nStart med i_ for kommandoer til inputtilstand (f.eks.: i_CTRL-X)\nStart med c_ for kommandoer til redigering af kommandolinje (f.eks.: c_<Del>)\nStart med ' for et tilvalgsnavn (f.eks.: 'shiftwidth')"
+
+" File menu
+menut &File	Fil
+
+menut &Open\.\.\.<Tab>:e	Åbn\.\.\.<Tab>:e
+menut Sp&lit-Open\.\.\.<Tab>:sp	Opdel-åbn\.\.\.<Tab>:sp
+menut Open\ Tab\.\.\.<Tab>:tabnew	Åbn\ faneblad\.\.\.<Tab>:tabnew
+menut &New<Tab>:enew	Ny<Tab>:enew
+menut &Close<Tab>:close	Luk<Tab>:close
+" -SEP1-
+menut &Save<Tab>:w	Gem<Tab>:w
+menut Save\ &As\.\.\.<Tab>:sav	Gem\ som\.\.\.<Tab>:sav
+" -SEP2-
+menut Split\ &Diff\ with\.\.\.	Opdel\ diff\ med\.\.\.
+menut Split\ Patched\ &By\.\.\.	Opdel\ "patchet\ af"\.\.\.
+" -SEP3-
+menut &Print	Udskriv
+" -SEP4-
+menut Sa&ve-Exit<Tab>:wqa	Gem-afslut
+menut E&xit<Tab>:qa	Afslut
+
+" Edit menu
+menut &Edit	Rediger
+
+menut &Undo<Tab>u	Fortryd<Tab>u
+menut &Redo<Tab>^R	Omgør<Tab>^R
+menut Rep&eat<Tab>\.	Gentag<Tab>\.
+" -SEP1-
+menut Cu&t<Tab>"+x	Klip<Tab>"+x
+menut &Copy<Tab>"+y	Kopiér<Tab>"+y
+menut &Paste<Tab>"+gP	Indsæt<Tab>"+gP
+menut Put\ &Before<Tab>[p	Indsæt\ inden\ (put)<Tab>[p
+menut Put\ &After<Tab>]p	Indsæt\ efter\ (put)<Tab>]p
+menut &Delete<Tab>x	Slet<Tab>x
+menut &Select\ all<Tab>ggVG	Markér\ alt<Tab>ggVG
+" -SEP2-
+menut &Find\.\.\.	Find\.\.\.
+menut &Find\.\.\.<Tab>/	Find\.\.\.<Tab>/
+menut Find\ and\ Rep&lace\.\.\.	Find\ og\ erstat\.\.\.
+menut Find\ and\ Rep&lace\.\.\.<Tab>:%s	Find\ og\ erstat\.\.\.<Tab>:%s
+menut Find\ and\ Rep&lace\.\.\.<Tab>:s	Find\ og\ erstat\.\.\.<Tab>:s
+" -SEP3-
+menut Settings\ &Window	Indstillinger-vindue
+menut Startup\ &Settings	Opstartsindstillinger
+menut &Global\ Settings	Globale\ indstillinger
+menut Question	Spørgsmål
+
+" Edit
+
+menut Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Fremhævning\ af\ mønster\ til/fra<Tab>:set\ hls!
+menut Toggle\ &Ignoring\ Case<Tab>:set\ ic!	Ignorerer\ "forskel\ på\ store\ og\ små\ bogstaver"\ til/fra<Tab>:set\ ic!
+menut Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Viser\ matchende\ par\ til/fra<Tab>:set\ sm!
+
+menut &Context\ lines	Kontekstlinjer
+
+menut &Virtual\ Edit	Virtuel\ redigering
+menut Never	Aldrig
+menut Block\ Selection	Blokmarkering
+menut Insert\ mode	Indsæt-tilstand
+menut Block\ and\ Insert	Blok\ og\ indsæt
+menut Always	Altid
+
+menut Toggle\ Insert\ &Mode<Tab>:set\ im!	Indsæt-tilstand\ til/fra<Tab>:set\ im!
+menut Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!	Vi-kompatibel\ til/fra<Tab>:set\ cp!
+menut Search\ &Path\.\.\.	Søgesti\.\.\.
+menut Ta&g\ Files\.\.\.	Tag-filer\.\.\.
+" -SEP1-
+menut Toggle\ &Toolbar	Værktøjslinje\ til/fra
+menut Toggle\ &Bottom\ Scrollbar	Nederste\ rullebjælke\ til/fra
+menut Toggle\ &Left\ Scrollbar	Venstre\ rullebjælke\ til/fra
+menut Toggle\ &Right\ Scrollbar	Højre\ rullebjælke\ til/fra
+
+let g:menutrans_path_dialog = "Indtast søgesti til filer.\nSeparer mappenavne med et komma."
+let g:menutrans_tags_dialog = "Indtast navne på tag-filer.\nSeparer navnene med et komma."
+
+" Edit/File Settings
+menut F&ile\ Settings	Filindstillinger
+
+" Boolean options
+menut Toggle\ Line\ &Numbering<Tab>:set\ nu!	Linjenummerering\ til/fra<Tab>:set\ nu!
+menut Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Relativ\ linjenummerering\ til/fra<Tab>:set\ rnu!
+menut Toggle\ &List\ Mode<Tab>:set\ list!	Listetilstand\ til/fra<Tab>:set\ list!
+menut Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	Linjeombrydning\ til/fra<Tab>:set\ wrap!
+menut Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!	Ombrydning\ ved\ ord\ til/fra<Tab>:set\ lbr!
+menut Toggle\ Tab\ &expanding<Tab>:set\ et!	Udvidelse\ af\ tabulator\ til/fra<Tab>:set\ et!
+menut Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Automatisk\ indrykning\ til/fra<Tab>:set\ ai!
+menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Indrykning\ i\ &C-stil\ til/fra<Tab>:set\ cin!
+" -SEP2-
+menut &Shiftwidth	"Shiftwidth"
+" menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR>	"Shiftwidth".2<Tab>:set\ sw=2\ sw?<CR>
+" menut &Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR>	"Shiftwidth".3<Tab>:set\ sw=3\ sw?<CR>
+" menut &Shiftwidth.4<Tab>:set\ sw=4\ sw?<CR>	"Shiftwidth".4<Tab>:set\ sw=4\ sw?<CR>
+" menut &Shiftwidth.5<Tab>:set\ sw=5\ sw?<CR>	"Shiftwidth".5<Tab>:set\ sw=5\ sw?<CR>
+" menut &Shiftwidth.6<Tab>:set\ sw=6\ sw?<CR>	"Shiftwidth".6<Tab>:set\ sw=6\ sw?<CR>
+" menut &Shiftwidth.8<Tab>:set\ sw=8\ sw?<CR>	"Shiftwidth".8<Tab>:set\ sw=8\ sw?<CR>
+menut Soft\ &Tabstop	Blødt\ tabulatorstop
+" menut Soft\ &Tabstop.2<Tab>:set\ sts=2\ sts?	Blødt\ "Tabstop".2<Tab>:set\ sts=2\ sts?
+" menut Soft\ &Tabstop.3<Tab>:set\ sts=3\ sts?	Blødt\ "Tabstop".3<Tab>:set\ sts=3\ sts?
+" menut Soft\ &Tabstop.4<Tab>:set\ sts=4\ sts?	Blødt\ "Tabstop".4<Tab>:set\ sts=4\ sts?
+" menut Soft\ &Tabstop.5<Tab>:set\ sts=5\ sts?	Blødt\ "Tabstop".5<Tab>:set\ sts=5\ sts?
+" menut Soft\ &Tabstop.6<Tab>:set\ sts=6\ sts?	Blødt\ "Tabstop".6<Tab>:set\ sts=6\ sts?
+" menut Soft\ &Tabstop.8<Tab>:set\ sts=8\ sts?	Blødt\ "Tabstop".8<Tab>:set\ sts=8\ sts?
+menut Te&xt\ Width\.\.\.	Tekstbredde\.\.\.
+menut &File\ Format\.\.\.	Filformat\.\.\.
+
+let g:menutrans_textwidth_dialog = "Indtast ny tekstbredde (0 for at deaktivere formatering): "
+let g:menutrans_fileformat_dialog = "Vælg format til skrivning af filen"
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Annuller"
+
+menut Show\ C&olor\ Schemes\ in\ Menu	Vis\ farveskemaer\ i\ menu
+menut C&olor\ Scheme	Farveskema
+
+" menut blue			blå
+" menut darkblue		mørkeblå
+" menut desert		ørken
+" menut elflord		elverherre
+" menut evening		aften
+" menut industry		industri
+" menut morning		morgen
+" menut peachpuff	fersken
+" menut shine		skær
+" menut slate		skiffer
+" menut default		standard
+" menut torte		tærte
+" menut zellner		???
+" menut delek		???
+" menut koehler		???
+" menut murphy		???
+" menut pablo		???
+" menut ron			ron
+
+menut Show\ &Keymaps\ in\ Menu	Vis\ tastaturlayouts\ i\ menu
+menut &Keymap	Tastaturlayout
+
+menut None	Intet
+" menut accents	Diakritiske\ tegn
+" menut arabic	arabisk
+" menut armenian-eastern	armensk\ (østlig)
+" menut armenian-western	armensk\ (vestlig)
+" menut belarusian-jcuken	hviderussisk"\ [belarusian-jcuken]"
+" menut czech	tjekkisk
+" menut greek	græsk
+" menut hebrew	hebraisk
+" menut hebrewp	hebraisk"\ [hebrewp]"
+" menut magyar	ungarsk
+" menut persian	persisk
+" menut serbian	serbisk
+" menut serbian-latin	serbisk\ (latinsk)
+" menut slovak	slovakisk
+
+menut Select\ Fo&nt\.\.\.	Vælg\ skrifttype\.\.\.
+
+" Programming menu
+menut &Tools	Værktøjer
+
+menut &Jump\ to\ this\ tag<Tab>g^]	Hop\ til\ tagget<Tab>g^]
+menut Jump\ &back<Tab>^T	Hop\ tilbage<Tab>^T
+menut Build\ &Tags\ File	Build\ tags-fil
+" -SEP1-
+" Tools.Spelling Menu
+menut &Spelling	Stavning
+menut &Spell\ Check\ On	Stavekontrol\ til
+menut Spell\ Check\ &Off	Stavekontrol\ fra
+menut To\ &Next\ error<Tab>]s	Til\ næste\ fejl<Tab>]s
+menut To\ &Previous\ error<Tab>[s	Til\ forrige\ fejl<Tab>[s
+menut Suggest\ &Corrections<Tab>z=	Foreslå\ rettelse<Tab>z=
+menut &Repeat\ correction<Tab>:spellrepall	Gentag\ rettelse<Tab>:spellrepall
+menut Set\ language\ to\ "en"	Sæt\ sprog\ til\ "en"
+menut Set\ language\ to\ "en_au"	Sæt\ sprog\ til\ "en_au"
+menut Set\ language\ to\ "en_ca"	Sæt\ sprog\ til\ "en_ca"
+menut Set\ language\ to\ "en_gb"	Sæt\ sprog\ til\ "en_gb"
+menut Set\ language\ to\ "en_nz"	Sæt\ sprog\ til\ "en_nz"
+menut Set\ language\ to\ "en_us"	Sæt\ sprog\ til\ "en_us"
+menut &Find\ More\ Languages	Find\ flere\ sprog
+
+" Tools.Fold Menu
+menut &Folding	Foldning
+" open close folds
+menut &Enable/Disable\ folds<Tab>zi	Aktivér/deaktivér\ sammenfoldninger<Tab>zi
+menut &View\ Cursor\ Line<Tab>zv	Vis\ markørlinje<Tab>zv
+menut Vie&w\ Cursor\ Line\ only<Tab>zMzx	Vis\ kun\ markørlinje<Tab>zMzx
+menut C&lose\ more\ folds<Tab>zm	Luk\ flere\ sammenfoldninger<Tab>zm
+menut &Close\ all\ folds<Tab>zM	Luk\ alle\ sammenfoldninger<Tab>zM
+menut O&pen\ more\ folds<Tab>zr	Åbn\ flere\ sammenfoldninger<Tab>zr
+menut &Open\ all\ folds<Tab>zR	Åbn\ alle\ sammenfoldninger<Tab>zR
+" fold method
+" -SEP1-
+menut Fold\ Met&hod	Sammenfoldningsmetode
+menut M&anual	Manuelt
+menut I&ndent	Indryk
+menut E&xpression	Udtryk
+menut S&yntax	Syntaks
+menut &Diff	Diff
+menut Ma&rker	Markør
+" create and delete folds
+menut Create\ &Fold<Tab>zf	Opret\ sammenfoldning<Tab>zf
+menut &Delete\ Fold<Tab>zd	Slet\ sammenfoldning<Tab>zd
+menut Delete\ &All\ Folds<Tab>zD	Slet\ alle\ sammenfoldninger<Tab>zD
+" moving around in folds
+" -SEP2-
+menut Fold\ col&umn\ width	Kolonnebredde\ for\ sammenfoldning
+
+menut &Diff	Diff
+"
+menut &Update	Opdater
+menut &Get\ Block	Hent\ blok\ (get)
+menut &Put\ Block	Indsæt\ blok\ (put)
+
+" -SEP2-
+menut &Make<Tab>:make	&Make<Tab>:make
+
+menut &List\ Errors<Tab>:cl	Oplist\ fejl<Tab>:cl
+menut L&ist\ Messages<Tab>:cl!	Oplist\ meddelelser<Tab>:cl!
+menut &Next\ Error<Tab>:cn	Næste\ fejl<Tab>:cn
+menut &Previous\ Error<Tab>:cp	Forrige\ fejl<Tab>:cp
+menut &Older\ List<Tab>:cold	Ældre\ liste<Tab>:cold
+menut N&ewer\ List<Tab>:cnew	Nyere\ liste<Tab>:cnew
+
+menut Error\ &Window	Fejl-vindue
+
+menut &Update<Tab>:cwin	Opdater<Tab>:cwin
+menut &Open<Tab>:copen	Åbn<Tab>:copen
+menut &Close<Tab>:cclose	Luk<Tab>:cclose
+
+" -SEP3-
+menut &Convert\ to\ HEX<Tab>:%!xxd	Konvertér\ til\ HEX<Tab>:%!xxd
+menut Conve&rt\ back<Tab>:%!xxd\ -r	Konvertér\ tilbage<Tab>:%!xxd\ -r
+
+menut Se&T\ Compiler	Sæt\ kompiler
+
+" Buffers menu
+menut &Buffers	Buffere
+
+menut &Refresh\ menu	Genopfrisk\ menu
+menut &Delete	Slet
+menut &Alternate	Skift
+menut &Next	Næste
+menut &Previous	Forrige
+menut [No\ File]	[Ingen\ fil]
+
+" Syntax menu
+menut &Syntax	Syntaks
+
+menut &Show\ File\ Types\ in\ menu	Vis\ filtyper\ i\ menu
+menut Set\ '&syntax'\ only	Sæt\ kun\ 'syntax'
+menut Set\ '&filetype'\ too	Sæt\ også\ 'filetype'
+menut &Off	Fra
+menut &Manual	Manuelt
+menut A&utomatic	Automatisk
+menut On/Off\ for\ &This\ File	Til/fra\ for\ denne\ fil
+menut Co&lor\ test	Farvetest
+menut &Highlight\ test	Fremhævningstest
+menut &Convert\ to\ HTML	Konvertér\ til\ HTML
+
+let g:menutrans_no_file = "[Ingen fil]"
+
+" Window menu
+menut &Window	Vindue
+
+menut &New<Tab>^Wn	Nyt<Tab>^Wn
+menut S&plit<Tab>^Ws	Opdel<Tab>^Ws
+menut Sp&lit\ To\ #<Tab>^W^^	Opdel\ til\ #<Tab>^W^^
+menut Split\ &Vertically<Tab>^Wv	Opdel\ lodret<Tab>^Wv
+menut Split\ File\ E&xplorer	Opdel\ filbrowser
+" -SEP1-
+menut &Close<Tab>^Wc	Luk<Tab>^Wc
+menut Close\ &Other(s)<Tab>^Wo	Luk\ andre<Tab>^Wo
+" -SEP2-
+menut Move\ &To	Flyt\ til
+
+menut &Top<Tab>^WK	Øverst<Tab>^WK
+menut &Bottom<Tab>^WJ	Nederst<Tab>^WJ
+menut &Left\ side<Tab>^WH	Venstre\ side<Tab>^WH
+menut &Right\ side<Tab>^WL	Højre\ side<Tab>^WL
+menut Rotate\ &Up<Tab>^WR	Roter\ op<Tab>^WR
+menut Rotate\ &Down<Tab>^Wr	Roter\ ned<Tab>^Wr
+" -SEP3-
+menut &Equal\ Size<Tab>^W=	Samme\ størrelse<Tab>^W=
+menut &Max\ Height<Tab>^W_	Maks\.\ højde<Tab>^W_
+menut M&in\ Height<Tab>^W1_	Min\.\ højde<Tab>^W1_
+menut Max\ &Width<Tab>^W\|	Maks\.\ bredde<Tab>^W\|
+menut Min\ Widt&h<Tab>^W1\|	Min\.\ bredde<Tab>^W1\|
+
+" The popup menu
+menut &Undo	Fortryd
+" -SEP1-
+menut Cu&t	Klip
+menut &Copy	Kopiér
+menut &Paste	Indsæt
+menut &Delete	Slet
+" -SEP2-
+menut Select\ Blockwise		Markér\ blokvis
+menut Select\ &Word	Markér\ ord
+
+menut Select\ &Sentence	Markér\ sætning
+menut Select\ Pa&ragraph	Markér\ afsnit
+
+menut Select\ &Line	Markér\ linje
+menut Select\ &Block		Markér\ blok
+menut Select\ &All	Markér\ alt
+
+" The GUI toolbar
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+  tmenu ToolBar.Open		Åbn fil
+  tmenu ToolBar.Save		Gem nuværende fil
+  tmenu ToolBar.SaveAll		Gem alle filer
+  tmenu ToolBar.Print		Udskriv
+  tmenu ToolBar.Undo		Fortryd
+  tmenu ToolBar.Redo		Omgør
+  tmenu ToolBar.Cut		Klip til udklipsholder
+  tmenu ToolBar.Copy		Kopiér til udklipsholder
+  tmenu ToolBar.Paste		Indsæt fra udklipsholder
+  if !has("gui_athena")
+    tmenu ToolBar.Replace	Find/erstat...
+    tmenu ToolBar.FindNext	Find næste
+    tmenu ToolBar.FindPrev	Find forrige
+  endif
+  tmenu ToolBar.LoadSesn	Vælg en session som skal indlæses
+  tmenu ToolBar.SaveSesn	Gem nuværende session
+  tmenu ToolBar.RunScript	Vælg et Vim-script som skal køres
+  tmenu ToolBar.Make		Make nuværende projekt (:make)
+  tmenu ToolBar.RunCtags	Build tags i nuværende mappetræ (!ctags -R .)
+  tmenu ToolBar.TagJump		Hop til tag under markør
+  tmenu ToolBar.Help		Vim hjælp
+  tmenu ToolBar.FindHelp	Søg i Vim hjælp
+  endfun
+endif
+
+let g:menutrans_set_lang_to = "Sæt sprog til"
+let g:menutrans_spell_change_ARG_to = 'Ændr "%s" til'
+let g:menutrans_spell_add_ARG_to_word_list = 'Tilføj "%s" til ordliste'
+let g:menutrans_spell_ignore_ARG = 'Ignorer "%s"'
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: set sw=2 :
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5/7
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: May 12, 2018
+" Last Change: Jun 20, 2018
 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -446,7 +446,7 @@ if exists("php_folding") && php_folding=
   syn match phpException "\(\s\|^\)catch\(\s\+.*}\)\@=" contained
   syn match phpException "\(\s\|^\)finally\(\s\+.*}\)\@=" contained
 
-  set foldmethod=syntax
+  setlocal foldmethod=syntax
   syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop
   syn region phpFoldFunction matchgroup=Storageclass start="^\z(\s*\)\(abstract\s\+\|final\s\+\|private\s\+\|protected\s\+\|public\s\+\|static\s\+\)*function\s\([^};]*$\)\@="rs=e-9 matchgroup=Delimiter end="^\z1}" contains=@phpClFunction,phpFoldHtmlInside,phpFCKeyword contained transparent fold extend
   syn region phpFoldFunction matchgroup=Define start="^function\s\([^};]*$\)\@=" matchgroup=Delimiter end="^}" contains=@phpClFunction,phpFoldHtmlInside contained transparent fold extend
@@ -460,7 +460,7 @@ else
   syn keyword phpException catch throw try finally contained
   syn keyword phpStorageClass final global private protected public static contained
   if exists("php_folding") && php_folding==2
-    set foldmethod=syntax
+    setlocal foldmethod=syntax
     syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop
     syn region phpParent matchgroup=Delimiter start="{" end="}" contained contains=@phpClFunction,phpFoldHtmlInside transparent fold
   endif
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -4,13 +4,15 @@
 " Repository:   https://github.com/chrisbra/vim-sqloracle-syntax
 " License:      Vim
 " Previous Maintainer:	Paul Moore
-" Last Change:	2018 May 13
+" Last Change:	2018 June 24
 
 " Changes:
 " 02.04.2016: Support for when keyword
 " 03.04.2016: Support for join related keywords
 " 22.07.2016: Support Oracle Q-Quote-Syntax
 " 25.07.2016: Support for Oracle N'-Quote syntax
+" 22.06.2018: Remove skip part for sqlString (do not escape strings)
+" (https://web.archive.org/web/20150922065035/https://mariadb.com/kb/en/sql-99/character-string-literals/)
 
 if exists("b:current_syntax")
   finish
@@ -50,12 +52,14 @@ syn keyword sqlStatement truncate
 " next ones are contained, so folding works.
 syn keyword sqlStatement create update alter select insert contained
 
-syn keyword sqlType	boolean char character date float integer long
-syn keyword sqlType	mlslabel number raw rowid varchar varchar2 varray
+syn keyword sqlType	bfile blob boolean char character clob date datetime
+syn keyword sqlType	dec decimal float int integer long mlslabel nchar
+syn keyword sqlType	nclob number numeric nvarchar2 precision raw rowid
+syn keyword sqlType	smallint real timestamp urowid varchar varchar2 varray
 
 " Strings:
-syn region sqlString	matchgroup=Quote start=+n\?"+  skip=+\\\\\|\\"+  end=+"+
-syn region sqlString	matchgroup=Quote start=+n\?'+  skip=+\\\\\|\\'+  end=+'+
+syn region sqlString	matchgroup=Quote start=+n\?"+     end=+"+
+syn region sqlString	matchgroup=Quote start=+n\?'+     end=+'+
 syn region sqlString	matchgroup=Quote start=+n\?q'\z([^[(<{]\)+    end=+\z1'+
 syn region sqlString	matchgroup=Quote start=+n\?q'<+   end=+>'+
 syn region sqlString	matchgroup=Quote start=+n\?q'{+   end=+}'+
@@ -68,6 +72,7 @@ syn match sqlNumber	"-\=\<\d*\.\=[0-9_]\
 " Comments:
 syn region sqlComment	start="/\*"  end="\*/" contains=sqlTodo,@Spell fold 
 syn match sqlComment	"--.*$" contains=sqlTodo,@Spell
+syn match sqlComment "^rem.*$" contains=sqlTodo,@Spell
 
 " Setup Folding:
 " this is a hack, to get certain statements folded.
@@ -129,15 +134,15 @@ syn keyword sqlFunction	xmlparse xmlpatc
 syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
-hi def link Quote            Special
-hi def link sqlComment	Comment
-hi def link sqlFunction	Function
-hi def link sqlKeyword	sqlSpecial
-hi def link sqlNumber	Number
-hi def link sqlOperator	sqlStatement
-hi def link sqlSpecial	Special
+hi def link Quote		Special
+hi def link sqlComment		Comment
+hi def link sqlFunction		Function
+hi def link sqlKeyword		sqlSpecial
+hi def link sqlNumber		Number
+hi def link sqlOperator		sqlStatement
+hi def link sqlSpecial		Special
 hi def link sqlStatement	Statement
-hi def link sqlString	String
+hi def link sqlString		String
 hi def link sqlType		Type
 hi def link sqlTodo		Todo
 
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -1561,7 +1561,7 @@ msgstr "E216: Geen sodanige groep of geb
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Outobevele ---"
@@ -1576,7 +1576,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: outobevele te diep genes"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s outobevele vir \"%s\""
 
 #, c-format
@@ -2303,11 +2303,11 @@ msgstr "-q [foutler]   bewerk ler met eerste fout"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
-"gebruik:"
+"Gebruik:"
 
 msgid " vim [arguments] "
 msgstr " vim [parameters] "
@@ -3987,7 +3987,7 @@ msgstr "E65: Ongeldige tru-verwysing"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( nie hier toegelaat nie"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 e.a. nie hier toegelaat nie"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -2003,7 +2003,7 @@ msgstr "E216: No existeix tal grup o esd
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr "\n--- Ordres automtiques ---"
 
 #, c-format
@@ -2023,7 +2023,7 @@ msgstr "E218: nivell d'imbricaci d'ordres automtiques massa elevat"
 # todo: substitucions
 # <event> ... <pattern>
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "Ordres automtiques de %s per a \"%s\""
 
 #, c-format
@@ -2906,7 +2906,7 @@ msgstr "-q [ftxerrors]  edita el fitxer 
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4658,8 +4658,8 @@ msgstr "E55: %s) desequilibrat"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( no est perms aqu"
 
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 et al. no estan permesos aqu"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: \\z1 - \\z9 no estan permesos aqu"
 
 #, c-format
 msgid "E69: Missing ] after %s%%["
@@ -4770,8 +4770,8 @@ msgstr "E869: (NFA) Operador desconegut 
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA) Error en llegir els lmits de repetici"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA) Diverses especificacions de multiplicitat seguides !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA) Diverses especificacions de multiplicitat seguides"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA) Sobren '('"
@@ -4782,7 +4782,7 @@ msgstr "E879: (NFA) Sobren \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA) parntesi sense tancar"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) No es poden treure elements de la pila !"
 
 msgid ""
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -1359,7 +1359,7 @@ msgstr "E216: Udlost %s neexistuje"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Automatick pkazy ---"
@@ -1374,7 +1374,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: vnoen automatickho pkazu pli hlubok"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s automatick pkazy pro \"%s\""
 
 #, c-format
@@ -2121,7 +2121,7 @@ msgstr "-q [chybov soubor]  editovat soubor na mst vskytu prvn chyby"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -1359,7 +1359,7 @@ msgstr "E216: Udlost %s neexistuje"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Automatick pkazy ---"
@@ -1374,7 +1374,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: vnoen automatickho pkazu pli hlubok"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s automatick pkazy pro \"%s\""
 
 #, c-format
@@ -2121,7 +2121,7 @@ msgstr "-q [chybov soubor]  editovat soubor na mst vskytu prvn chyby"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -1,4 +1,4 @@
-# German Translation for Vim
+# German translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(deutsch)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-30 15:16+0200\n"
+"POT-Creation-Date: 2018-06-24 10:50+0200\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
 "Last-Translator: Christian Brabandt <cb@256bit.org>\n"
 "Language-Team: German\n"
@@ -202,6 +202,9 @@ msgstr ""
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Kann nicht schreiben, 'buftype'-Option ist gesetzt"
 
+msgid "[Prompt]"
+msgstr "[Prompt]"
+
 msgid "[Scratch]"
 msgstr "[Scratch]"
 
@@ -704,6 +707,7 @@ msgstr "E785: complete() kann nur im Einfge-Modus verwendet werden."
 msgid "&Ok"
 msgstr "&Ok"
 
+#, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
 msgstr[0] "+-%s%3ld Zeile, "
@@ -813,6 +817,7 @@ msgstr "E677: Fehler beim Schreiben einer temporren Datei"
 msgid "E921: Invalid callback argument"
 msgstr "E921: Unglgltiges Callback Argument"
 
+#, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
 msgstr "<%s>%s%s  %d,  Hex %02x,  Oktal %03o, Digr %s"
 
@@ -820,9 +825,11 @@ msgstr "<%s>%s%s  %d,  Hex %02x,  Oktal 
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Hex %02x,  Oktal %03o"
 
+#, c-format
 msgid "> %d, Hex %04x, Oct %o, Digr %s"
 msgstr "> %d, Hex %04x, Oktal %o, Digr %s"
 
+#, c-format
 msgid "> %d, Hex %08x, Oct %o, Digr %s"
 msgstr "> %d, Hex %08x, Oktal %o, Digr %s"
 
@@ -1132,6 +1139,7 @@ msgstr "Keine Alt-Dateien"
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Debug-Modus. Geben Sie \"cont\" zum Fortsetzen ein."
 
+#, c-format
 msgid "Oldval = \"%s\""
 msgstr "Alter Wert = \"%s\""
 
@@ -1426,17 +1434,20 @@ msgid "Greetings, Vim user!"
 msgstr "Herzliche Gre, Vim Benutzer!"
 
 msgid "E784: Cannot close last tab page"
-msgstr "E784: Kann letzten Tab nicht schlieen."
+msgstr "E784: Kann letzten Reiter nicht schlieen."
 
 msgid "Already only one tab page"
-msgstr "Es existiert nur ein Tab"
+msgstr "Es existiert nur ein Reiter"
+
+msgid "Edit File in new tab page"
+msgstr "ffne Datei in einem neuen Reiter"
 
 msgid "Edit File in new window"
 msgstr "ffne Datei in einem neuen Fenster"
 
 #, c-format
 msgid "Tab page %d"
-msgstr "Tab %d"
+msgstr "Reiter %d"
 
 msgid "No swap file"
 msgstr "Keine Auslagerungsdatei"
@@ -2043,7 +2054,7 @@ msgstr "E216: Keine solche Gruppe oder E
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokommandos ---"
@@ -2062,7 +2073,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: Autokommando-Schachtelung zu tief"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokommandos fr \"%s\""
 
 #, c-format
@@ -2090,6 +2101,7 @@ msgid "E351: Cannot delete fold with cur
 msgstr ""
 "E351: Faltung kann mit der aktuellen Faltungsmethode nicht gelscht werden"
 
+#, c-format
 msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
 msgstr[0] "%3ld Zeile gefaltet "
@@ -2261,13 +2273,13 @@ msgid "Vim: Received \"die\" request fro
 msgstr "Vim: \"die\"-Request von Session-Manager erhalten\n"
 
 msgid "Close tab"
-msgstr "Tab schlieen"
+msgstr "Reiter schlieen"
 
 msgid "New tab"
-msgstr "Neuer Tab"
+msgstr "Neuer Reiter"
 
 msgid "Open Tab..."
-msgstr "ffne Tab..."
+msgstr "ffne Reiter..."
 
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Hauptfenster unerwartet gelscht\n"
@@ -2309,12 +2321,12 @@ msgid "&Undo"
 msgstr "&Rckgngig"
 
 msgid "Open tab..."
-msgstr "ffne Tab..."
-
-msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "ffne Reiter..."
+
+msgid "Find string (use '\\\\' to find a '\\')"
 msgstr "Suche (benutze '\\\\' um ein '\\' zu finden)"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgid "Find & Replace (use '\\\\' to find a '\\')"
 msgstr "Suche & Ersetze (benutze '\\\\' um ein '\\' zu finden)"
 
 msgid "Not Used"
@@ -2973,7 +2985,7 @@ msgstr "-q [Fehler-Datei]  ffne Datei mit erstem Fehler"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -3122,7 +3134,7 @@ msgid "--noplugin\t\tDon't load plugin s
 msgstr "--noplugin\t\tlade keine \"plugin\"-Skripte"
 
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tffne N Tabs (Vorgabe: einen fr jede Datei)"
+msgstr "-p[N]\t\tffne N Reiter (Vorgabe: einen fr jede Datei)"
 
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tffne N Fenster (Vorgabe: fr jede Datei eins)"
@@ -3190,7 +3202,7 @@ msgstr ""
 msgid ""
 "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
 msgstr ""
-"--remote-tab[-wait][-silent] <Dateien>  Wie --remote, aber ffne ein Tab fr "
+"--remote-tab[-wait][-silent] <Dateien>  Wie --remote, aber ffne ein Reiter fr "
 "jede Datei."
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
@@ -4299,6 +4311,7 @@ msgstr ""
 "Sp %s von %s; Zeile %ld von %ld; Wort %lld von %lld; Zeichen %lld von %lld; "
 "Byte %lld von %lld"
 
+#, c-format
 msgid "(+%lld for BOM)"
 msgstr "(+%lld fr BOM)"
 
@@ -4352,6 +4365,7 @@ msgstr "E835: Widerspricht Wert aus 'fil
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: Kann in der GTK+ 2 GUI nicht verndert werden"
 
+#, c-format
 msgid "E950: Cannot convert between %s and %s"
 msgstr "E950: Kann nicht zwischen %s und %s konvertieren."
 
@@ -4815,8 +4829,8 @@ msgstr "E55: %s) ohne Gegenstck"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ist hier nicht erlaubt"
 
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 usw. ist hier nicht erlaubt"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: \\z1 - \\z9 ist hier nicht erlaubt"
 
 #, c-format
 msgid "E69: Missing ] after %s%%["
@@ -4929,7 +4943,7 @@ msgstr "E869: (NFA) Unbekannter Operator
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Fehler beim Lesen der Wiederholungsbeschrnkung."
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 msgstr "E871: (NFA regexp) Ein Multi darf nicht auf ein Multi folgen!"
 
 msgid "E872: (NFA regexp) Too many '('"
@@ -4941,7 +4955,12 @@ msgstr "E879: (NFA regexp) Zu viele \\z(
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) geeigneter Abschlussfehler"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Konnte temporre Datei zum Schreiben ffnen, zeige auf Standard "
+"Fehlerausgabe... "
+
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Konnte nicht vom Stack herausnehmen!"
 
 msgid ""
@@ -4957,19 +4976,6 @@ msgstr "E876: (NFA regexp) Nicht genug S
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Konnte nicht Speicher allokieren um ste zu durchlaufen!"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Konnte temporre Datei zum Schreiben ffnen, zeige auf Standard "
-"Fehlerausgabe... "
-
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) KONNTE NICHT FFNEN %s !"
-
-msgid "Could not open temporary log file for writing "
-msgstr "Temporre Logdatei kann nicht zum Schreiben geffnet werden"
-
 msgid " VREPLACE"
 msgstr " V-ERSETZEN"
 
@@ -5336,6 +5342,7 @@ msgstr "Lese Wrterbuch-Datei %s..."
 msgid "E760: No word count in %s"
 msgstr "E760: Keine Wrter gezhlt in %s"
 
+#, c-format
 msgid "line %6d, word %6ld - %s"
 msgstr "Zeile %6d, Wort %6ld - %s"
 
@@ -5423,6 +5430,7 @@ msgstr "Geschtzter Speicher zur Laufzeit: %d Bytes"
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Ausgabedatei darf keinen Regionsnamen haben"
 
+#, c-format
 msgid "E754: Only up to %ld regions supported"
 msgstr "E754: Maximal %ld Regionen untersttzt"
 
@@ -5833,6 +5841,7 @@ msgstr "Fhre aus"
 msgid "finished"
 msgstr "beendet"
 
+#, c-format
 msgid "E953: File exists: %s"
 msgstr "E953: Datei existiert bereits: %s"
 
@@ -6119,6 +6128,10 @@ msgstr "E133: :return auerhalb einer Funktion"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Fehlende Klammern: %s"
 
+#, c-format
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s kompiliert am %s)"
+
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6565,9 +6578,11 @@ msgstr "E474: Ungltiges Argument"
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Ungltiges Argument: %s"
 
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: Ungltiger Wert fr Argument: %s"
 
+#, c-format
 msgid "E475: Invalid value for argument %s: %s"
 msgstr "E475: Ungltiger Wert fr Argument %s: %s"
 
@@ -7049,10 +7064,10 @@ msgid "unable to unset option %s which d
 msgstr "konnte option %s nicht aufheben, da sie keinen globalen Wert hat"
 
 msgid "attempt to refer to deleted tab page"
-msgstr "Versuch, Bezug auf einen gelschten Tab zu nehmen"
+msgstr "Versuch, Bezug auf einen gelschten Reiter zu nehmen"
 
 msgid "no such tab page"
-msgstr "kein solcher Tab vorhanden"
+msgstr "kein solcher Reiter vorhanden"
 
 msgid "attempt to refer to deleted window"
 msgstr "Versuch, Bezug auf eine gelschtes Fenster zu nehmen"
@@ -7088,7 +7103,7 @@ msgid "expected vim.Window object, but g
 msgstr "erwartete vim.Window Objekt, erhielt jedoch %s"
 
 msgid "failed to find window in the current tab page"
-msgstr "konnte Fenster im aktuellen Tab nicht finden"
+msgstr "konnte Fenster im aktuellen Reiter nicht finden"
 
 msgid "did not switch to the specified window"
 msgstr "konnte nicht zu spezifizierten Fenster wechseln"
@@ -7098,7 +7113,7 @@ msgid "expected vim.TabPage object, but 
 msgstr "erwartete vim.TabPage Objekt, erhielt jedoch %s"
 
 msgid "did not switch to the specified tab page"
-msgstr "konnte nicht zu spezifiziertem Tab wechseln"
+msgstr "konnte nicht zu spezifiziertem Reiter wechseln"
 
 msgid "failed to run the code"
 msgstr "Ausfhren des Codes fehlgeschlagen."
@@ -7178,8 +7193,7 @@ msgstr ""
 "Alle Dateien (*)\t*\n"
 
 msgid "All Files (*)\t*\n"
-msgstr ""
-"Alle Dateien (*)\t*\n"
+msgstr "Alle Dateien (*)\t*\n"
 
 msgid ""
 "All Files (*)\t*\n"
--- a/src/po/en_GB.po
+++ b/src/po/en_GB.po
@@ -583,8 +583,8 @@ msgstr "E63: Invalid use of \\_"
 
 
 #. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Cannot have a multi follow a multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp) Cannot have a multi follow a multi"
 
 
 #, c-format
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -2026,7 +2026,7 @@ msgstr "E216: Ne ekzistas tia grupo aŭ evento: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Aŭto-Komandoj ---"
@@ -2045,7 +2045,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: aŭtokomando tro ingita"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Aŭtokomandoj por \"%s\""
 
 #, c-format
@@ -2952,7 +2952,7 @@ msgstr "-q [erardosiero] redakti dosiero
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4770,7 +4770,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( estas nepermesebla tie"
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie"
 
 #, c-format
@@ -4884,10 +4884,10 @@ msgstr "E869: (NFA) Nekonata operatoro '
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 msgstr ""
 "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-"
-"selekto!"
+"selekto"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA-regulesprimo) tro da '('"
@@ -4898,7 +4898,7 @@ msgstr "E879: (NFA-regulesprimo) tro da 
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA-regulesprimo) propra end-eraro"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Ne povis elpreni de la staplo!"
 
 msgid ""
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -2480,7 +2480,7 @@ msgstr "E216: No existe tal grupo o even
 #: fileio.c:8058
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Auto-órdenes ---"
@@ -2504,7 +2504,7 @@ msgstr "E218: La auto-orden se anida en 
 
 #: fileio.c:9215
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Auto-órdenes para \"%s\""
 
 #: fileio.c:9225
@@ -3812,7 +3812,7 @@ msgstr "-q [fich. err.] Editar el archiv
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -6141,8 +6141,8 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: No se permite \\z( aquí"
 
 #: regexp.c:1801
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 et al. no se permiten aquí"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: \\z1 - \\z9 no se permiten aquí"
 
 # Es preferible traducir "invalid" por "no [es] válido" pues "inválido" no es lo suficientemente claro. Además, no es políticamente correcto :-) ALV
 #: regexp.c:1813
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -2016,7 +2016,7 @@ msgstr "E216: Ryhmää tai eventtiä ei ole: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocommandit ---"
@@ -2035,7 +2035,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: liian monta tasoa autocommandissa"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autocommands kohteelle %s"
 
 #, c-format
@@ -2915,7 +2915,7 @@ msgstr "-q [virhetiedosto]  muokkaa tiedostoa ensimmäisestä virheestä"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4711,7 +4711,7 @@ msgstr "E55: Pariton %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ei ole sallittu tässä"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 jne. ei ole sallittu tässä"
 
 #, c-format
@@ -4822,7 +4822,7 @@ msgstr "E869: (NFA) Tuntematon operaatto
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Virhe luettaessa toiston määriä"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 msgstr "E871: (NFA regexp) Multi ei voi seurata multia"
 
 msgid "E872: (NFA regexp) Too many '('"
@@ -4834,7 +4834,7 @@ msgstr "E879: (NFA regexp) Liikaa merkkejä \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) oikea lopetusvirhe"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Ei voida poistaa pinosta"
 
 msgid ""
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -2215,7 +2215,7 @@ msgstr "E216: Aucun vnement ou groupe %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Auto-commandes ---"
@@ -2235,7 +2235,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommandes trop imbriques"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "Autocommandes %s pour \"%s\""
 
 #, c-format
@@ -3162,11 +3162,11 @@ msgstr "-q [fichErr]   ouvrir  l'endroit de la premire erreur"
 msgid ""
 "\n"
 "\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"utilisation :"
+"Usage:"
+msgstr ""
+"\n"
+"\n"
+"Utilisation :"
 
 msgid " vim [arguments] "
 msgstr " vim [args] "
@@ -5002,7 +5002,7 @@ msgstr "E55: %s) fermante non ouverte"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( n'est pas autoris ici"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 et co. ne sont pas autoriss ici"
 
 #, c-format
@@ -5116,8 +5116,8 @@ msgstr "E869: (NFA) Oprateur inconnu '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (regexp NFA) Erreur  la lecture des limites de rptition"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (regexp NFA) Trop de '('"
@@ -5128,7 +5128,7 @@ msgstr "E879: (regexp NFA) Trop de \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) erreur de terminaison"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Impossible de dpiler !"
 
 msgid ""
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -2021,7 +2021,7 @@ msgstr "E216: Nl a leithid de ghrpa n theagmhas: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Uathorduithe ---"
@@ -2040,7 +2040,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: uathord neadaithe rdhomhain"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Uathorduithe do \"%s\""
 
 #, c-format
@@ -2953,7 +2953,7 @@ msgstr "-q [comhadearr] cuir comhad leis an chad earrid in eagar"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4797,8 +4797,8 @@ msgstr "E55: %s) corr"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: n cheadatear \\z( anseo"
 
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: n cheadatear \\z1 et al. anseo"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: n cheadatear \\z1 - \\z9 anseo"
 
 #, c-format
 msgid "E69: Missing ] after %s%%["
@@ -4911,8 +4911,8 @@ msgid "E870: (NFA regexp) Error reading 
 msgstr "E870: (slonn NFA) Earrid agus teorainneacha athdhanta  lamh"
 
 #. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (slonn NFA) N cheadatear ilchodach tar is ilchodach!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (slonn NFA) N cheadatear ilchodach tar is ilchodach"
 
 #. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
@@ -4924,7 +4924,7 @@ msgstr "E879: (slonn NFA) An iomarca \\z
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (slonn NFA) crochn neamhoirinach"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Norbh fhidir an chruach a phlobadh!"
 
 msgid ""
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -1,6 +1,8 @@
-# Italian Translation for Vim
+# Italian translation for Vim
 #
 # FIRST AUTHOR Antonio Colombo <azc100@gmail.com>, 2000
+# Vlad Sandrini <vlad.gently@gmail.com>
+# Luciano Montanaro <mikelima@cirulla.net>
 #
 # Ogni commento  benvenuto...
 # Every remark is very welcome...
@@ -13,13 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-12 16:07+0200\n"
-"PO-Revision-Date:  2018-05-13 22:32+0200\n"
+"POT-Creation-Date: 2018-06-19 21:17+0200\n"
+"PO-Revision-Date:  2018-06-19 22:30+0200\n"
 "Last-Translator:   Antonio Colombo   <azc100@gmail.com>\n"
-"Language-Team:     Antonio Colombo   <azc100@gmail.com>\n"
-"                   Vlad Sandrini     <vlad.gently@gmail.com>\n"
-"                   Luciano Montanaro <mikelima@cirulla.net>\n"
-"Language: Italian\n"
+"Language-Team: Italian\n"
+"Language: It\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO_8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -73,21 +73,18 @@ msgstr "E517: Nessun buffer cancellato"
 msgid "1 buffer unloaded"
 msgstr "1 buffer scaricato"
 
-#, c-format
 msgid "%d buffers unloaded"
 msgstr "%d buffer scaricati"
 
 msgid "1 buffer deleted"
 msgstr "1 buffer tolto dalla lista"
 
-#, c-format
 msgid "%d buffers deleted"
 msgstr "%d buffer tolti dalla lista"
 
 msgid "1 buffer wiped out"
 msgstr "1 buffer cancellato"
 
-#, c-format
 msgid "%d buffers wiped out"
 msgstr "%d buffer cancellati"
 
@@ -106,7 +103,6 @@ msgstr "E87: Non posso oltrepassare l'ul
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Non posso andare prima del primo buffer"
 
-#, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
 "E89: Buffer %ld non salvato dopo modifica (aggiungi ! per eseguire comunque)"
@@ -126,19 +122,15 @@ msgstr "E37: Non salvato dopo l'ultima m
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Avviso: Superato limite della lista dei nomi di file"
 
-#, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: Buffer %ld non trovato"
 
-#, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: Pi di una corrispondenza per %s"
 
-#, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: Nessun buffer corrispondente a %s"
 
-#, c-format
 msgid "line %ld"
 msgstr "riga %ld"
 
@@ -163,15 +155,12 @@ msgstr "[Sola Lettura]"
 msgid "[readonly]"
 msgstr "[in sola lettura]"
 
-#, c-format
 msgid "1 line --%d%%--"
 msgstr "1 riga --%d%%--"
 
-#, c-format
 msgid "%ld lines --%d%%--"
 msgstr "%ld righe --%d%%--"
 
-#, c-format
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "riga %ld di %ld --%d%%-- col "
 
@@ -206,6 +195,9 @@ msgstr ""
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Non posso scrivere, l'opzione 'buftype'  impostata"
 
+msgid "[Prompt]"
+msgstr "[Richiesta]"
+
 msgid "[Scratch]"
 msgstr "[Volatile]"
 
@@ -216,11 +208,9 @@ msgstr ""
 "\n"
 "--- Segni ---"
 
-#, c-format
 msgid "Signs for %s:"
 msgstr "Segni per %s:"
 
-#, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    riga=%ld id=%d, nome=%s"
 
@@ -242,19 +232,15 @@ msgstr "E904: l'ultimo argomento per esp
 msgid "E904: third argument for call must be a list"
 msgstr "E904: il terzo argomento della chiamata dev'essere una Lista"
 
-#, c-format
 msgid "E905: received unknown command: %s"
 msgstr "E905: recevuto comando non conosciuto: %s"
 
-#, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): scrittura in mancanza di connessione"
 
-#, c-format
 msgid "E631: %s(): write failed"
 msgstr "E631: %s(): scrittura non riuscita"
 
-#, c-format
 msgid "E917: Cannot use a callback with %s()"
 msgstr "E917: Non posso usare callback con %s()"
 
@@ -270,7 +256,6 @@ msgstr "E920: il file _io necessita di i
 msgid "E915: in_io buffer requires in_buf or in_name to be set"
 msgstr "E915: il buffer in_io necessita di impostare in_buf o in_name"
 
-#, c-format
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: il buffer dev'essere caricato: %s"
 
@@ -292,30 +277,24 @@ msgstr "Le chiavi non corrispondono!"
 msgid "[crypted]"
 msgstr "[cifrato]"
 
-#, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Manca ':' nel Dizionario: %s"
 
-#, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Chiave duplicata nel Dizionario: \"%s\""
 
-#, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Manca virgola nel Dizionario: %s"
 
-#, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Manca '}' a fine Dizionario: %s"
 
 msgid "extend() argument"
 msgstr "argomento di extend()"
 
-#, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Chiave gi esistente: %s"
 
-#, c-format
 msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: Non supporto differenze fra pi di %ld buffer"
 
@@ -346,11 +325,9 @@ msgstr "E100: Non c' nessun altro buffer in modalit 'diff'"
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: Pi di due buffer in modalit 'diff', non so quale usare"
 
-#, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Non riesco a trovare il buffer: \"%s\""
 
-#, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Il buffer \"%s\" non  in modalit 'diff'"
 
@@ -426,7 +403,6 @@ msgstr "l'opzione 'dictionary' non  impostata"
 msgid "'thesaurus' option is empty"
 msgstr "l'opzione 'thesaurus' non  impostata"
 
-#, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Scansione dizionario: %s"
 
@@ -436,7 +412,6 @@ msgstr " (inserisci) Scroll (^E/^Y)"
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (sostituisci) Scroll (^E/^Y)"
 
-#, c-format
 msgid "Scanning: %s"
 msgstr "Scansione: %s"
 
@@ -461,18 +436,15 @@ msgstr "Parola da un'altra riga"
 msgid "The only match"
 msgstr "L'unica corrispondenza"
 
-#, c-format
 msgid "match %d of %d"
 msgstr "corrispondenza %d di %d"
 
-#, c-format
 msgid "match %d"
 msgstr "corrispondenza %d"
 
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caratteri non previsti in :let"
 
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Variabile non definita: %s"
 
@@ -482,11 +454,9 @@ msgstr "E111: Manca ']'"
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Non posso usare [:] con un Dizionario"
 
-#, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Tipo di variabile errato per %s="
 
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nome di variabile non ammesso: %s"
 
@@ -503,7 +473,6 @@ msgstr "E688: Destinazioni meno numerose
 msgid "Double ; in list of variables"
 msgstr "Doppio ; nella lista di variabili"
 
-#, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Non riesco a elencare le variabili per %s"
 
@@ -525,11 +494,9 @@ msgstr "E711: Il valore Lista non ha ele
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: Manca \"in\" dopo :for"
 
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variabile inesistente: \"%s\""
 
-#, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: Non riesco a bloccare o sbloccare la variabile %s"
 
@@ -551,19 +518,15 @@ msgstr "E695: Non posso indicizzare un F
 msgid "E909: Cannot index a special variable"
 msgstr "E909: Non posso indicizzare una variabile speciale"
 
-#, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Nome Opzione mancante: %s"
 
-#, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Opzione inesistente: %s"
 
-#, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Manca '\"': %s"
 
-#, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Manca apostrofo: %s"
 
@@ -625,27 +588,22 @@ msgstr "E731: uso di Dizionario come Str
 msgid "E908: using an invalid value as a String"
 msgstr "E908: uso di un valore non valido come Stringa"
 
-#, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Non posso cancellare la variabile %s"
 
-#, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr ""
 "E704: Il nome della variabile Funcref deve iniziare con una maiuscola: %s"
 
-#, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Nome di variabile in conflitto con una funzione esistente: %s"
 
-#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Valore di %s non modificabile"
 
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Non riesco a cambiare il valore di %s"
 
@@ -687,7 +645,6 @@ msgstr "argomento di map()"
 msgid "filter() argument"
 msgstr "argomento di filter()"
 
-#, c-format
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: L'argomento di %s deve essere una Lista"
 
@@ -711,7 +668,6 @@ msgid_plural "+-%s%3ld lines: "
 msgstr[0] "+-%s%3ld riga: "
 msgstr[1] "+-%s%3ld righe: "
 
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Funzione sconosciuta: %s"
 
@@ -744,7 +700,6 @@ msgstr "E916: job non valido"
 msgid "E701: Invalid type for len()"
 msgstr "E701: Tipo non valido per len()"
 
-#, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID riservato per \":match\": %ld"
 
@@ -760,7 +715,6 @@ msgstr "<vuoto>"
 msgid "E240: No connection to the X server"
 msgstr "E240: Manca connessione con server Vim"
 
-#, c-format
 msgid "E241: Unable to send to %s"
 msgstr "E241: Impossibile inviare a %s"
 
@@ -785,7 +739,6 @@ msgstr "argomento di reverse()"
 msgid "E258: Unable to send to client"
 msgstr "E258: Impossibile inviare al client"
 
-#, c-format
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: Azione non valida: '%s'"
 
@@ -804,7 +757,6 @@ msgstr "E882: Funzione confronto in uniq
 msgid "(Invalid)"
 msgstr "(Non valido)"
 
-#, c-format
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: nomeri di sotto-corrispondenza non valido: %d"
 
@@ -817,7 +769,6 @@ msgstr "E921: Argomento callback non val
 msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
 msgstr "<%s>%s%s  %d,  Esa %02x,  Ottale %03o, Digr %s"
 
-#, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Esa %02x,  Ottale %03o"
 
@@ -827,11 +778,9 @@ msgstr "> %d, Esa %04x, Ottale %o, Digr 
 msgid "> %d, Hex %08x, Oct %o, Digr %s"
 msgstr "> %d, Esa %08x, Ottale %o, Digr %s"
 
-#, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, Esa %04x, Ottale %o"
 
-#, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Esa %08x, Ottale %o"
 
@@ -841,11 +790,9 @@ msgstr "E134: Movimento di righe verso s
 msgid "1 line moved"
 msgstr "1 riga mossa"
 
-#, c-format
 msgid "%ld lines moved"
 msgstr "%ld righe mosse"
 
-#, c-format
 msgid "%ld lines filtered"
 msgstr "%ld righe filtrate"
 
@@ -855,14 +802,12 @@ msgstr "E135: *Filter* Gli autocomandi n
 msgid "[No write since last change]\n"
 msgstr "[Non salvato dopo l'ultima modifica]\n"
 
-#, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s nella riga: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: Troppi errori, ignoro il resto del file"
 
-#, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Lettura file viminfo \"%s\"%s%s%s"
 
@@ -878,27 +823,21 @@ msgstr " file elaborati in precedenza"
 msgid " FAILED"
 msgstr " FALLITO"
 
-#, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: File viminfo \"%s\" inaccessibile in scrittura"
 
-#, c-format
 msgid "E929: Too many viminfo temp files, like %s!"
 msgstr "E929: Troppi file temporanei viminfo, come %s!"
 
-#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Non riesco a scrivere il file viminfo %s!"
 
-#, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "Scrivo file viminfo \"%s\""
 
-#, c-format
 msgid "E886: Can't rename viminfo file to %s!"
 msgstr "E886: Non riesco a rinominare il file viminfo a %s!"
 
-#, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Questo file viminfo  stato generato da Vim %s.\n"
 
@@ -931,26 +870,21 @@ msgstr "Scrivo il file incompleto?"
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: Usa ! per scrivere il buffer incompleto"
 
-#, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Riscrittura del file esistente \"%s\"?"
 
-#, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Il file swap \"%s\" esiste gi, sovrascrivo?"
 
-#, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: File swap esistente: %s (:silent! per sovrascriverlo)"
 
-#, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: Manca nome file per il buffer %ld"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: File non scritto: Scrittura inibita da opzione 'write'"
 
-#, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
@@ -958,7 +892,6 @@ msgstr ""
 "opzione 'readonly' attiva per \"%s\".\n"
 "Vuoi scrivere comunque?"
 
-#, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
 "It may still be possible to write it.\n"
@@ -968,14 +901,12 @@ msgstr ""
 "Questo potrebbe non impedire la scrittura.\n"
 "Vuoi provare?"
 
-#, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\"  in sola lettura (aggiungi ! per eseguire comunque)"
 
 msgid "Edit File"
 msgstr "Elabora File"
 
-#, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr ""
 "E143: Gli autocomandi hanno inaspettatamente cancellato il nuovo buffer %s"
@@ -989,7 +920,6 @@ msgstr "E145: Comandi Shell non permessi
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Le espressioni regolari non possono essere delimitate da lettere"
 
-#, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "sostituire con %s (y/n/a/q/l/^E/^Y)?"
 
@@ -1002,18 +932,15 @@ msgstr "1 corrisp."
 msgid "1 substitution"
 msgstr "1 sostituzione"
 
-#, c-format
 msgid "%ld matches"
 msgstr "%ld corrisp."
 
-#, c-format
 msgid "%ld substitutions"
 msgstr "%ld sostituzioni"
 
 msgid " on 1 line"
 msgstr " in 1 riga"
 
-#, c-format
 msgid " on %ld lines"
 msgstr " in %ld righe"
 
@@ -1023,11 +950,9 @@ msgstr "E147: :global non pu essere usato ricorsivamente con un intervallo"
 msgid "E148: Regular expression missing from global"
 msgstr "E148: Manca espressione regolare nel comando 'global'"
 
-#, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Espressione trovata su ogni riga: %s"
 
-#, c-format
 msgid "Pattern not found: %s"
 msgstr "Espressione non trovata: %s"
 
@@ -1043,43 +968,33 @@ msgstr ""
 msgid "E478: Don't panic!"
 msgstr "E478: Non lasciarti prendere dal panico!"
 
-#, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: Spiacente, nessun aiuto '%s' per %s"
 
-#, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: Spiacente, nessun aiuto per %s"
 
-#, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "Spiacente, non trovo file di aiuto \"%s\""
 
-#, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Nessuna corrispondenza: %s"
 
-#, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Non posso aprire %s in scrittura"
 
-#, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Non riesco ad aprire %s in lettura"
 
-#, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Codifiche diverse fra file di aiuto nella stessa lingua: %s"
 
-#, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Tag duplicato \"%s\" nel file %s/%s"
 
-#, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s non  una directory"
 
-#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Comando 'sign' sconosciuto: %s"
 
@@ -1089,29 +1004,24 @@ msgstr "E156: Manca nome 'sign'"
 msgid "E612: Too many signs defined"
 msgstr "E612: Troppi 'sign' definiti"
 
-#, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Testo 'sign' non valido: %s"
 
-#, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 'sign' sconosciuto: %s"
 
 msgid "E159: Missing sign number"
 msgstr "E159: Manca numero 'sign'"
 
-#, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nome buffer non valido: %s"
 
 msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: Impossibile passare a un buffer che non ha un nome"
 
-#, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ID 'sign' non valido: %ld"
 
-#, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: Impossibile cambiare segno %s"
 
@@ -1133,56 +1043,45 @@ msgstr "Entro modalit Debug.  Batti \"cont\" per continuare."
 msgid "Oldval = \"%s\""
 msgstr "Vecchioval = \"%s\""
 
-#, c-format
 msgid "Newval = \"%s\""
 msgstr "Nuovoval = \"%s\""
 
-#, c-format
 msgid "line %ld: %s"
 msgstr "riga %ld: %s"
 
-#, c-format
 msgid "cmd: %s"
 msgstr "com: %s"
 
 msgid "frame is zero"
 msgstr "al livello zero"
 
-#, c-format
 msgid "frame at highest level: %d"
 msgstr "al livello pi alto: %d"
 
-#, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "Pausa in \"%s%s\" riga %ld"
 
-#, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Breakpoint %s non trovato"
 
 msgid "No breakpoints defined"
 msgstr "Nessun 'breakpoint' definito"
 
-#, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s riga %ld"
 
-#, c-format
 msgid "%3d  expr %s"
 msgstr "%3d  espr %s"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Usare prima \":profile start {fname}\""
 
-#, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Salvare modifiche a \"%s\"?"
 
-#, c-format
 msgid "E947: Job still running in buffer \"%s\""
 msgstr "E947: Lavoro ancora in esecuzione nel buffer \"%s\""
 
-#, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Buffer \"%s\" non salvato dopo modifica"
 
@@ -1199,28 +1098,22 @@ msgstr "E164: Non posso andare davanti a
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Non posso oltrepassare l'ultimo file"
 
-#, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: compilatore non supportato: %s"
 
-#, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Cerco \"%s\" in \"%s\""
 
-#, c-format
 msgid "Searching for \"%s\""
 msgstr "Cerco \"%s\""
 
-#, c-format
 msgid "not found in '%s': \"%s\""
 msgstr "non trovato in '%s': \"%s\""
 
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr ""
 "W20: Versione richiesta di python 2.x non supportata, ignoro il file: %s"
 
-#, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr ""
 "W21: Versione richiesta di python 3.x non supportata, ignoro il file: %s"
@@ -1228,31 +1121,24 @@ msgstr ""
 msgid "Source Vim script"
 msgstr "Esegui script Vim"
 
-#, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Non riesco ad eseguire una directory: \"%s\""
 
-#, c-format
 msgid "could not source \"%s\""
 msgstr "non riesco ad eseguire \"%s\""
 
-#, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "riga %ld: non riesco ad eseguire \"%s\""
 
-#, c-format
 msgid "sourcing \"%s\""
 msgstr "eseguo \"%s\""
 
-#, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "riga %ld: eseguo \"%s\""
 
-#, c-format
 msgid "finished sourcing %s"
 msgstr "esecuzione di %s terminata"
 
-#, c-format
 msgid "continuing in %s"
 msgstr "continuo in %s"
 
@@ -1280,11 +1166,9 @@ msgstr "E167: :scriptencoding usato fuor
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish usato fuori da file di comandi"
 
-#, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Lingua %sin uso: \"%s\""
 
-#, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Non posso impostare lingua a \"%s\""
 
@@ -1297,7 +1181,6 @@ msgstr "E501: Alla fine-file"
 msgid "E169: Command too recursive"
 msgstr "E169: Comando troppo ricorsivo"
 
-#, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Eccezione non intercettata: %s"
 
@@ -1331,14 +1214,12 @@ msgstr "E319: Spiacente, comando non dis
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "1 ulteriore file da elaborare.  Esco lo stesso?"
 
-#, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "%d ulteriori file da elaborare.  Esco lo stesso?"
 
 msgid "E173: 1 more file to edit"
 msgstr "E173: ancora 1 file da elaborare"
 
-#, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ancora %ld file da elaborare"
 
@@ -1373,7 +1254,6 @@ msgstr "E179: argomento necessario per -
 msgid "E179: argument required for -addr"
 msgstr "E179: argomento necessario per -addr"
 
-#, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Attributo non valido: %s"
 
@@ -1387,15 +1267,12 @@ msgstr ""
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: Nome riservato, non usabile in un comando definito dall'utente"
 
-#, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Comando definito dall'utente %s inesistente"
 
-#, c-format
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: Tipo di indirizzo non valido: %s"
 
-#, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Valore %s non valido per 'complete'"
 
@@ -1411,7 +1288,6 @@ msgstr ""
 msgid "unknown"
 msgstr "sconosciuto"
 
-#, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Non riesco a trovare schema colore '%s'"
 
@@ -1427,7 +1303,6 @@ msgstr "C' gi una linguetta sola"
 msgid "Edit File in new window"
 msgstr "Apri il File in una nuova finestra"
 
-#, c-format
 msgid "Tab page %d"
 msgstr "Linguetta %d"
 
@@ -1451,7 +1326,6 @@ msgstr "E187: Sconosciuto"
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize richiede due argomenti numerici"
 
-#, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "Posizione finestra: X %d, Y %d"
 
@@ -1477,15 +1351,12 @@ msgstr "Salva Sessione"
 msgid "Save Setup"
 msgstr "Salva Setup"
 
-#, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Non posso creare la directory: %s"
 
-#, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" esiste (aggiungi ! per eseguire comunque)"
 
-#, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Non riesco ad aprire \"%s\" in scrittura"
 
@@ -1539,35 +1410,27 @@ msgstr "E196: Digrammi non supportati in
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Impossibile lanciare eccezioni con prefisso 'Vim'"
 
-#, c-format
 msgid "Exception thrown: %s"
 msgstr "Eccezione lanciata: %s"
 
-#, c-format
 msgid "Exception finished: %s"
 msgstr "Eccezione finita: %s"
 
-#, c-format
 msgid "Exception discarded: %s"
 msgstr "Eccezione scartata: %s"
 
-#, c-format
 msgid "%s, line %ld"
 msgstr "%s, riga %ld"
 
-#, c-format
 msgid "Exception caught: %s"
 msgstr "Eccezione intercettata: %s"
 
-#, c-format
 msgid "%s made pending"
 msgstr "%s reso 'pending'"
 
-#, c-format
 msgid "%s resumed"
 msgstr "%s ripristinato"
 
-#, c-format
 msgid "%s discarded"
 msgstr "%s scartato"
 
@@ -1652,7 +1515,6 @@ msgstr " tipo file\n"
 msgid "'history' option is zero"
 msgstr "l'opzione 'history'  a zero"
 
-#, c-format
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1747,11 +1609,9 @@ msgstr "[NON convertito]"
 msgid "[converted]"
 msgstr "[convertito]"
 
-#, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[ERRORE DI CONVERSIONE alla riga %ld]"
 
-#, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[BYTE NON VALIDO alla riga %ld]"
 
@@ -1838,7 +1698,6 @@ msgstr ""
 "E513: errore in scrittura, conversione fallita (rendere 'fenc' nullo per "
 "eseguire comunque)"
 
-#, c-format
 msgid ""
 "E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
@@ -1852,7 +1711,6 @@ msgstr "E514: errore in scrittura ('File
 msgid " CONVERSION ERROR"
 msgstr " ERRORE DI CONVERSIONE"
 
-#, c-format
 msgid " in line %ld;"
 msgstr " alla riga %ld;"
 
@@ -1914,14 +1772,12 @@ msgstr "[in formato Unix]"
 msgid "1 line, "
 msgstr "1 riga, "
 
-#, c-format
 msgid "%ld lines, "
 msgstr "%ld righe,"
 
 msgid "1 character"
 msgstr "1 carattere"
 
-#, c-format
 msgid "%lld characters"
 msgstr "%lld caratteri"
 
@@ -1937,26 +1793,21 @@ msgstr "AVVISO: File modificato dopo ess
 msgid "Do you really want to write to it"
 msgstr "Vuoi davvero riscriverlo"
 
-#, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Errore in scrittura di \"%s\""
 
-#, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Errore in chiusura di \"%s\""
 
-#, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Errore in lettura di \"%s\""
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: L'autocomando 'FileChangedShell' ha cancellato il buffer"
 
-#, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: Il file \"%s\" non esiste pi"
 
-#, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
@@ -1966,21 +1817,18 @@ msgstr ""
 msgid "See \":help W12\" for more info."
 msgstr "Vedere \":help W12\" per ulteriori informazioni."
 
-#, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Avviso: File \"%s\" modificato dopo l'apertura"
 
 msgid "See \":help W11\" for more info."
 msgstr "Vedere \":help W11\" per ulteriori informazioni."
 
-#, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: Avviso: Modo File \"%s\" modificato dopo l'apertura"
 
 msgid "See \":help W16\" for more info."
 msgstr "Vedere \":help W16\" per ulteriori informazioni."
 
-#, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Avviso: Il file \"%s\" risulta creato dopo l'apertura"
 
@@ -1994,22 +1842,18 @@ msgstr ""
 "&OK\n"
 "&Carica File"
 
-#, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Non riesco a preparare per ri-caricare \"%s\""
 
-#, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Non riesco a ri-caricare \"%s\""
 
 msgid "--Deleted--"
 msgstr "--Cancellato--"
 
-#, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "auto-rimozione dell'autocomando: %s <buffer=%d>"
 
-#, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Gruppo inesistente: \"%s\""
 
@@ -2019,26 +1863,22 @@ msgstr "E936: Non posso cancellare il gr
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Cancello augroup, ma  ancora in uso"
 
-#, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Carattere non ammesso dopo *: %s"
 
-#, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: Evento inesistente: %s"
 
-#, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: Evento o gruppo inesistente: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Auto-Comandi ---"
 
-#, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <buffer=%d>: numero buffer non valido"
 
@@ -2051,15 +1891,12 @@ msgstr "Nessun autocomando corrispondent
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: nidificazione dell'autocomando troppo estesa"
 
-#, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Auto comandi per \"%s\""
 
-#, c-format
 msgid "Executing %s"
 msgstr "Eseguo %s"
 
-#, c-format
 msgid "autocommand %s"
 msgstr "autocomando %s"
 
@@ -2089,19 +1926,15 @@ msgstr "E222: Aggiunto al buffer di lett
 msgid "E223: recursive mapping"
 msgstr "E223: mapping ricorsivo"
 
-#, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: una abbreviazione globale gi esiste per %s"
 
-#, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: un mapping globale gi esiste per %s"
 
-#, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: una abbreviazione gi esiste per %s"
 
-#, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: un mapping gi esiste per %s"
 
@@ -2123,7 +1956,6 @@ msgstr "E852: Il processo figlio non  riuscito a far partire la GUI"
 msgid "E229: Cannot start the GUI"
 msgstr "E229: Non posso inizializzare la GUI"
 
-#, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: Non posso leggere da \"%s\""
 
@@ -2136,7 +1968,6 @@ msgstr "E231: 'guifontwide' non valido"
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: Il valore di 'imactivatekey' non  valido"
 
-#, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: Non riesco ad allocare il colore %s"
 
@@ -2146,7 +1977,6 @@ msgstr "Nessuna corrispondenza al cursor
 msgid "<cannot open> "
 msgstr "<non posso aprire> "
 
-#, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: non riesco a trovare il font %s"
 
@@ -2297,11 +2127,11 @@ msgstr "&U Disfa"
 msgid "Open tab..."
 msgstr "Apri linguetta..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "Stringa di ricerca (usa '\\\\' per cercare  un '\\')"
-
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "Sostituisci (usa '\\\\' per cercare  un '\\')"
+msgid "Find string (use '\\\\' to find a '\\')"
+msgstr "Stringa di ricerca (usa '\\\\' per cercare un '\\')"
+
+msgid "Find & Replace (use '\\\\' to find a '\\')"
+msgstr "Sostituisci (usa '\\\\' per cercare un '\\')"
 
 msgid "Not Used"
 msgstr "Non Utilizzato"
@@ -2309,11 +2139,9 @@ msgstr "Non Utilizzato"
 msgid "Directory\t*.nothing\n"
 msgstr "Directory\t*.nothing\n"
 
-#, c-format
 msgid "E671: Cannot find window title \"%s\""
 msgstr "E671: Non trovo il titolo della finestra \"%s\""
 
-#, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Argomento non supportato: \"-%s\"; Usa la versione OLE."
 
@@ -2325,39 +2153,30 @@ msgstr ""
 "Vim E458: Non riesco ad allocare elemento di colormap, possibili colori "
 "errati"
 
-#, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: Mancano descrizioni per i seguenti caratteri nel font: %s"
 
-#, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: Nome fontset: %s"
 
-#, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "Il font '%s' non di larghezza fissa"
 
-#, c-format
 msgid "E253: Fontset name: %s"
 msgstr "E253: Nome fontset: %s"
 
-#, c-format
 msgid "Font0: %s"
 msgstr "Font0: %s"
 
-#, c-format
 msgid "Font1: %s"
 msgstr "Font1: %s"
 
-#, c-format
 msgid "Font%ld width is not twice that of font0"
 msgstr "La larghezza di font%ld non  doppia di quella di font0"
 
-#, c-format
 msgid "Font0 width: %ld"
 msgstr "Larghezza di Font0: %ld"
 
-#, c-format
 msgid "Font1 width: %ld"
 msgstr "Larghezza di Font1: %ld"
 
@@ -2403,22 +2222,18 @@ msgstr "E551: Componente non valido"
 msgid "E552: digit expected"
 msgstr "E552: aspettavo un numero"
 
-#, c-format
 msgid "Page %d"
 msgstr "Pagina %d"
 
 msgid "No text to be printed"
 msgstr "Manca testo da stampare"
 
-#, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "Sto stampando pagina %d (%d%%)"
 
-#, c-format
 msgid " Copy %d of %d"
 msgstr " Copia %d di %d"
 
-#, c-format
 msgid "Printed: %s"
 msgstr "Stampato: %s"
 
@@ -2428,23 +2243,18 @@ msgstr "Stampa non completata"
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Errore in scrittura a file PostScript di output"
 
-#, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: Non riesco ad aprire il file \"%s\""
 
-#, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: Non riesco a leggere file risorse PostScript \"%s\""
 
-#, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: file \"%s\" non  un file di risorse PostScript"
 
-#, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: file \"%s\" non  un file di risorse PostScript supportato"
 
-#, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: il file di risorse \"%s\" ha una versione sbagliata"
 
@@ -2460,7 +2270,6 @@ msgstr "E675: Font predefinito non speci
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: Non riesco ad aprire file PostScript di output"
 
-#, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: Non riesco ad aprire il file \"%s\""
 
@@ -2470,11 +2279,9 @@ msgstr "E456: Non trovo file risorse Pos
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: Non trovo file risorse PostScript \"cidfont.ps\""
 
-#, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: Non trovo file risorse PostScript \"%s.ps\""
 
-#, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: Impossibile convertire a codifica di stampa \"%s\""
 
@@ -2505,7 +2312,6 @@ msgstr "Reinizializza tutte le connessio
 msgid "Show connections"
 msgstr "Visualizza connessioni"
 
-#, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Uso: cs[cope] %s"
 
@@ -2518,22 +2324,18 @@ msgstr "E562: Uso: cstag <ident>"
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: tag non trovato"
 
-#, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: errore stat(%s): %d"
 
 msgid "E563: stat error"
 msgstr "E563: errore stat"
 
-#, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s non  una directory o un database cscope valido"
 
-#, c-format
 msgid "Added cscope database %s"
 msgstr "Aggiunto database cscope %s"
 
-#, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: errore leggendo connessione cscope %ld"
 
@@ -2564,18 +2366,15 @@ msgstr "E623: Non riesco a generare proc
 msgid "E567: no cscope connections"
 msgstr "E567: nessuna connessione cscope"
 
-#, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: flag cscopequickfix %c non valido per %c"
 
-#, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: nessuna corrispondenza trovata per la richiesta cscope %s di %s"
 
 msgid "cscope commands:\n"
 msgstr "comandi cscope:\n"
 
-#, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (Uso: %s)"
 
@@ -2602,7 +2401,6 @@ msgstr ""
 "       s: Trova questo simbolo C\n"
 "       t: Trova questa stringa di testo\n"
 
-#, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: impossibile aprire database cscope: %s"
 
@@ -2612,18 +2410,15 @@ msgstr "E626: impossibile leggere inform
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: database cscope duplicato, non aggiunto"
 
-#, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: connessione cscope %s non trovata"
 
-#, c-format
 msgid "cscope connection %s closed"
 msgstr "connessione cscope %s chiusa"
 
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: errore irreparabile in cs_manage_matches"
 
-#, c-format
 msgid "Cscope tag: %s"
 msgstr "Tag cscope: %s"
 
@@ -2637,7 +2432,6 @@ msgstr ""
 msgid "filename / context / line\n"
 msgstr "nomefile / contest / riga\n"
 
-#, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Errore cscope: %s"
 
@@ -2771,7 +2565,6 @@ msgstr "E271: retry fuori da clausola re
 msgid "E272: unhandled exception"
 msgstr "E272: eccezione non gestita"
 
-#, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: tipo sconosciuto di salto nel programma %d"
 
@@ -2790,7 +2583,6 @@ msgstr "nome di mark non valido"
 msgid "mark not set"
 msgstr "mark non impostato"
 
-#, c-format
 msgid "row %d column %d"
 msgstr "riga %d colonna %d"
 
@@ -2839,7 +2631,6 @@ msgstr ""
 "E571: Spiacente, comando non disponibile, non riesco a caricare libreria "
 "programmi Tcl."
 
-#, c-format
 msgid "E572: exit code %d"
 msgstr "E572: codice di uscita %d"
 
@@ -2852,22 +2643,18 @@ msgstr "Non riesco a registrare un nome 
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: Fallito invio comando a programma destinatario"
 
-#, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: Identificativo di server non valido: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: Propriet registry relative a VIM non adeguate.  Cancellate!"
 
-#, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Chiave duplicata in JSON: \"%s\""
 
-#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Manca virgola nella Lista: %s"
 
-#, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Manca ']' a fine Lista: %s"
 
@@ -2889,7 +2676,6 @@ msgstr "Troppi argomenti \"+command\", \
 msgid "Invalid argument for"
 msgstr "Argomento non valido per"
 
-#, c-format
 msgid "%d files to edit\n"
 msgstr "%d file da elaborare\n"
 
@@ -2927,7 +2713,6 @@ msgstr "Vim: Avviso: Input non provenien
 msgid "pre-vimrc command line"
 msgstr "riga comandi prima di vimrc"
 
-#, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Non posso leggere da \"%s\""
 
@@ -2953,7 +2738,7 @@ msgstr "-q [errorfile]  apri file col pr
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -3291,7 +3076,6 @@ msgstr ": Invio fallito.\n"
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": Invio fallito. Tento di eseguire localmente\n"
 
-#, c-format
 msgid "%d of %d edited"
 msgstr "%d di %d elaborato"
 
@@ -3304,7 +3088,6 @@ msgstr ": Invio di espressione fallito.\
 msgid "No marks set"
 msgstr "Nessun mark impostato"
 
-#, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Nessun mark corrispondente a \"%s\""
 
@@ -3410,7 +3193,6 @@ msgstr "E301: Ahim, lo swap file  perduto!!!"
 msgid "E302: Could not rename swap file"
 msgstr "E302: Non riesco a rinominare lo swap file"
 
-#, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
 "E303: Non riesco ad aprile lo swap file per \"%s\", recupero impossibile"
@@ -3418,14 +3200,12 @@ msgstr ""
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Non riesco a leggere blocco 0??"
 
-#, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Nessun swap file trovato per %s"
 
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Dimmi numero di swap file da usare (0 per lasciar perdere): "
 
-#, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Non riesco ad aprire %s"
 
@@ -3445,7 +3225,6 @@ msgstr " non pu essere usato con questa versione di Vim.\n"
 msgid "Use Vim version 3.0.\n"
 msgstr "Usa Vim versione 3.0.\n"
 
-#, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s non sembra uno swap file Vim"
 
@@ -3462,7 +3241,6 @@ msgstr ""
 ",\n"
 "o il file  stato danneggiato."
 
-#, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr "E833: %s  cifrato e questa versione di Vim non supporta la cifratura"
@@ -3471,11 +3249,9 @@ msgid " has been damaged (page size is s
 msgstr ""
 "  stato danneggiato (la dimensione della pagina  inferiore al minimo).\n"
 
-#, c-format
 msgid "Using swap file \"%s\""
 msgstr "Uso swap file \"%s\""
 
-#, c-format
 msgid "Original file \"%s\""
 msgstr "File originale \"%s\""
 
@@ -3483,7 +3259,6 @@ msgid "E308: Warning: Original file may 
 msgstr ""
 "E308: Avviso: il file originale pu essere stato modificato nel frattempo"
 
-#, c-format
 msgid "Swap file is encrypted: \"%s\""
 msgstr "Il file swap  cifrato: \"%s\""
 
@@ -3515,7 +3290,6 @@ msgstr ""
 "\n"
 "per usare la stessa chiave sia per il testo che per il file swap"
 
-#, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Impossibile leggere blocco 1 da %s"
 
@@ -3531,7 +3305,6 @@ msgstr "???BLOCCO VUOTO"
 msgid "???LINES MISSING"
 msgstr "???RIGHE MANCANTI"
 
-#, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ID del Blocco 1 errato (che %s non sia un .swp file?)"
 
@@ -3689,11 +3462,9 @@ msgstr "File preservato"
 msgid "E314: Preserve failed"
 msgstr "E314: Preservazione fallita"
 
-#, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: numero riga non valido: %ld"
 
-#, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: non riesco a trovare la riga %ld"
 
@@ -3712,7 +3483,6 @@ msgstr "E317: ID blocco puntatori errato
 msgid "deleted block 1?"
 msgstr "cancellato blocco 1?"
 
-#, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: Non riesco a trovare la riga %ld"
 
@@ -3722,11 +3492,9 @@ msgstr "E317: ID blocco puntatori errato
 msgid "pe_line_count is zero"
 msgstr "pe_line_count a zero"
 
-#, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: numero riga non ammissibile: %ld dopo la fine"
 
-#, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: contatore righe errato nel blocco %ld"
 
@@ -3736,7 +3504,6 @@ msgstr "Dimensione stack aumentata"
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: ID blocco puntatori errato 2"
 
-#, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Collegamento simbolico ricorsivo per \"%s\""
 
@@ -3840,7 +3607,6 @@ msgstr ""
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: I Menu esistono solo in un'altra modalit"
 
-#, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Nessun Menu \"%s\""
 
@@ -3867,14 +3633,12 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "Togli questo Menu"
 
-#, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: Menu non definito per la modalit %s"
 
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Il percorso Menu deve condurre ad un elemento Menu"
 
-#, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: Menu non trovato: %s"
 
@@ -3884,15 +3648,12 @@ msgstr "E336: Il percorso Menu deve cond
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: Menu non trovato - controlla nomi Menu"
 
-#, c-format
 msgid "Error detected while processing %s:"
 msgstr "Errore/i eseguendo %s:"
 
-#, c-format
 msgid "line %4ld:"
 msgstr "riga %4ld:"
 
-#, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nome registro non valido: '%s'"
 
@@ -3905,7 +3666,6 @@ msgstr "Interruzione: "
 msgid "Press ENTER or type command to continue"
 msgstr "Premi INVIO o un comando per proseguire"
 
-#, c-format
 msgid "%s line %ld"
 msgstr "%s riga %ld"
 
@@ -3975,11 +3735,9 @@ msgstr "1 riga in pi"
 msgid "1 line less"
 msgstr "1 riga in meno"
 
-#, c-format
 msgid "%ld more lines"
 msgstr "%ld righe in pi"
 
-#, c-format
 msgid "%ld fewer lines"
 msgstr "%ld righe in meno"
 
@@ -3992,7 +3750,6 @@ msgstr "Beep!"
 msgid "ERROR: "
 msgstr "ERRORE: "
 
-#, c-format
 msgid ""
 "\n"
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
@@ -4000,7 +3757,6 @@ msgstr ""
 "\n"
 "[byte] totali alloc-rilasc %lu-%lu, in uso %lu, max uso %lu\n"
 
-#, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
 "\n"
@@ -4011,15 +3767,12 @@ msgstr ""
 msgid "E340: Line is becoming too long"
 msgstr "E340: La riga sta diventando troppo lunga"
 
-#, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: Errore interno: lalloc(%ld, )"
 
-#, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: Non c' pi memoria! (stavo allocando %lu byte)"
 
-#, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Chiamo lo shell per eseguire: \"%s\""
 
@@ -4041,7 +3794,6 @@ msgstr "E549: Percentuale non valida"
 msgid "E854: path too long for completion"
 msgstr "E854: percorso troppo lungo per il completamento"
 
-#, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
@@ -4049,28 +3801,22 @@ msgstr ""
 "E343: Percorso non valido: '**[numero]' deve essere a fine percorso o essere "
 "seguito da '%s'."
 
-#, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: Non riesco a trovare la directory \"%s\" nel 'cdpath'"
 
-#, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: Non riesco a trovare il file \"%s\" nel percorso"
 
-#, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: Nessun altra directory \"%s\" trovata nel 'cdpath'"
 
-#, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Nessun altro file \"%s\" trovato nel percorso"
 
-#, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: Modalit errata di accesso a file info connessione NetBeans: \"%s\""
 
-#, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: Connessione NetBeans persa per il buffer %ld"
 
@@ -4080,7 +3826,6 @@ msgstr "E838: netbeans non  supportato con questa GUI"
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans gi connesso"
 
-#, c-format
 msgid "E505: %s is read-only (add ! to override)"
 msgstr "E505: %s  in sola lettura (aggiungi ! per eseguire comunque)"
 
@@ -4114,30 +3859,24 @@ msgstr "E663: Alla fine della lista modi
 msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
 msgstr "Batti  :qa! e premi <Invio> per ignorare le modifiche e uscire da Vim"
 
-#, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 riga %sa 1 volta"
 
-#, c-format
 msgid "1 line %sed %d times"
 msgstr "1 riga %sa %d volte"
 
-#, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld righe %se 1 volta"
 
-#, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld righe %se %d volte"
 
-#, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld righe da rientrare... "
 
 msgid "1 line indented "
 msgstr "1 riga rientrata "
 
-#, c-format
 msgid "%ld lines indented "
 msgstr "%ld righe rientrate "
 
@@ -4150,36 +3889,28 @@ msgstr "non riesco a salvare in un regis
 msgid "1 line changed"
 msgstr "1 riga cambiata"
 
-#, c-format
 msgid "%ld lines changed"
 msgstr "%ld righe cambiate"
 
-#, c-format
 msgid "freeing %ld lines"
 msgstr "libero %ld righe"
 
-#, c-format
 msgid " into \"%c"
 msgstr " in \"%c"
 
 #
-#, c-format
 msgid "block of 1 line yanked%s"
 msgstr "blocco di 1 riga messo in registro%s"
 
-#, c-format
 msgid "1 line yanked%s"
 msgstr "1 riga messa in registro%s"
 
-#, c-format
 msgid "block of %ld lines yanked%s"
 msgstr "blocco di %ld righe messo in registro%s"
 
-#, c-format
 msgid "%ld lines yanked%s"
 msgstr "%ld righe messe in registro%s"
 
-#, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Niente nel registro %s"
 
@@ -4200,7 +3931,6 @@ msgstr ""
 "\n"
 "# Registri:\n"
 
-#, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: Tipo di registro sconosciuto: %d"
 
@@ -4211,16 +3941,13 @@ msgstr ""
 "E883: espressione di ricerca e registro dell'espressione non possono "
 "contenere due o pi righe"
 
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld Col.; "
 
-#, c-format
 msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
 msgstr ""
 "Selezionate %s%ld di %ld Righe; %lld di %lld Parole; %lld di %lld Caratt."
 
-#, c-format
 msgid ""
 "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
 "%lld Bytes"
@@ -4228,12 +3955,10 @@ msgstr ""
 "Selezionate %s%ld di %ld Righe; %lld di %lld Parole; %lld di %lld Caratt.; "
 "%lld di %lld Byte"
 
-#, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
 msgstr ""
 "Col. %s di %s; Riga %ld di %ld; Parola %lld di %lld; Caratt. %lld di %lld"
 
-#, c-format
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
 "%lld of %lld"
@@ -4265,11 +3990,9 @@ msgstr "E521: Ci vuole un numero dopo ="
 msgid "E522: Not found in termcap"
 msgstr "E522: Non trovato in 'termcap'"
 
-#, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Carattere non ammesso <%s>"
 
-#, c-format
 msgid "For option %s"
 msgstr "Per opzione %s"
 
@@ -4303,7 +4026,6 @@ msgstr "E524: Manca ':'"
 msgid "E525: Zero length string"
 msgstr "E525: Stringa nulla"
 
-#, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Manca numero dopo <%s>"
 
@@ -4331,14 +4053,12 @@ msgstr "E533: non posso selezionare 'wid
 msgid "E534: Invalid wide font"
 msgstr "E534: 'Wide font' non valido"
 
-#, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Carattere non ammesso dopo <%c>"
 
 msgid "E536: comma required"
 msgstr "E536: virgola mancante"
 
-#, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' deve essere nulla o contenere %s"
 
@@ -4368,19 +4088,15 @@ msgstr "W17: Arabo richiede UTF-8, esegu
 msgid "E954: 24-bit colors are not supported on this environment"
 msgstr "E954: colori a 24-bit non supportati in questo ambiente"
 
-#, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Servono almeno %d righe"
 
-#, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Servono almeno %d colonne"
 
-#, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Opzione inesistente: %s"
 
-#, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Ci vuole un numero: &%s = '%s'"
 
@@ -4415,11 +4131,9 @@ msgstr ""
 msgid "E356: get_varp ERROR"
 msgstr "E356: ERRORE get_varp"
 
-#, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': Manca carattere corrispondente per %s"
 
-#, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Caratteri in pi dopo il ';': %s"
 
@@ -4432,7 +4146,6 @@ msgstr "VIM: Non riesco ad aprire la fin
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Serve Amigados versione 2.04 o successiva\n"
 
-#, c-format
 msgid "Need %s version %ld\n"
 msgstr "Serve %s versione %ld\n"
 
@@ -4442,7 +4155,6 @@ msgstr "Non riesco ad aprire NIL:\n"
 msgid "Cannot create "
 msgstr "Non riesco a creare "
 
-#, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim esce con %d\n"
 
@@ -4476,35 +4188,27 @@ msgstr "Messaggio"
 msgid "E237: Printer selection failed"
 msgstr "E237: Scelta stampante non riuscita"
 
-#, c-format
 msgid "to %s on %s"
 msgstr "a %s su %s"
 
-#, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: Font per stampante sconosciuto: %s"
 
-#, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: Errore durante stampa: %s"
 
-#, c-format
 msgid "Printing '%s'"
 msgstr "Stampato: '%s'"
 
-#, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: Nome di charset non ammesso \"%s\" nel fonte di nome \"%s\""
 
-#, c-format
 msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
 msgstr "E244: Nome di qualit non ammesso \"%s\" nel font di nome \"%s\""
 
-#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: Carattere non ammesso '%c' nel font di nome \"%s\""
 
-#, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "Attivazione visualizzazione X ha richiesto %ld msec"
 
@@ -4535,11 +4239,9 @@ msgstr ""
 "\n"
 "Non posso impostare il contesto di sicurezza per "
 
-#, c-format
 msgid "Could not set security context %s for %s"
 msgstr "Non posso impostare il contesto di sicurezza %s per %s"
 
-#, c-format
 msgid "Could not get security context %s for %s. Removing it!"
 msgstr "Non posso ottenere il contesto di sicurezza %s per %s. Lo rimuovo!"
 
@@ -4588,7 +4290,6 @@ msgstr ""
 msgid "XSMP lost ICE connection"
 msgstr "XSMP ha perso la connessione ICE"
 
-#, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
@@ -4604,7 +4305,6 @@ msgstr "XSMP apertura connessione"
 msgid "XSMP ICE connection watch failed"
 msgstr "XSMP osservazione connessione ICE fallita"
 
-#, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection fallita: %s"
 
@@ -4620,7 +4320,6 @@ msgstr "Errore VIM"
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "Non sono riuscito a impostare puntatori di funzione verso la DLL!"
 
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: Intercettato evento %s\n"
 
@@ -4648,33 +4347,27 @@ msgstr ""
 msgid "Vim Warning"
 msgstr "Avviso da Vim"
 
-#, c-format
 msgid "shell returned %d"
 msgstr "shell terminato con return-code %d"
 
 msgid "E926: Current location list was changed"
 msgstr "E926: La lista delle locazioni corrente  stata cambiata"
 
-#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Troppi %%%c nella stringa di 'format'"
 
-#, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: %%%c imprevisto nella stringa di 'format'"
 
 msgid "E374: Missing ] in format string"
 msgstr "E374: Manca ] nella stringa di 'format'"
 
-#, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: %%%c non supportato nella stringa di 'format'"
 
-#, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: %%%c non valido nel prefisso della stringa di 'format'"
 
-#, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: %%%c non valido nella stringa di 'format'"
 
@@ -4693,14 +4386,12 @@ msgstr "E924: La finestra corrente  stata chiusa"
 msgid "E925: Current quickfix was changed"
 msgstr "E925: Il quickfix corrente  stato cambiato"
 
-#, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d di %d)%s%s: "
 
 msgid " (line deleted)"
 msgstr " (riga cancellata)"
 
-#, c-format
 msgid "%serror list %d of %d; %d errors "
 msgstr "%slista errori %d di %d; %d errori"
 
@@ -4719,7 +4410,6 @@ msgstr "File errori"
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Nome file mancante o espressione non valida"
 
-#, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Non riesco ad aprire il file \"%s\""
 
@@ -4729,11 +4419,9 @@ msgstr "E681: Buffer non caricato"
 msgid "E777: String or List expected"
 msgstr "E777: aspettavo Stringa o Lista"
 
-#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: elemento non valido in %s%%[]"
 
-#, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: Manca ] dopo %s["
 
@@ -4743,29 +4431,24 @@ msgstr "E944: Intervallo invertito nella
 msgid "E945: Range too large in character class"
 msgstr "E945: Intervallo troppo ampio nella classe di caratteri"
 
-#, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Senza riscontro: %s%%("
 
-#, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: Senza riscontro: %s("
 
-#, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: Senza riscontro: %s)"
 
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( non consentito qui"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 ecc. non consentiti qui"
 
-#, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: Manca ] dopo %s%%["
 
-#, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] vuoto"
 
@@ -4778,55 +4461,45 @@ msgstr "E339: Espressione troppo lunga"
 msgid "E50: Too many \\z("
 msgstr "E50: Troppe \\z("
 
-#, c-format
 msgid "E51: Too many %s("
 msgstr "E51: Troppe %s("
 
 msgid "E52: Unmatched \\z("
 msgstr "E52: Senza riscontro: \\z("
 
-#, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Carattere non ammesso dopo %s@"
 
-#, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: Troppi %s{...}s complessi"
 
-#, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: %s* nidificato"
 
-#, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: %s%c nidificato"
 
 msgid "E63: invalid use of \\_"
 msgstr "E63: uso non valido di \\_"
 
-#, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c senza nulla prima"
 
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Carattere non ammesso dopo \\z"
 
-#, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Carattere non valido dopo %s%%[dxouU]"
 
-#, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Carattere non ammesso dopo %s%%"
 
-#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Errore sintattico in %s{...}"
 
 msgid "External submatches:\n"
 msgstr "Sotto-corrispondenze esterne:\n"
 
-#, c-format
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA regexp) non riesco a ripetere %s"
 
@@ -4843,37 +4516,32 @@ msgstr "Passo alla ricerca di RE col vec
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Fine prematura dell'espressione regolare"
 
-#, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA regexp) %c fuori posto"
 
-#, c-format
 msgid "E877: (NFA regexp) Invalid character class: %ld"
 msgstr "E877: (NFA regexp) Classe di caratteri non valida: %ld"
 
-#, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Operatore sconosciuto '\\z%c'"
 
 msgid "E951: \\% value too large"
 msgstr "E951: \\% valore troppo grande"
 
-#, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) Operatore sconosciuto '\\%%%c'"
 
 msgid "E868: Error building NFA with equivalence class!"
 msgstr "E868: Errore nel build di NFA con classe di equivalenza!"
 
-#, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) Operatore sconosciuto '\\@%c'"
 
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Errore nella lettura dei limiti di ripetizione"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Non si pu avere multi dopo multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp) Non si pu avere multi dopo multi"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp) Troppi '('"
@@ -4884,7 +4552,7 @@ msgstr "E879: (NFA regexp) Troppi \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) errore di terminazione corretta"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Impossibile riprendere lo stack !"
 
 msgid ""
@@ -4900,15 +4568,19 @@ msgstr "E876: (NFA regexp) Non c' spazio per immagazzinare l'intero NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Non posso allocare memoria per il zigzag di ramo!"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Non posso aprire il file temporaneo per la scrittura, mostro su stderr... "
-
-#, c-format
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Non posso aprire il file temporaneo di log in scrittura, mostro su stderr... "
+
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) IMPOSSIBILE APRIRE %s !"
 
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"Non posso aprire il file temporaneo di log in scrittura, mostro su "
+"stderr ... "
+
 msgid "Could not open temporary log file for writing "
 msgstr "Non posso aprire il log temporaneo in scrittura "
 
@@ -4963,15 +4635,12 @@ msgstr " SELEZIONA BLOCCO"
 msgid "recording"
 msgstr "registrazione"
 
-#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Stringa di ricerca non valida: %s"
 
-#, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: la ricerca ha raggiunto la CIMA senza successo per: %s"
 
-#, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: la ricerca ha raggiunto il FONDO senza successo per: %s"
 
@@ -4996,11 +4665,9 @@ msgstr "  (Gi elencati)"
 msgid "  NOT FOUND"
 msgstr "  NON TROVATO"
 
-#, c-format
 msgid "Scanning included file: %s"
 msgstr "Scandisco file incluso: %s"
 
-#, c-format
 msgid "Searching included file %s"
 msgstr "Cerco nel file incluso: %s"
 
@@ -5022,7 +4689,6 @@ msgstr "E389: Non sono riuscito a trovar
 msgid "Substitute "
 msgstr "Sostituzione "
 
-#, c-format
 msgid ""
 "\n"
 "# Last %sSearch Pattern:\n"
@@ -5035,51 +4701,42 @@ msgstr ""
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Controllo ortografico non abilitato"
 
-#, c-format
 msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
 msgstr "Avviso: Non trovo lista parole \"%s_%s.spl\" o \"%s_ascii.spl\""
 
-#, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr "Avviso: Non trovo lista parole \"%s.%s.spl\" o \"%s.ascii.spl\""
 
 msgid "E797: SpellFileMissing autocommand deleted buffer"
 msgstr "E797: L'autocomando 'SpellFileMissing' ha cancellato il buffer"
 
-#, c-format
 msgid "Warning: region %s not supported"
 msgstr "Avviso: regione %s non supportata"
 
 msgid "Sorry, no suggestions"
 msgstr "Spiacente, nessun suggerimento"
 
-#, c-format
 msgid "Sorry, only %ld suggestions"
 msgstr "Spiacente, solo %ld suggerimenti"
 
-#, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Cambiare \"%.*s\" in:"
 
-#, c-format
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
 msgid "E752: No previous spell replacement"
 msgstr "E752: Nessuna sostituzione ortografica precedente"
 
-#, c-format
 msgid "E753: Not found: %s"
 msgstr "E753: Non trovato: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: File ortografico troncato"
 
-#, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "Testo in eccesso in %s riga %d: %s"
 
-#, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "Nome affisso troppo lungo in %s riga %d: %s"
 
@@ -5092,7 +4749,6 @@ msgstr "E762: Carattere fuori intervallo
 msgid "Compressing word tree..."
 msgstr "Comprimo albero di parole..."
 
-#, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Lettura file ortografico \"%s\""
 
@@ -5108,51 +4764,39 @@ msgstr "E772: Il file ortografico  per versioni di Vim pi recenti"
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: Sezione non supportata nel file ortografico"
 
-#, c-format
 msgid "E778: This does not look like a .sug file: %s"
 msgstr "E778: Questo non sembra un file .sug: %s"
 
-#, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: File .sug obsoleto,  necessario aggiornarlo: %s"
 
-#, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"
 msgstr "E780: Il file .sug  per versioni di Vim pi recenti: %s"
 
-#, c-format
 msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: Il file .sug non corrisponde al file .spl: %s"
 
-#, c-format
 msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Errore leggendo il file .sug: %s"
 
-#, c-format
 msgid "Reading affix file %s..."
 msgstr "Lettura file affissi %s..."
 
-#, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "Conversione fallita per una parola in %s riga %d: %s"
 
-#, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Conversione in %s non supportata: da %s a %s"
 
-#, c-format
 msgid "Conversion in %s not supported"
 msgstr "Conversione in %s non supportata"
 
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Valore di FLAG non valido in %s riga %d: %s"
 
-#, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG dopo l'uso di flags in %s riga %d: %s"
 
-#, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
 "%d"
@@ -5160,7 +4804,6 @@ msgstr ""
 "Definire COMPOUNDFORBIDFLAG dopo l'elemento PFX potrebbe dare risultati "
 "errati in %s riga %d"
 
-#, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
 "%d"
@@ -5168,35 +4811,27 @@ msgstr ""
 "Definire COMPOUNDPERMITFLAG dopo l'elemento PFX potrebbe dare risultati "
 "errati in %s riga %d"
 
-#, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "Valore errato per COMPOUNDRULES in %s riga %d: %s"
 
-#, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Valore errato per COMPOUNDWORDMAX in %s riga %d: %s"
 
-#, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "Valore errato per COMPOUNDMIN in %s riga %d: %s"
 
-#, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Valore errato per COMPOUNDSYLMAX in %s riga %d: %s"
 
-#, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "Valore errato per CHECKCOMPOUNDPATTERN in %s riga %d: %s"
 
-#, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr "Flag combinazione diverso in blocco affissi continuo in %s riga %d: %s"
 
-#, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "Affisso duplicato in %s riga %d: %s"
 
-#, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
 "line %d: %s"
@@ -5204,31 +4839,24 @@ msgstr ""
 "Affisso usato anche per BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "in %s riga %d: %s"
 
-#, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "Y o N deve essere presente in %s riga %d: %s"
 
-#, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "Condizione non rispettata in %s riga %d: %s"
 
-#, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "Contatore REP(SAL) necessario in %s riga %d"
 
-#, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "Contatore MAP necessario in %s riga %d"
 
-#, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "Carattere duplicato in MAP in %s riga %d"
 
-#, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "Elemento non riconosciuto o duplicato in %s riga %d: %s"
 
-#, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "Riga FOL/LOW/UPP mancante in %s"
 
@@ -5244,93 +4872,72 @@ msgstr "Troppi flag composti"
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "Troppi suffissi e/o flag composti"
 
-#, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "Riga SOFO%s mancante in %s"
 
-#, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "Righe sia SAL che SOFO in %s"
 
-#, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "Il flag non  un numero in %s riga %d: %s"
 
-#, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "Flag non ammesso in %s riga %d: %s"
 
-#, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "Il valore di %s  diverso da quello usato in un altro file .aff"
 
-#, c-format
 msgid "Reading dictionary file %s..."
 msgstr "Lettura file dizionario %s..."
 
-#, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: Nessun contatore parole in %s"
 
 msgid "line %6d, word %6ld - %s"
 msgstr "riga %6d, parola %6ld - %s"
 
-#, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "Parola duplicata in %s riga %d: %s"
 
-#, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "Prima parola duplicata in %s riga %d: %s"
 
-#, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d parole duplicate in %s"
 
-#, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d parole con caratteri non-ASCII ignorate in %s"
 
-#, c-format
 msgid "Reading word file %s..."
 msgstr "Lettura file parole %s..."
 
-#, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "Riga /encoding= duplicata ignorata in %s riga %d: %s"
 
-#, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "Riga /encoding= dopo parola ignorata in %s riga %d: %s"
 
-#, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "Riga /regions= duplicata ignorata in %s riga %d: %s"
 
-#, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "Troppe regioni in %s riga %d: %s"
 
-#, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "Riga / ignorata in %s riga %d: %s"
 
-#, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "N. regione non valido in %s riga %d: %s"
 
-#, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "Flag non riconosciuti in %s riga %d: %s"
 
-#, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "%d parole con caratteri non-ASCII ignorate"
 
 msgid "E845: Insufficient memory, word list will be incomplete"
 msgstr "E845: Memoria insufficiente, la lista parole sar incompleta"
 
-#, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "%d di %d nodi compressi; ne restano %d (%d%%)"
 
@@ -5340,19 +4947,15 @@ msgstr "Rilettura file ortografico..."
 msgid "Performing soundfolding..."
 msgstr "Eseguo soundfolding..."
 
-#, c-format
 msgid "Number of words after soundfolding: %ld"
 msgstr "Numero di parole dopo soundfolding: %ld"
 
-#, c-format
 msgid "Total number of words: %d"
 msgstr "Conteggio totale delle parole: %d"
 
-#, c-format
 msgid "Writing suggestion file %s..."
 msgstr "Scrivo file di suggerimenti %s..."
 
-#, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Uso stimato di memoria durante esecuzione: %d byte"
 
@@ -5362,29 +4965,24 @@ msgstr "E751: Il nome del file di output
 msgid "E754: Only up to %ld regions supported"
 msgstr "E754: Sono supportate al massimo %ld regioni"
 
-#, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: Regione non valida in %s"
 
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Avviso: specificati sia composizione sia NOBREAK"
 
-#, c-format
 msgid "Writing spell file %s..."
 msgstr "Scrivo file ortografico %s..."
 
 msgid "Done!"
 msgstr "Fatto!"
 
-#, c-format
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' non ha %ld elementi"
 
-#, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "Parola '%.*s' rimossa da %s"
 
-#, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "Parola '%.*s' aggiunta a %s"
 
@@ -5403,7 +5001,6 @@ msgstr "syntax conceal attivo"
 msgid "syntax conceal off"
 msgstr "syntax conceal inattivo"
 
-#, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argomento non ammesso: %s"
 
@@ -5425,7 +5022,6 @@ msgstr "syntax, usare valore di default 
 msgid "syntax iskeyword "
 msgstr "syntax iskeyword "
 
-#, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: 'cluster' sintattico inesistente: %s"
 
@@ -5462,7 +5058,6 @@ msgstr ""
 "\n"
 "--- Elementi sintattici ---"
 
-#, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: 'cluster' sintattico inesistente: %s"
 
@@ -5487,7 +5082,6 @@ msgstr "E844: valore cchar non valido"
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]here non ammesso qui"
 
-#, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Elemento di 'region' non trovato per %s"
 
@@ -5497,19 +5091,15 @@ msgstr "E397: Nome file necessario"
 msgid "E847: Too many syntax includes"
 msgstr "E847: Troppe inclusioni di sintassi"
 
-#, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Manca ']': %s"
 
-#, c-format
 msgid "E890: trailing char after ']': %s]%s"
 msgstr "E890: Caratteri in pi dopo ']': %s]%s"
 
-#, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: Manca '=': %s"
 
-#, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Argomenti non sufficienti per: 'syntax region' %s"
 
@@ -5519,11 +5109,9 @@ msgstr "E848: Troppi 'cluster' sintattic
 msgid "E400: No cluster specified"
 msgstr "E400: Nessun 'cluster' specificato"
 
-#, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Delimitatore di espressione non trovato: %s"
 
-#, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Spazzatura dopo espressione: %s"
 
@@ -5531,31 +5119,24 @@ msgid "E403: syntax sync: line continuat
 msgstr ""
 "E403: syntax sync: espressione di continuazione riga specificata due volte"
 
-#, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Argomenti non validi: %s"
 
-#, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: Manca '=': %s"
 
-#, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Argomento nullo: %s"
 
-#, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s non consentito qui"
 
-#, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s deve venire per primo nella lista 'contains'"
 
-#, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Nome gruppo sconosciuto: %s"
 
-#, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Sotto-comando :syntax non valido: %s"
 
@@ -5567,34 +5148,27 @@ msgstr ""
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: ciclo ricorsivo nel caricamento di syncolor.vim"
 
-#, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: gruppo evidenziazione non trovato: %s"
 
-#, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Argomenti non sufficienti: \":highlight link %s\""
 
-#, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Troppi argomenti: \":highlight link %s\""
 
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: 'group' ha impostazioni, 'highlight link' ignorato"
 
-#, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: segno '=' inatteso: %s"
 
-#, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: manca segno '=': %s"
 
-#, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: manca argomento: %s"
 
-#, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Valore non ammesso: %s"
 
@@ -5604,15 +5178,12 @@ msgstr "E419: colore di testo sconosciut
 msgid "E420: BG color unknown"
 msgstr "E420: colore di sfondo sconosciuto"
 
-#, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Numero o nome di colore non riconosciuto: %s"
 
-#, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: codice terminale troppo lungo: %s"
 
-#, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Argomento non ammesso: %s"
 
@@ -5637,7 +5208,6 @@ msgstr "E556: in cima allo stack dei tag
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Non posso andare prima del primo tag corrispondente"
 
-#, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: tag non trovato: %s"
 
@@ -5653,11 +5223,9 @@ msgstr "E427: C' solo un tag corrispondente"
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: Non posso andare oltre l'ultimo tag corrispondente"
 
-#, c-format
 msgid "File \"%s\" does not exist"
 msgstr "Il file \"%s\" non esiste"
 
-#, c-format
 msgid "tag %d of %d%s"
 msgstr "tag %d di %d%s"
 
@@ -5667,7 +5235,6 @@ msgstr " o pi"
 msgid "  Using tag with different case!"
 msgstr "  Uso tag ignorando maiuscole/minuscole!"
 
-#, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Il file \"%s\" non esiste"
 
@@ -5678,26 +5245,21 @@ msgstr ""
 "\n"
 "  # A  tag         DA__ riga  in file/testo"
 
-#, c-format
 msgid "Searching tags file %s"
 msgstr "Ricerca nel tag file %s"
 
-#, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Percorso tag file troncato per %s\n"
 
 msgid "Ignoring long line in tags file"
 msgstr "Riga lunga ignorata nel tag file"
 
-#, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Errore di formato nel tag file \"%s\""
 
-#, c-format
 msgid "Before byte %ld"
 msgstr "Prima del byte %ld"
 
-#, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Tag file non ordinato alfabeticamente: %s"
 
@@ -5710,7 +5272,6 @@ msgstr "E434: Non riesco a trovare model
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: Non riesco a trovare tag, sto solo tirando a indovinare!"
 
-#, c-format
 msgid "Duplicate field name: %s"
 msgstr "Nome di campo duplicato: %s"
 
@@ -5729,7 +5290,6 @@ msgstr "E558: Descrizione terminale non 
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: Descrizione terminale non trovata in 'termcap'"
 
-#, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: Nessuna descrizione per \"%s\" in 'termcap'"
 
@@ -5746,7 +5306,6 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Non riesco ad aprire $VIMRUNTIME/rgb.txt"
 
-#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "Cancello lavoro \"%s\"?"
 
@@ -5786,72 +5345,57 @@ msgstr "E881: Contatore righe  inaspettatamente cambiato"
 msgid "No undo possible; continue anyway"
 msgstr "'undo' non pi possibile; continuo comunque"
 
-#, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Non posso aprire il file Undo in scrittura: %s"
 
-#, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: File Undo corrotto (%s): %s"
 
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "Non posso scrivere un file Undo in alcuna directory di 'undodir'"
 
-#, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "File Undo non sovrascritto, non riesco a leggere: %s"
 
-#, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "Non sovrascritto, non  un file Undo: %s"
 
 msgid "Skipping undo file write, nothing to undo"
 msgstr "Ometto scrittura del file Undo, non ci sono modifiche"
 
-#, c-format
 msgid "Writing undo file: %s"
 msgstr "Scrivo file Undo: %s"
 
-#, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: errore scrivendo nel file Undo: %s"
 
-#, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "Non leggo file Undo, appartiene a un altro utente: %s"
 
-#, c-format
 msgid "Reading undo file: %s"
 msgstr "Lettura file Undo: %s"
 
-#, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: Non posso aprire il file Undo in lettura: %s"
 
-#, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Non  un file Undo: %s"
 
-#, c-format
 msgid "E832: Non-encrypted file has encrypted undo file: %s"
 msgstr "E832: File non cifrato con file Undo cifrato: %s"
 
-#, c-format
 msgid "E826: Undo file decryption failed: %s"
 msgstr "E826: Decifratura fallita del file Undo: %s"
 
-#, c-format
 msgid "E827: Undo file is encrypted: %s"
 msgstr "E827: File Undo cifrato: %s"
 
-#, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: File Undo incompatibile: %s"
 
 msgid "File contents changed, cannot use undo info"
 msgstr "File ulteriormente modificato, non posso usare informazioni di Undo"
 
-#, c-format
 msgid "Finished reading undo file %s"
 msgstr "Lettura del file Undo %s effettuata"
 
@@ -5861,7 +5405,6 @@ msgstr "Questa  gi la prima modifica"
 msgid "Already at newest change"
 msgstr "Questa  gi l'ultima modifica"
 
-#, c-format
 msgid "E830: Undo number %ld not found"
 msgstr "E830: Undo numero %ld non trovato"
 
@@ -5886,7 +5429,6 @@ msgstr "modifica"
 msgid "changes"
 msgstr "modifiche"
 
-#, c-format
 msgid "%ld %s; %s #%ld  %s"
 msgstr "%ld %s; %s #%ld  %s"
 
@@ -5902,7 +5444,6 @@ msgstr "Nessuna modifica, Undo impossibi
 msgid "number changes  when               saved"
 msgstr "numero modif.   quando             salv."
 
-#, c-format
 msgid "%ld seconds ago"
 msgstr "%ld secondi fa"
 
@@ -5915,7 +5456,6 @@ msgstr "E439: lista 'undo' non valida"
 msgid "E440: undo line missing"
 msgstr "E440: riga di 'undo' mancante"
 
-#, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: La funzione %s esiste gi, aggiungi ! per sostituirla"
 
@@ -5925,23 +5465,18 @@ msgstr "E717: C' gi la voce nel Dizionario"
 msgid "E718: Funcref required"
 msgstr "E718: Funcref necessario"
 
-#, c-format
 msgid "E130: Unknown function: %s"
 msgstr "E130: Funzione sconosciuta: %s"
 
-#, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Argomento non ammesso: %s"
 
-#, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Nome argomento duplicato: %s"
 
-#, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Troppi argomenti per la funzione: %s"
 
-#, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: Argomenti non validi per la funzione: %s"
 
@@ -5949,68 +5484,54 @@ msgid "E132: Function call depth is high
 msgstr ""
 "E132: Nidificazione della chiamata di funzione maggiore di 'maxfuncdepth'"
 
-#, c-format
 msgid "calling %s"
 msgstr "chiamo %s"
 
-#, c-format
 msgid "%s aborted"
 msgstr "%s non completata"
 
-#, c-format
 msgid "%s returning #%ld"
 msgstr "%s ritorno #%ld"
 
-#, c-format
 msgid "%s returning %s"
 msgstr "%s ritorno %s"
 
 msgid "E699: Too many arguments"
 msgstr "E699: Troppi argomenti"
 
-#, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Funzione sconosciuta: %s"
 
-#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: Funzione eliminata: %s"
 
-#, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: La funzione: %s richiede pi argomenti"
 
-#, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: Uso di <SID> fuori dal contesto di uno script: %s"
 
-#, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s"
 
 msgid "E129: Function name required"
 msgstr "E129: Nome funzione necessario"
 
-#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
 msgstr "E128: Il nome funzione deve iniziare con maiuscola o \"s:\": %s"
 
-#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
 msgstr "E884: Il nome della funzione non pu contenere un due punti: %s"
 
-#, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Funzione non definita: %s"
 
-#, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: Manca '(': %s"
 
 msgid "E862: Cannot use g: here"
 msgstr "E862: Non si pu usare g: qui"
 
-#, c-format
 msgid "E932: Closure function should not be at top level: %s"
 msgstr ""
 "E932: La funzione di chiusura non novrebbe essere al livello pi alto: %s"
@@ -6018,30 +5539,24 @@ msgstr ""
 msgid "E126: Missing :endfunction"
 msgstr "E126: Manca :endfunction"
 
-#, c-format
 msgid "W22: Text found after :endfunction: %s"
 msgstr "W22: Trovato testo dopo :endfunction: %s"
 
-#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Nome funzione in conflitto con la variabile: %s"
 
-#, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Non posso ridefinire la funzione %s:  in uso"
 
-#, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Il nome funzione non corrisponde al nome file dello script: %s"
 
-#, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Non posso eliminare la funzione %s:  in uso"
 
 msgid "E133: :return not inside a function"
 msgstr "E133: :return fuori da una funzione"
 
-#, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mancano parentesi: %s"
 
@@ -6347,30 +5862,24 @@ msgstr "E445: Altre finestre contengono 
 msgid "E446: No file name under cursor"
 msgstr "E446: Nessun nome file sotto il cursore"
 
-#, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Non riesco a trovare il file \"%s\" nel percorso"
 
-#, c-format
 msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
 msgstr "E799: ID non valido: %ld (dev'essere maggiore o uguale a 1)"
 
-#, c-format
 msgid "E801: ID already taken: %ld"
 msgstr "E801: ID gi utilizzato: %ld"
 
 msgid "List or number required"
 msgstr " necessaria una Lista o un numero"
 
-#, c-format
 msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
 msgstr "E802: ID non valido: %ld (dev'essere maggiore o uguale a 1)"
 
-#, c-format
 msgid "E803: ID not found: %ld"
 msgstr "E803: ID non trovato: %ld"
 
-#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Non riesco a caricare la libreria %s"
 
@@ -6455,22 +5964,18 @@ msgstr "E13: File esistente (aggiungi ! 
 msgid "E472: Command failed"
 msgstr "E472: Comando fallito"
 
-#, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: Fontset sconosciuto: %s"
 
-#, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: Font sconosciuto: %s"
 
-#, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: Font \"%s\" non di larghezza fissa"
 
 msgid "E473: Internal error"
 msgstr "E473: Errore interno"
 
-#, c-format
 msgid "E685: Internal error: %s"
 msgstr "E685: Errore interno: %s"
 
@@ -6483,7 +5988,6 @@ msgstr "E14: Indirizzo non valido"
 msgid "E474: Invalid argument"
 msgstr "E474: Argomento non valido"
 
-#, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Argomento non valido: %s"
 
@@ -6493,7 +5997,6 @@ msgstr "E475: Valore non valido per l'ar
 msgid "E475: Invalid value for argument %s: %s"
 msgstr "E475: Valore non valido per l'argomento %s: %s"
 
-#, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Espressione non valida: %s"
 
@@ -6503,18 +6006,15 @@ msgstr "E16: Intervallo non valido"
 msgid "E476: Invalid command"
 msgstr "E476: Comando non valido"
 
-#, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\"  una directory"
 
-#, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: Chiamata a libreria fallita per \"%s()\""
 
 msgid "E667: Fsync failed"
 msgstr "E667: Fsync fallito"
 
-#, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: Non posso caricare la funzione di libreria %s"
 
@@ -6551,7 +6051,6 @@ msgstr "E27: Farsi non utilizzabile: Non
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: Arabo non utilizzabile: Non abilitato in compilazione\n"
 
-#, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Nome di gruppo di evidenziazione inesistente: %s"
 
@@ -6567,7 +6066,6 @@ msgstr "E31: Mapping inesistente"
 msgid "E479: No match"
 msgstr "E479: Nessuna corrispondenza"
 
-#, c-format
 msgid "E480: No match: %s"
 msgstr "E480: Nessuna corrispondenza: %s"
 
@@ -6589,22 +6087,18 @@ msgstr "E481: Nessun intervallo consenti
 msgid "E36: Not enough room"
 msgstr "E36: Manca spazio"
 
-#, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: non esiste server registrato con nome \"%s\""
 
-#, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: Non riesco a creare il file %s"
 
 msgid "E483: Can't get temp file name"
 msgstr "E483: Non riesco ad ottenere nome file 'temp'"
 
-#, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Non riesco ad aprire il file %s"
 
-#, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Non riesco a leggere il file %s"
 
@@ -6614,7 +6108,6 @@ msgstr "E38: Argomento nullo"
 msgid "E39: Number expected"
 msgstr "E39: Mi aspettavo un numero"
 
-#, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Non riesco ad aprire il file errori %s"
 
@@ -6627,7 +6120,6 @@ msgstr "E41: Non c' pi memoria!"
 msgid "Pattern not found"
 msgstr "Espressione non trovata"
 
-#, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: Espressione non trovata: %s"
 
@@ -6652,11 +6144,9 @@ msgstr "E44: Programma 'regexp' corrotto
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: file in sola lettura (aggiungi ! per eseguire comunque)"
 
-#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Non posso cambiare la variabile read-only \"%s\""
 
-#, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr ""
 "E794: Non posso impostare la variabile read-only in ambiente protetto: \"%s\""
@@ -6667,22 +6157,18 @@ msgstr "E713: Non posso usare una chiave
 msgid "E715: Dictionary required"
 msgstr "E715:  necessario un Dizionario"
 
-#, c-format
 msgid "E684: list index out of range: %ld"
 msgstr "E684: indice lista fuori intervallo: %ld"
 
-#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Troppi argomenti per la funzione: %s"
 
-#, c-format
 msgid "E716: Key not present in Dictionary: %s"
 msgstr "E716: Chiave assente dal Dizionario: %s"
 
 msgid "E714: List required"
 msgstr "E714:  necessaria una Lista"
 
-#, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: L'argomento di %s deve essere una Lista o un Dizionario"
 
@@ -6764,7 +6250,6 @@ msgstr "E363: l'espressione usa troppa m
 msgid "E749: empty buffer"
 msgstr "E749: buffer vuoto"
 
-#, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: Non esiste il buffer %ld"
 
@@ -6774,14 +6259,12 @@ msgstr "E682: Espressione o delimitatore
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: File gi caricato in un altro buffer"
 
-#, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: opzione '%s' non impostata"
 
 msgid "E850: Invalid register name"
 msgstr "E850: Nome registro non valido"
 
-#, c-format
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919: Directory non trovata in '%s': \"%s\""
 
@@ -6794,7 +6277,6 @@ msgstr "raggiunta la CIMA nella ricerca,
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "raggiunto il FONDO nella ricerca, continuo dalla CIMA"
 
-#, c-format
 msgid "Need encryption key for \"%s\""
 msgstr "Serve una chiave di cifratura per \"%s\""
 
@@ -6807,30 +6289,24 @@ msgstr "il dizionario  bloccato"
 msgid "list is locked"
 msgstr "la lista  bloccata"
 
-#, c-format
 msgid "failed to add key '%s' to dictionary"
 msgstr "non non riusciato ad aggiungere la chiave '%s' al dizionario"
 
-#, c-format
 msgid "index must be int or slice, not %s"
 msgstr "l'indice deve'essere un intero o un intervallo, non %s"
 
-#, c-format
 msgid "expected str() or unicode() instance, but got %s"
 msgstr "attesa istanza di str() o unicode(), trovato invece %s"
 
-#, c-format
 msgid "expected bytes() or str() instance, but got %s"
 msgstr "attesa istanza di bytes() o str(), trovato invece %s"
 
-#, c-format
 msgid ""
 "expected int(), long() or something supporting coercing to long(), but got %s"
 msgstr ""
 "atteso int(), long() o qualcosa che supporti forzatura a long(), trovato "
 "invece %s"
 
-#, c-format
 msgid "expected int() or something supporting coercing to int(), but got %s"
 msgstr ""
 "atteso int() o qualcosa che supporti forzatura a int(), trovato invece %s"
@@ -6850,7 +6326,6 @@ msgstr "il numero dev'essere maggiore o 
 msgid "can't delete OutputObject attributes"
 msgstr "non riesco a cancellare gli attributi OutputObject"
 
-#, c-format
 msgid "invalid attribute: %s"
 msgstr "attributo non valido: %s"
 
@@ -6860,11 +6335,9 @@ msgstr "E264: Python: Errore di iniziali
 msgid "failed to change directory"
 msgstr "cambio directory non riuscito"
 
-#, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
 msgstr "atteso terzetto come risultato di imp.find_module(), trovato invece %s"
 
-#, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
 msgstr ""
 "atteso terzetto come risultato di imp.find_module(), trovato invece tuple di "
@@ -6879,14 +6352,12 @@ msgstr "non riesco a cancellare gli attr
 msgid "cannot modify fixed dictionary"
 msgstr "non posso modificare il dizionario fisso"
 
-#, c-format
 msgid "cannot set attribute %s"
 msgstr "non posso impostare attributo %s"
 
 msgid "hashtab changed during iteration"
 msgstr "hashtab cambiato durante l'iterazione"
 
-#, c-format
 msgid "expected sequence element of size 2, but got sequence of size %d"
 msgstr ""
 "atteso elemento sequenza di dimensione 2, trovata sequenza di dimensione %d"
@@ -6897,19 +6368,16 @@ msgstr "il costruttore di lista non acce
 msgid "list index out of range"
 msgstr "indice di lista non nell'intervallo"
 
-#, c-format
 msgid "internal error: failed to get vim list item %d"
 msgstr "errore interno: non ho potuto ottenere l'elemento di vim list %d"
 
 msgid "slice step cannot be zero"
 msgstr "il passo scorrendo un intervallo non pu essere zero"
 
-#, c-format
 msgid "attempt to assign sequence of size greater than %d to extended slice"
 msgstr ""
 "tentativo di assegnare una sequenza maggiore di %d a un intervallo esteso"
 
-#, c-format
 msgid "internal error: no vim list item %d"
 msgstr "errore interno: non c' un elemento di vim list %d"
 
@@ -6919,7 +6387,6 @@ msgstr "errore interno: non ci sono abba
 msgid "internal error: failed to add item to list"
 msgstr "errore interno: non ho potuto aggiungere un elemento alla lista"
 
-#, c-format
 msgid "attempt to assign sequence of size %d to extended slice of size %d"
 msgstr ""
 "tentativo di assegnare sequenza di dimensione %d a un intervallo  esteso di "
@@ -6934,15 +6401,12 @@ msgstr "non riesco a cancellare gli attr
 msgid "cannot modify fixed list"
 msgstr "non posso modificare la lista fissa"
 
-#, c-format
 msgid "unnamed function %s does not exist"
 msgstr "la funzione anonima %s non esiste"
 
-#, c-format
 msgid "function %s does not exist"
 msgstr "la funzione %s non esiste"
 
-#, c-format
 msgid "failed to run function %s"
 msgstr "esecuzione non riuscita della funzione %s"
 
@@ -6955,11 +6419,9 @@ msgstr "errore interno: tipo di opzione 
 msgid "problem while switching windows"
 msgstr "problema nel cambio finestra"
 
-#, c-format
 msgid "unable to unset global option %s"
 msgstr "impossibile deimpostare l'opzione globale %s"
 
-#, c-format
 msgid "unable to unset option %s which does not have global value"
 msgstr "impossibile deimpostare l'opzione %s che non ha un valore globale"
 
@@ -6990,15 +6452,12 @@ msgstr "cambio nome buffer non riuscito"
 msgid "mark name must be a single character"
 msgstr "il nome mark dev'essere un carattere singolo"
 
-#, c-format
 msgid "expected vim.Buffer object, but got %s"
 msgstr "atteso oggetto vim.Buffer, trovato %s"
 
-#, c-format
 msgid "failed to switch to buffer %d"
 msgstr "passaggio non riuscito al buffer %d"
 
-#, c-format
 msgid "expected vim.Window object, but got %s"
 msgstr "atteso oggetto vim.Window, trovato %s"
 
@@ -7009,7 +6468,6 @@ msgstr ""
 msgid "did not switch to the specified window"
 msgstr "passaggio alla finestra specificata non effettuato"
 
-#, c-format
 msgid "expected vim.TabPage object, but got %s"
 msgstr "atteso oggetto vim.TabPage, trovato %s"
 
@@ -7026,15 +6484,12 @@ msgid "E859: Failed to convert returned 
 msgstr ""
 "E859: Conversione non riuscita dell'oggetto python risultato a un valore vim"
 
-#, c-format
 msgid "unable to convert %s to vim dictionary"
 msgstr "impossibile convertire %s a dizionario vim"
 
-#, c-format
 msgid "unable to convert %s to vim list"
 msgstr "impossibile convertire %s a Lista vim"
 
-#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "impossibile convertire %s a struttura vim"
 
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -2020,10 +2020,10 @@ msgstr "E216: Τ褦ʥ롼פ⤷ϥ٥ȤϤޤ: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
@@ -2039,8 +2039,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommandҤ᤮ޤ"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2937,7 +2937,7 @@ msgstr "-q [errorfile]  ǽΥ顼Խ"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4731,7 +4731,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ϥǤϵĤƤޤ"
 
 #
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 ¾ϥǤϵĤƤޤ"
 
 #
@@ -4852,8 +4852,8 @@ msgstr "E869: (NFA) ̤ΤΥڥ졼Ǥ: '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA ɽ) ֤²ɹ˥顼"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA ɽ) ֤ θ ֤ ϤǤޤ!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA ɽ) ֤ θ ֤ ϤǤޤ"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA ɽ) '(' ¿᤮ޤ"
@@ -4864,7 +4864,7 @@ msgstr "E879: (NFA ɽ) \\z( ¿᤮ޤ"
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA ɽ) ü椬ޤ"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) åݥåפǤޤ!"
 
 msgid ""
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -2020,10 +2020,10 @@ msgstr "E216: そのようなグループもしくはイベントはありません: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
@@ -2039,8 +2039,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommandの入れ子が深過ぎます"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2937,7 +2937,7 @@ msgstr "-q [errorfile]  最初のエラーで編集する"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4731,7 +4731,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( はココでは許可されていません"
 
 #
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 その他はココでは許可されていません"
 
 #
@@ -4852,8 +4852,8 @@ msgstr "E869: (NFA) 未知のオペレータです: '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA 正規表現) 繰り返しの制限回数を読込中にエラー"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA 正規表現) '(' が多過ぎます"
@@ -4864,7 +4864,7 @@ msgstr "E879: (NFA 正規表現) \\z( が多過ぎます"
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA 正規表現) 終端記号がありません"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) スタックをポップできません!"
 
 msgid ""
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -2020,10 +2020,10 @@ msgstr "E216: ̂悤ȃO[v̓Cxg͂܂: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
@@ -2039,8 +2039,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommand̓q[߂܂"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2937,7 +2937,7 @@ msgstr "-q [errorfile]  ŏ̃G[ŕҏW"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4731,7 +4731,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ̓RRł͋‚Ă܂"
 
 #
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 ̑̓RRł͋‚Ă܂"
 
 #
@@ -4852,7 +4852,7 @@ msgstr "E869: (NFA) m̃Iy[^ł: '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA K\\) JԂ̐񐔂ǍɃG["
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 msgstr "E871: (NFA K\\) JԂ ̌ JԂ ͂ł܂!"
 
 msgid "E872: (NFA regexp) Too many '('"
@@ -4864,7 +4864,7 @@ msgstr "E879: (NFA K\\) \\z( ߂܂"
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA K\\) I[L܂"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) X^bN|bvł܂!"
 
 msgid ""
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -9,7 +9,8 @@ msgstr ""
 "POT-Creation-Date: 2017-07-12 14:52+0900\n"
 "PO-Revision-Date: 2017-07-12 18:56+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
-"Language-Team: GTP Korean\n"
+"Language-Team: Korean\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1983,7 +1984,7 @@ msgstr "E216: 그런 그룹이나 이벤트 없음: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- 자동-명령 ---"
@@ -2002,7 +2003,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: 자동명령이 너무 깊게 중첩되었습니다"
 
 #, c-format
-#~ msgid "%s Auto commands for \"%s\""
+#~ msgid "%s Autocommands for \"%s\""
 #~ msgstr ""
 
 #, c-format
@@ -2902,7 +2903,7 @@ msgstr "-q [에러파일]   첫 번째 에러가 난 파일 고치기"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4678,7 +4679,7 @@ msgstr "E55: 맞지 않는 %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z(는 여기에서 허용되지 않습니다"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 등은 여기에서 허용되지 않습니다"
 
 #, c-format
@@ -4789,7 +4790,7 @@ msgstr "E869: (NFA) 모르는 오퍼레이터 '\\@%c'"
 #~ msgstr ""
 
 #. Can't have a multi follow a multi.
-#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 #~ msgstr ""
 
 #. Too many `('
@@ -4802,7 +4803,7 @@ msgstr "E879: (NFA 정규표현식) \\z(가 너무 많습니다"
 #~ msgid "E873: (NFA regexp) proper termination error"
 #~ msgstr ""
 
-#~ msgid "E874: (NFA) Could not pop the stack !"
+#~ msgid "E874: (NFA) Could not pop the stack!"
 #~ msgstr ""
 
 #~ msgid ""
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -9,7 +9,8 @@ msgstr ""
 "POT-Creation-Date: 2017-07-12 14:52+0900\n"
 "PO-Revision-Date: 2017-07-12 18:56+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
-"Language-Team: GTP Korean\n"
+"Language-Team: Korean\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1983,7 +1984,7 @@ msgstr "E216: ׷ ׷̳ ̺Ʈ : %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- ڵ- ---"
@@ -2002,7 +2003,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: ڵ ʹ  øǾϴ"
 
 #, c-format
-#~ msgid "%s Auto commands for \"%s\""
+#~ msgid "%s Autocommands for \"%s\""
 #~ msgstr ""
 
 #, c-format
@@ -2902,7 +2903,7 @@ msgstr "-q []   ù °    ġ"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4678,7 +4679,7 @@ msgstr "E55:  ʴ %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ⿡  ʽϴ"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1  ⿡  ʽϴ"
 
 #, c-format
@@ -4789,7 +4790,7 @@ msgstr "E869: (NFA) 𸣴 ۷ '\\@%c'"
 #~ msgstr ""
 
 #. Can't have a multi follow a multi.
-#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi"
 #~ msgstr ""
 
 #. Too many `('
@@ -4802,7 +4803,7 @@ msgstr "E879: (NFA ǥ) \\z( ʹ ϴ"
 #~ msgid "E873: (NFA regexp) proper termination error"
 #~ msgstr ""
 
-#~ msgid "E874: (NFA) Could not pop the stack !"
+#~ msgid "E874: (NFA) Could not pop the stack!"
 #~ msgstr ""
 
 #~ msgid ""
@@ -5273,7 +5274,7 @@ msgstr " ܾ : %d"
 
 #, c-format
 msgid "Writing suggestion file %s..."
-msgstr "%s    ..."
+msgstr "%s     ..."
 
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5294,7 +5295,7 @@ msgstr ": compound NOBREAK   õ"
 
 #, c-format
 msgid "Writing spell file %s..."
-msgstr "spell  %s  ..."
+msgstr "spell  %s   ..."
 
 msgid "Done!"
 msgstr "!"
--- a/src/po/nb.po
+++ b/src/po/nb.po
@@ -1823,7 +1823,7 @@ msgstr "E216: Gruppen eller handlingen f
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokommandoer ---"
@@ -1842,7 +1842,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: Nsting av autokommandoer for dyp"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokommandoer for \"%s\""
 
 #, c-format
@@ -2809,7 +2809,7 @@ msgstr "-q [feilfil]    rediger fil med frste feil"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4569,7 +4569,7 @@ msgstr "E65: Ulovlig tilbakereferanse"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ikke tillatt her"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 med venner er ikke tillatt her"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/nl.po
+++ b/src/po/nl.po
@@ -1882,10 +1882,10 @@ msgstr "E216: onbekende groep of 'event'
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
@@ -1901,8 +1901,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: hierarchie van aanroepen autocommands te diep"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s 'Auto commands' voor \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s 'Autocommands' voor \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2877,7 +2877,7 @@ msgstr "-q [foutbestand]  bewerk bestand
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4161,7 +4161,7 @@ msgstr "E65: ongeldige terugverwijzing"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( hier niet toegestaan"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 en andere hier niet toegestaan"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -1823,7 +1823,7 @@ msgstr "E216: Gruppen eller handlingen f
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokommandoer ---"
@@ -1842,7 +1842,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: Nsting av autokommandoer for dyp"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokommandoer for \"%s\""
 
 #, c-format
@@ -2809,7 +2809,7 @@ msgstr "-q [feilfil]    rediger fil med frste feil"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4569,7 +4569,7 @@ msgstr "E65: Ulovlig tilbakereferanse"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ikke tillatt her"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 med venner er ikke tillatt her"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/pl.UTF-8.po
+++ b/src/po/pl.UTF-8.po
@@ -15,7 +15,7 @@ msgstr ""
 "Language-Team: \n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
@@ -1958,7 +1958,7 @@ msgstr "E216: Nie ma takiej grupy lub wy
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokomendy ---"
@@ -1977,7 +1977,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: zbyt głębokie zagnieżdżenie autokomend"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokomend dla \"%s\""
 
 #, c-format
@@ -2932,7 +2932,7 @@ msgstr "-q [errorfile]  edytuj plik, zawierający pierwszy błąd"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4737,7 +4737,7 @@ msgstr "E55: Niesparowany %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( jest niedozwolone w tym miejscu"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 i podobne są niedozwolone w tym miejscu"
 
 #, c-format
@@ -4837,8 +4837,8 @@ msgid "E870: (NFA regexp) Error reading 
 msgstr "E870: (wyrażenie regularne NFA) Błąd przy odczytywaniu limitów powtórzeń"
 
 #. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (wyrażenie regularne NFA) wielokrotne nie może być po wielokrotnym!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (wyrażenie regularne NFA) wielokrotne nie może być po wielokrotnym"
 
 #. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
@@ -4850,7 +4850,7 @@ msgstr "E879: (wyrażenie regularne NFA) Za dużo \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (wyrażenie regularne NFA) błąd poprawnego zakończenia"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Nie można zdjąć elementu ze stosu!"
 
 msgid ""
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -1958,7 +1958,7 @@ msgstr "E216: Nie ma takiej grupy lub wy
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokomendy ---"
@@ -1977,7 +1977,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: zbyt gbokie zagniedenie autokomend"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokomend dla \"%s\""
 
 #, c-format
@@ -2932,7 +2932,7 @@ msgstr "-q [errorfile]  edytuj plik, zawierajcy pierwszy bd"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4737,7 +4737,7 @@ msgstr "E55: Niesparowany %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( jest niedozwolone w tym miejscu"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 i podobne s niedozwolone w tym miejscu"
 
 #, c-format
@@ -4837,8 +4837,8 @@ msgid "E870: (NFA regexp) Error reading 
 msgstr "E870: (wyraenie regularne NFA) Bd przy odczytywaniu limitw powtrze"
 
 #. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (wyraenie regularne NFA) wielokrotne nie moe by po wielokrotnym!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (wyraenie regularne NFA) wielokrotne nie moe by po wielokrotnym"
 
 #. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
@@ -4850,7 +4850,7 @@ msgstr "E879: (wyraenie regularne NFA) Za duo \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (wyraenie regularne NFA) bd poprawnego zakoczenia"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Nie mona zdj elementu ze stosu!"
 
 msgid ""
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -1958,7 +1958,7 @@ msgstr "E216: Nie ma takiej grupy lub wy
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokomendy ---"
@@ -1977,7 +1977,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: zbyt gbokie zagniedenie autokomend"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokomend dla \"%s\""
 
 #, c-format
@@ -2932,7 +2932,7 @@ msgstr "-q [errorfile]  edytuj plik, zawierajcy pierwszy bd"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4737,7 +4737,7 @@ msgstr "E55: Niesparowany %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( jest niedozwolone w tym miejscu"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 i podobne s niedozwolone w tym miejscu"
 
 #, c-format
@@ -4837,8 +4837,8 @@ msgid "E870: (NFA regexp) Error reading 
 msgstr "E870: (wyraenie regularne NFA) Bd przy odczytywaniu limitw powtrze"
 
 #. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (wyraenie regularne NFA) wielokrotne nie moe by po wielokrotnym!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (wyraenie regularne NFA) wielokrotne nie moe by po wielokrotnym"
 
 #. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
@@ -4850,7 +4850,7 @@ msgstr "E879: (wyraenie regularne NFA) Za duo \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (wyraenie regularne NFA) bd poprawnego zakoczenia"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Nie mona zdj elementu ze stosu!"
 
 msgid ""
--- a/src/po/pt_BR.po
+++ b/src/po/pt_BR.po
@@ -1990,7 +1990,7 @@ msgstr "E216: Grupo ou evento inexistent
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocomandos ---"
@@ -2009,7 +2009,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocomandos aninhados demais"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "Comandos automáticos %s para \"%s\""
 
 #, c-format
@@ -2915,7 +2915,7 @@ msgstr "-q [arq.erro]   editar arquivo e
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4719,7 +4719,7 @@ msgstr "E55: %s) sem correspondente"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( não é permitido aqui"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 e cia. não são permitidos aqui"
 
 #, c-format
@@ -4830,8 +4830,8 @@ msgstr "E869: (NFA) Operador '\\@%c' des
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Erro ao ler limites de repetição"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Não é possível um multi seguindo outro multi!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp) Não é possível um multi seguindo outro multi"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp) Muitos '('"
@@ -4842,7 +4842,7 @@ msgstr "E879: (NFA regexp) Muitos \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) terminação imprópria"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) não foi possível desempilhar a pilha!"
 
 msgid ""
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -2037,7 +2037,7 @@ msgstr "E216:    : %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "---  ---"
@@ -2056,7 +2056,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218:    "
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s   \"%s\""
 
 #, c-format
@@ -2970,7 +2970,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4798,7 +4798,7 @@ msgstr "E55:    %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z(     "
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1  ..     "
 
 #, c-format
@@ -4912,8 +4912,8 @@ msgstr "E869: ()   '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (.  )     "
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (.  )      !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (.  )      "
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (.  )   '('"
@@ -4924,7 +4924,7 @@ msgstr "E879: (.  )   \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (.  )   "
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (.  )    !"
 
 msgid ""
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -2037,7 +2037,7 @@ msgstr "E216: Несуществующая группа или событие: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Автокоманды ---"
@@ -2056,7 +2056,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: слишком глубоко вложенные автокоманды"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Автокоманды для \"%s\""
 
 #, c-format
@@ -2970,7 +2970,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4798,7 +4798,7 @@ msgstr "E55: Нет пары для %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( не может быть использовано здесь"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 и т.п. не могут быть использованы здесь"
 
 #, c-format
@@ -4912,8 +4912,8 @@ msgstr "E869: (НКА) неизвестный оператор '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (рег. выражение НКА) ошибка при чтении границ повторения"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (рег. выражение НКА) множество не может следовать за множеством!"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (рег. выражение НКА) множество не может следовать за множеством"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (рег. выражение НКА) слишком много '('"
@@ -4924,7 +4924,7 @@ msgstr "E879: (рег. выражение НКА) слишком много \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (рег. выражение НКА) ошибка корректного завершения"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (рег. выражение НКА) невозможно взять из стека!"
 
 msgid ""
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -1672,7 +1672,7 @@ msgstr "E216: Udalos alebo skupina %s neexistuje"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Automatick prkazy ---"
@@ -1690,7 +1690,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: vnorenia automatickho prkazu s prli hlbok"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Automatick prkazy pre \"%s\""
 
 #, c-format
@@ -2607,7 +2607,7 @@ msgstr "-q [chybov sbor]  upravi sbor na mieste vskytu prvej chyby"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4348,7 +4348,7 @@ msgstr "E65: Chybn sptn referencia"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( tu nie je povolen"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 a spol. tu nie je povolen"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -1672,7 +1672,7 @@ msgstr "E216: Udalos alebo skupina %s neexistuje"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Automatick prkazy ---"
@@ -1690,7 +1690,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: vnorenia automatickho prkazu s prli hlbok"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Automatick prkazy pre \"%s\""
 
 #, c-format
@@ -2607,7 +2607,7 @@ msgstr "-q [chybov sbor]  upravi sbor na mieste vskytu prvej chyby"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4348,7 +4348,7 @@ msgstr "E65: Chybn sptn referencia"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( tu nie je povolen"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 a spol. tu nie je povolen"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/sr.po
+++ b/src/po/sr.po
@@ -2024,7 +2024,7 @@ msgstr "E216: Нема такве групе или догађаја: %s"
 
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Ауто-Команде ---"
@@ -2043,7 +2043,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: Угњшждавање аутокоманде је сувише дубоко"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Ауто команде за \"%s\""
 
 #, c-format
@@ -2958,7 +2958,7 @@ msgstr "-q [дат.грешке]     уређуј датотеку са првом грешком"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4764,7 +4764,7 @@ msgstr "E55: Неупарена %s)"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( овде није дозвољено"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 и остали онвде нису дозвољени"
 
 #, c-format
@@ -4878,8 +4878,8 @@ msgstr "E869: (NFA) Непознати оператор '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Грешка при читању граница понављања"
 
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Мулти не може следи иза мулти !"
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp) Мулти не може следи иза мулти"
 
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp) Превише '('"
@@ -4890,7 +4890,7 @@ msgstr "E879: (NFA regexp) Превише \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) грешка правилне терминације"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Скидање са стека није успело !"
 
 msgid ""
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -1792,7 +1792,7 @@ msgstr "E216: Ingen sdan grupp eller hndelse: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autokommandon ---"
@@ -1811,7 +1811,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autokommando nstlad fr djupt"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Autokommandon fr \"%s\""
 
 #, c-format
@@ -2784,7 +2784,7 @@ msgstr "-q [felfil]    redigera fil med frsta fel"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4548,7 +4548,7 @@ msgstr "E65: Otillten baktreferens"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z{ inte tilltet hr"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 m.fl. inte tilltet hr"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -1,5 +1,5 @@
 #
-# Ukrainian Vim translation [uk]
+# Ukrainian translation for Vim
 #
 # Generated from uk.po, DO NOT EDIT
 #
@@ -12,16 +12,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 8.0\n"
+"Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-12 12:22+0300\n"
+"POT-Creation-Date: 2018-06-20 06:30+0300\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator:   <sakhnik@gmail.com>\n"
-"Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
+"Language-Team: Ukrainian\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831:  bf_key_init()   "
@@ -95,7 +96,6 @@ msgstr "E90:     "
 msgid "E84: No modified buffer found"
 msgstr "E84:    "
 
-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85:    "
 
@@ -109,6 +109,18 @@ msgstr "E88:    "
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89:  %ld   (!   )"
 
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948:     ( !  )"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37:     (!   )"
+
+msgid "E948: Job still running"
+msgstr "E948:    "
+
+msgid "E37: No write since last change"
+msgstr "E37:    "
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: :    "
 
@@ -164,7 +176,6 @@ msgstr " %ld  %ld --%d%%--  "
 msgid "[No Name]"
 msgstr "[ ]"
 
-#. must be a help buffer
 msgid "help"
 msgstr ""
 
@@ -190,6 +201,12 @@ msgstr ""
 "\n"
 "#  :\n"
 
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382:   ,   'buftype'"
+
+msgid "[Prompt]"
+msgstr "[ϳ]"
+
 msgid "[Scratch]"
 msgstr "[ ]"
 
@@ -363,7 +380,6 @@ msgstr "E791:   "
 msgid " Keyword completion (^N^P)"
 msgstr "    (^N^P)"
 
-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr "  ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
@@ -442,10 +458,6 @@ msgstr "  "
 msgid " Adding"
 msgstr " "
 
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- ..."
 
@@ -467,7 +479,6 @@ msgid "match %d"
 msgstr " %d"
 
 # msgstr "E17: "
-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18:    :let"
 
@@ -529,8 +540,6 @@ msgstr "E690:  in  :for"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108:  : %s"
 
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940:      %s"
@@ -541,21 +550,6 @@ msgstr "E743:       -/."
 msgid "E109: Missing ':' after '?'"
 msgstr "E109:  ':'  '?'"
 
-msgid "E691: Can only compare List with List"
-msgstr "E691:      "
-
-msgid "E692: Invalid operation for List"
-msgstr "E692:    "
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735:      "
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736:    "
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694:    "
-
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804:    '%'  Float"
 
@@ -684,6 +678,21 @@ msgstr ""
 "\n"
 "\t   "
 
+msgid "E691: Can only compare List with List"
+msgstr "E691:      "
+
+msgid "E692: Invalid operation for List"
+msgstr "E692:    "
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735:      "
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736:    "
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694:    "
+
 # msgstr "E14: "
 msgid "map() argument"
 msgstr " map()"
@@ -711,15 +720,16 @@ msgstr " add()"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete()      "
 
-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
 msgid "&Ok"
 msgstr "&O:"
 
 #, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld : "
+msgstr[1] "+-%s%3ld : "
+
+#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700:  : %s"
 
@@ -835,6 +845,14 @@ msgid "Entering Debug mode.  Type \"cont
 msgstr " .     cont."
 
 #, c-format
+msgid "Oldval = \"%s\""
+msgstr "Oldval = %s"
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Newval = %s"
+
+#, c-format
 msgid "line %ld: %s"
 msgstr " %ld: %s"
 
@@ -864,6 +882,10 @@ msgstr "    "
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d %s %s    %ld"
 
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d   %s"
+
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750:   :profile start {}"
 
@@ -874,8 +896,9 @@ msgstr " "
 msgid "Save changes to \"%s\"?"
 msgstr "   %s?"
 
-msgid "Untitled"
-msgstr ""
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947:       %s"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
@@ -985,10 +1008,22 @@ msgid "E197: Cannot set language to \"%s
 msgstr "E197:     %s"
 
 #, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
+msgstr "<%s>%s%s  %d,   %02x,  %03o,  %s"
+
+#, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,   %02x,  %03o"
 
 #, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d,  %04x,  %o,  %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d,  %08x,  %o,  %s"
+
+#, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d,  %04x,  %o"
 
@@ -1039,7 +1074,6 @@ msgstr "  "
 msgid " FAILED"
 msgstr "  "
 
-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137:      viminfo: %s"
@@ -1060,7 +1094,6 @@ msgstr "  viminfo %s"
 msgid "E886: Can't rename viminfo file to %s!"
 msgstr "E886:     viminfo  %s!"
 
-#. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "#     Vim %s.\n"
@@ -1177,7 +1210,6 @@ msgstr "   "
 msgid " on %ld lines"
 msgstr "  %ld "
 
-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global      "
 
@@ -1328,9 +1360,6 @@ msgstr "E943:    ,  'make cmdidxs'"
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ,      "
 
-msgid "E172: Only one file name allowed"
-msgstr "E172:     "
-
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "    .   ?"
 
@@ -1504,7 +1533,6 @@ msgid "E190: Cannot open \"%s\" for writ
 msgstr "E190:    %s  "
 
 # msgstr "E190: "
-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191:    , `  '"
 
@@ -1544,13 +1572,15 @@ msgstr "E500:    "
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195:     viminfo"
 
+msgid "Untitled"
+msgstr ""
+
 msgid "E196: No digraphs in this version"
 msgstr "E196:     "
 
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608:    (:throw)    'Vim'"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr " : %s"
@@ -1567,7 +1597,6 @@ msgstr " : %s"
 msgid "%s, line %ld"
 msgstr "%s,  %ld"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr "  : %s"
@@ -1594,7 +1623,6 @@ msgstr ", "
 msgid "Error"
 msgstr ""
 
-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr ""
 
@@ -1637,15 +1665,12 @@ msgstr "E601:   :try"
 msgid "E603: :catch without :try"
 msgstr "E603: :catch  :try"
 
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch  :finally"
 
 msgid "E606: :finally without :try"
 msgstr "E606: :finally  :try"
 
-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607:   :finally"
 
@@ -1742,7 +1767,6 @@ msgstr "Vim:   stdin...\n"
 msgid "Reading from stdin..."
 msgstr "  stdin..."
 
-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202:    !"
 
@@ -1834,9 +1858,6 @@ msgstr "E509:      (!   )"
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510:      (!   )"
 
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: ó    (!   )"
-
 msgid "E214: Can't find temp file for writing"
 msgstr "E214:       "
 
@@ -1849,8 +1870,9 @@ msgstr "E166:      ' "
 msgid "E212: Can't open file for writing"
 msgstr "E212:      "
 
-msgid "E667: Fsync failed"
-msgstr "E667:    fsync"
+# msgstr "E79: "
+msgid "E949: File changed while writing"
+msgstr "E949:     "
 
 msgid "E512: Close failed"
 msgstr "E512:   "
@@ -1950,9 +1972,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[  ]"
 
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr ":      !!!"
 
@@ -2030,7 +2049,6 @@ msgstr "----"
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "  : %s <=%d>"
 
-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367:   : %s"
@@ -2056,10 +2074,9 @@ msgid "E216: No such group or event: %s"
 msgstr "E216:     䳿: %s"
 
 # msgstr "E216: "
-#. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "---  ---"
@@ -2080,7 +2097,7 @@ msgstr "E218:   "
 
 # msgstr "E218: "
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr " %s  %s"
 
 #, c-format
@@ -2109,6 +2126,12 @@ msgstr "E350:      'foldmethod'"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351:      'foldmethod'"
 
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld   "
+msgstr[1] "+--%3ld   "
+
 msgid "E222: Add to read buffer"
 msgstr "E222:    "
 
@@ -2250,18 +2273,15 @@ msgstr ":"
 msgid "Replace with:"
 msgstr " :"
 
-#. whole word only button
 msgid "Match whole word only"
 msgstr "  "
 
-#. match case button
 msgid "Match case"
 msgstr "  "
 
 msgid "Direction"
 msgstr ""
 
-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr ""
 
@@ -2335,14 +2355,12 @@ msgid "Open tab..."
 msgstr "³ ..."
 
 # msgstr "E245: "
-msgid "Find string (use '\\\\' to find  a '\\')"
+msgid "Find string (use '\\\\' to find a '\\')"
 msgstr "  ('\\\\'   '\\')"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgid "Find & Replace (use '\\\\' to find a '\\')"
 msgstr "   ('\\\\'   '\\')"
 
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
 msgid "Not Used"
 msgstr ""
 
@@ -2419,7 +2437,6 @@ msgstr "Vim -  "
 msgid "Name:"
 msgstr ":"
 
-#. create toggle button
 msgid "Show size in Points"
 msgstr "   "
 
@@ -2671,7 +2688,6 @@ msgstr "E261: '  cscope %s  "
 msgid "cscope connection %s closed"
 msgstr "'  cscope %s "
 
-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570:    cs_manage_matches"
 
@@ -2834,7 +2850,6 @@ msgstr "  "
 msgid "not implemented yet"
 msgstr "  "
 
-#. ???
 msgid "cannot set line(s)"
 msgstr "   "
 
@@ -2874,7 +2889,6 @@ msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr "   : /  "
 
-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@@ -2977,7 +2991,6 @@ msgstr "Vim: :    \n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: :    \n"
 
-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "  vimrc"
 
@@ -3008,7 +3021,7 @@ msgstr "-q []          "
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -3240,6 +3253,9 @@ msgstr ""
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t <viminfo>  .viminfo"
 
+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible', Vim ,  ,  viminfo"
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h    --help\t    "
 
@@ -3339,11 +3355,9 @@ msgstr "--windowid <HWND>\t³ Vim    win32"
 msgid "No display"
 msgstr " "
 
-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr ":   .\n"
 
-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ":   .    \n"
 
@@ -3365,7 +3379,6 @@ msgid "E283: No marks matching \"%s\""
 msgstr "E283:  %s  "
 
 # msgstr "E283: "
-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3373,7 +3386,6 @@ msgstr ""
 "\n"
 ". .  . /"
 
-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3382,7 +3394,6 @@ msgstr ""
 "  . . /"
 
 # msgstr "E283: "
-#. Highlight title
 msgid ""
 "\n"
 "change line  col text"
@@ -3398,7 +3409,6 @@ msgstr ""
 "\n"
 "# :\n"
 
-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3475,7 +3485,6 @@ msgstr "E298:   2?"
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843:     "
 
-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ,   !!!"
 
@@ -3662,7 +3671,6 @@ msgstr ""
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr "        .\n"
 
-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "  :"
 
@@ -3841,8 +3849,6 @@ msgstr "   \""
 msgid "      NEWER than swap file!\n"
 msgstr "      ²   !\n"
 
-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3934,7 +3940,6 @@ msgstr "E328:       "
 msgid "E329: No menu \"%s\""
 msgstr "E329:   %s"
 
-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792:   "
 
@@ -3951,8 +3956,6 @@ msgid "E332: Separator cannot be part of
 msgstr "E332:       "
 
 # msgstr "E332: "
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3963,6 +3966,11 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "³  "
 
+# msgstr "E334: "
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335:   %s   "
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333:      "
 
@@ -3971,11 +3979,6 @@ msgstr "E333:      "
 msgid "E334: Menu not found: %s"
 msgstr "E334:   : %s"
 
-# msgstr "E334: "
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335:   %s   "
-
 # msgstr "E335: "
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336:     "
@@ -4048,7 +4051,6 @@ msgstr "' "
 msgid "Open File dialog"
 msgstr "³ "
 
-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: ,       "
 
@@ -4223,7 +4225,8 @@ msgid "E663: At end of changelist"
 msgstr "E663: ʳ  "
 
 msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
-msgstr "  :qa!    <Enter>,        Vim"
+msgstr ""
+"  :qa!    <Enter>,        Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4255,7 +4258,6 @@ msgstr " : %ld"
 msgid "E748: No previously used register"
 msgstr "E748:     "
 
-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "  ';   ?"
 
@@ -4270,26 +4272,31 @@ msgstr " : %ld"
 msgid "freeing %ld lines"
 msgstr " : %ld"
 
-msgid "block of 1 line yanked"
-msgstr "'    "
-
-msgid "1 line yanked"
-msgstr "'  "
-
-#, c-format
-msgid "block of %ld lines yanked"
-msgstr "'   %ld "
-
-#, c-format
-msgid "%ld lines yanked"
-msgstr "' : %ld"
+#, c-format
+msgid " into \"%c"
+msgstr "  \"%c"
+
+#, c-format
+msgid "block of 1 line yanked%s"
+msgstr "  1  %s"
+
+#, c-format
+msgid "1 line yanked%s"
+msgstr "1  %s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "  %ld  %s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld  %s"
 
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353:   %s  "
 
 # msgstr "E353: "
-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4347,11 +4354,8 @@ msgstr ""
 " %lld  %lld"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld  BOM)"
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=. %N"
+msgid "(+%lld for BOM)"
+msgstr "(+%lld  BOM)"
 
 msgid "Thanks for flying Vim"
 msgstr "   Vim"
@@ -4403,6 +4407,10 @@ msgstr "E835:    'fillchars'"
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617:     GUI GTK+ 2"
 
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950:     %s  %s"
+
 msgid "E524: Missing colon"
 msgstr "E524:  "
 
@@ -4460,6 +4468,9 @@ msgstr "E541:  "
 msgid "E542: unbalanced groups"
 msgstr "E542:   "
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946:        "
+
 msgid "E590: A preview window already exists"
 msgstr "E590: ³   "
 
@@ -4467,6 +4478,9 @@ msgid "W17: Arabic requires UTF-8, do ':
 msgstr ""
 "W17:     UTF-8,  ':set encoding=utf-8'"
 
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24-      "
+
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593:   %d "
@@ -4479,9 +4493,6 @@ msgstr "E594:   %d "
 msgid "E355: Unknown option: %s"
 msgstr "E355:  : %s"
 
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521:   Number: &%s = '%s'"
@@ -4559,7 +4570,6 @@ msgstr "     ?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize:  ??\n"
 
-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360:       -f"
 
@@ -4763,6 +4773,9 @@ msgstr " Vim"
 msgid "shell returned %d"
 msgstr "  %d"
 
+msgid "E926: Current location list was changed"
+msgstr "E926:    "
+
 # msgstr "E371: "
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4793,7 +4806,6 @@ msgid "E377: Invalid %%%c in format stri
 msgstr "E377:  `%%%c'   "
 
 # msgstr "E377: "
-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat'   "
 
@@ -4810,9 +4822,6 @@ msgstr "E924:    "
 msgid "E925: Current quickfix was changed"
 msgstr "E925:  quickfix "
 
-msgid "E926: Current location list was changed"
-msgstr "E926:    "
-
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d  %d)%s%s: "
@@ -4833,9 +4842,6 @@ msgstr "E381:   "
 msgid "No entries"
 msgstr "ͳ"
 
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382:   ,   'buftype'"
-
 # msgstr "E231: "
 msgid "Error file"
 msgstr " "
@@ -4884,7 +4890,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z(   "
 
 # msgstr "E406: "
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1  .   "
 
 #, c-format
@@ -4986,11 +4992,13 @@ msgstr "E877: (NFA regexp)   : %ld"
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA)   '\\z%c'"
 
+msgid "E951: \\% value too large"
+msgstr "E951:  \\% "
+
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA)   '\\%%%c'"
 
-#. should never happen
 msgid "E868: Error building NFA with equivalence class!"
 msgstr "E868:    NFA   !"
 
@@ -5001,11 +5009,9 @@ msgstr "E869: (NFA)   '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp)     "
 
-#. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp)      !"
-
-#. Too many `('
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp)      "
+
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp)  '('"
 
@@ -5015,7 +5021,7 @@ msgstr "E879: (NFA regexp)  \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp)   "
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA)  !"
 
 msgid ""
@@ -5031,8 +5037,7 @@ msgstr "E876: (NFA regexp)  ,    NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA)       !"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
+msgid "Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "       ,   "
 "stderr... "
@@ -5041,6 +5046,12 @@ msgstr ""
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA)   ² %s!"
 
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"       ,   "
+"stderr ... "
+
 msgid "Could not open temporary log file for writing "
 msgstr "        "
 
@@ -5114,7 +5125,6 @@ msgstr "E386: ϳ `;'   `?'  `/'"
 msgid " (includes previously listed match)"
 msgstr " (   )"
 
-#. cursor at status line
 msgid "--- Included files "
 msgstr "---   "
 
@@ -5193,8 +5203,6 @@ msgstr ",  "
 msgid "Sorry, only %ld suggestions"
 msgstr ",  %ld "
 
-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr " %.*s :"
@@ -5416,8 +5424,8 @@ msgid "E760: No word count in %s"
 msgstr "E760:     %s"
 
 #, c-format
-msgid "line %6d, word %6d - %s"
-msgstr " %6d,  %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr " %6d,  %6ld - %s"
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
@@ -5481,10 +5489,6 @@ msgstr " %d  %d ;  %d (%d%%)"
 msgid "Reading back spell file..."
 msgstr "  ..."
 
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "  ..."
 
@@ -5507,8 +5511,9 @@ msgstr "  ': %d "
 msgid "E751: Output file name must not have region name"
 msgstr "E751:       "
 
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ϳ    "
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: ϳ   %ld "
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5539,8 +5544,6 @@ msgstr " '%.*s'   %s"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763:       "
 
-#. This should have been checked when generating the .spl
-#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783:     MAP"
 
@@ -5834,7 +5837,6 @@ msgstr "E428:     "
 msgid "File \"%s\" does not exist"
 msgstr " %s  "
 
-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr " %d  %d%s"
@@ -5850,7 +5852,6 @@ msgid "E429: File \"%s\" does not exist"
 msgstr "E429:  %s  "
 
 # msgstr "E429: "
-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5884,7 +5885,6 @@ msgid "E432: Tags file not sorted: %s"
 msgstr "E432:    : %s"
 
 # msgstr "E432: "
-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433:   "
 
@@ -5923,7 +5923,6 @@ msgstr "E436:   %s   "
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437:    cm"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5934,6 +5933,33 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "  $VIMRUNTIME/rgb.txt"
 
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "   %s?"
+
+msgid "Terminal"
+msgstr ""
+
+msgid "Terminal-finished"
+msgstr "-"
+
+msgid "active"
+msgstr ""
+
+msgid "running"
+msgstr ""
+
+msgid "finished"
+msgstr ""
+
+# msgstr "E226: "
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953:   : %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955:   "
+
 msgid "new shell started\n"
 msgstr "  \n"
 
@@ -5944,12 +5970,9 @@ msgstr "Vim:   ,  ...\n"
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr " CUT_BUFFER0   "
 
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: ʳ   "
 
-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "  ,   "
 
@@ -6248,24 +6271,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"MacOS X (unix) version"
-msgstr ""
-"\n"
-"  MacOS X (unix)"
+"macOS version"
+msgstr ""
+"\n"
+" macOS"
 
 msgid ""
 "\n"
-"MacOS X version"
-msgstr ""
-"\n"
-"  MacOS X"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"  MacOS"
+"macOS version w/o darwin feat."
+msgstr ""
+"\n"
+" macOS  darwin."
 
 msgid ""
 "\n"
@@ -6369,9 +6385,6 @@ msgstr " GUI Carbon."
 msgid "with Cocoa GUI."
 msgstr " GUI Cocoa."
 
-msgid "with (classic) GUI."
-msgstr " () GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "   (+)    (-) :\n"
 
@@ -6581,7 +6594,6 @@ msgstr "   Vim"
 msgid "Edit with &Vim"
 msgstr "   &Vim"
 
-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "    Vim - "
 
@@ -6601,10 +6613,6 @@ msgstr "  !"
 msgid "--No lines in buffer--"
 msgstr "-- --"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470:  "
 
@@ -6682,6 +6690,14 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475:  : %s"
 
 #, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475:     %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475:     %s: %s"
+
+#, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15:  : %s"
 
@@ -6701,6 +6717,9 @@ msgstr "E17: %s   "
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364:    %s()  "
 
+msgid "E667: Fsync failed"
+msgstr "E667:    fsync"
+
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448:      %s"
@@ -6813,12 +6832,6 @@ msgstr "E484:     %s"
 msgid "E485: Can't read file %s"
 msgstr "E485:     %s"
 
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37:     (!   )"
-
-msgid "E37: No write since last change"
-msgstr "E37:    "
-
 msgid "E38: Null argument"
 msgstr "E38: ³ "
 
@@ -7000,6 +7013,9 @@ msgstr "E850:   "
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919:   : '%s': %s"
 
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952:    "
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "   ,   ʲ"
 
@@ -7108,7 +7124,6 @@ msgstr "     "
 msgid "list index out of range"
 msgstr "   "
 
-#. No more suitable format specifications in python-2.3
 #, c-format
 msgid "internal error: failed to get vim list item %d"
 msgstr " :      vim %d"
@@ -7272,3 +7287,47 @@ msgid ""
 msgstr ""
 "   : sys.path  \n"
 "   vim.VIM_SPECIAL_PATH  sys.path"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+" Vim (*.vim)\t*.vim\n"
+"  (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "  (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*.*)\t*.*\n"
+" C (*.c, *.h)\t*.c;*.h\n"
+" C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+" VB (*.bas, *.frm)\t*.bas;*.frm\n"
+" Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+" Vim (*.vim)\t*.vim\n"
+"  (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "  (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*)\t*\n"
+" C (*.c, *.h)\t*.c;*.h\n"
+" C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+" Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -1,5 +1,5 @@
 #
-# Ukrainian Vim translation [uk]
+# Ukrainian translation for Vim
 #
 # Original translations
 #
@@ -12,16 +12,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 8.0\n"
+"Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-12 12:22+0300\n"
+"POT-Creation-Date: 2018-06-20 06:30+0300\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n"
-"Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
+"Language-Team: Ukrainian\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: Викликано bf_key_init() з порожнім паролем"
@@ -95,7 +96,6 @@ msgstr "E90: Не можу вивантажити останній буфер"
 msgid "E84: No modified buffer found"
 msgstr "E84: Жоден буфер не змінено"
 
-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85: У списку немає буферів"
 
@@ -109,6 +109,18 @@ msgstr "E88: Це вже найперший буфер"
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: Буфер %ld має зміни (! щоб не зважати)"
 
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: Завдання все ще виконується (додайте ! щоб закінчити)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Зміни не було записано (! щоб не зважати)"
+
+msgid "E948: Job still running"
+msgstr "E948: Завдання вже ще виконується"
+
+msgid "E37: No write since last change"
+msgstr "E37: Не записано попередні зміни"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Обережно: Список назв файлів переповнено"
 
@@ -164,7 +176,6 @@ msgstr "рядок %ld з %ld --%d%%-- колонка "
 msgid "[No Name]"
 msgstr "[Без назви]"
 
-#. must be a help buffer
 msgid "help"
 msgstr "допомога"
 
@@ -190,6 +201,12 @@ msgstr ""
 "\n"
 "# Список буферів:\n"
 
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: Не можу записати, вказана опція 'buftype'"
+
+msgid "[Prompt]"
+msgstr "[Підказка]"
+
 msgid "[Scratch]"
 msgstr "[З нуля]"
 
@@ -363,7 +380,6 @@ msgstr "E791: Елемент розкладки порожній"
 msgid " Keyword completion (^N^P)"
 msgstr " Доповнення ключових слів (^N^P)"
 
-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " Режим ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
@@ -442,10 +458,6 @@ msgstr "збіг у файлі"
 msgid " Adding"
 msgstr " Додається"
 
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- Пошук..."
 
@@ -467,7 +479,6 @@ msgid "match %d"
 msgstr "збіг %d"
 
 # msgstr "E17: "
-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Неочікувані символи у :let"
 
@@ -529,8 +540,6 @@ msgstr "E690: Пропущено «in» після :for"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Змінної немає: «%s»"
 
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: Неможливо заблокувати чи розблокувати змінну %s"
@@ -541,21 +550,6 @@ msgstr "E743: Змінна має забагато вкладень щоб бути за-/відкритою."
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Бракує ':' після '?'"
 
-msgid "E691: Can only compare List with List"
-msgstr "E691: Список можна порівняти тільки зі списком"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: Некоректна операція над списком"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Словник можна порівняти тільки із словником"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Некоректна операція над словником"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Некоректна операція над функцією"
-
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Не можна виконати '%' над Float"
 
@@ -684,6 +678,21 @@ msgstr ""
 "\n"
 "\tВостаннє змінена у "
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: Список можна порівняти тільки зі списком"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: Некоректна операція над списком"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Словник можна порівняти тільки із словником"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Некоректна операція над словником"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Некоректна операція над функцією"
+
 # msgstr "E14: "
 msgid "map() argument"
 msgstr "аргумент map()"
@@ -711,15 +720,16 @@ msgstr "аргумент add()"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() можна вживати тільки в режимі вставки"
 
-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
 msgid "&Ok"
 msgstr "&O:Гаразд"
 
 #, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld рядок: "
+msgstr[1] "+-%s%3ld рядків: "
+
+#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Невідома функція: %s"
 
@@ -835,6 +845,14 @@ msgid "Entering Debug mode.  Type \"cont
 msgstr "Режим налагодження.  Щоб продовжити введіть «cont»."
 
 #, c-format
+msgid "Oldval = \"%s\""
+msgstr "Oldval = «%s»"
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Newval = «%s»"
+
+#, c-format
 msgid "line %ld: %s"
 msgstr "рядок %ld: %s"
 
@@ -864,6 +882,10 @@ msgstr "Не визначено жодної точки зупинки"
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d %s %s   рядок %ld"
 
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  вираз %s"
+
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Спочатку зробіть «:profile start {файл}»"
 
@@ -874,8 +896,9 @@ msgstr "Зберегти як"
 msgid "Save changes to \"%s\"?"
 msgstr "Зберегти зміни в «%s»?"
 
-msgid "Untitled"
-msgstr "Неназваний"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: Завдання вже ще виконується у буфері «%s»"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
@@ -985,10 +1008,22 @@ msgid "E197: Cannot set language to \"%s
 msgstr "E197: Не вдалося встановити мову «%s»"
 
 #, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
+msgstr "<%s>%s%s  %d,  шіст %02x, віс %03o, дигр %s"
+
+#, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  шіст %02x, віс %03o"
 
 #, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d, шіст %04x, віс %o, дигр %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d, шіст %08x, віс %o, дигр %s"
+
+#, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, шіст %04x, віс %o"
 
@@ -1039,7 +1074,6 @@ msgstr " старі файли"
 msgid " FAILED"
 msgstr " НЕ ВДАЛОСЯ"
 
-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Не дозволено запис у файл viminfo: %s"
@@ -1060,7 +1094,6 @@ msgstr "Записується файл viminfo «%s»"
 msgid "E886: Can't rename viminfo file to %s!"
 msgstr "E886: Не вдалося перейменувати файл viminfo у %s!"
 
-#. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Цей файл автоматично створений Vim %s.\n"
@@ -1177,7 +1210,6 @@ msgstr " в одному рядку"
 msgid " on %ld lines"
 msgstr " в %ld рядках"
 
-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global не можна вживати рекурсивно з діапазоном"
 
@@ -1328,9 +1360,6 @@ msgstr "E943: Таблицю команд потрібно поновити, запустіть 'make cmdidxs'"
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Вибачте, цієї команди немає у цій версії"
 
-msgid "E172: Only one file name allowed"
-msgstr "E172: Дозволено тільки одну назву файлу"
-
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "Залишилося відредагувати ще один файл. Все одно вийти?"
 
@@ -1504,7 +1533,6 @@ msgid "E190: Cannot open \"%s\" for writ
 msgstr "E190: Не вдалося відкрити «%s» для запису"
 
 # msgstr "E190: "
-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Аргумент має бути літерою, ` або '"
 
@@ -1544,13 +1572,15 @@ msgstr "E500: Результат — порожній рядок"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Не вдалося прочитати файл viminfo"
 
+msgid "Untitled"
+msgstr "Неназваний"
+
 msgid "E196: No digraphs in this version"
 msgstr "E196: У цій версії немає диграфів"
 
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Не можна викидати (:throw) винятки з префіксом 'Vim'"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Виняткова ситуація: %s"
@@ -1567,7 +1597,6 @@ msgstr "Виняток скинуто: %s"
 msgid "%s, line %ld"
 msgstr "%s, рядок %ld"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Спіймано виняткову ситуацію: %s"
@@ -1594,7 +1623,6 @@ msgstr "Помилка, перервано"
 msgid "Error"
 msgstr "Помилка"
 
-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr "Перервано"
 
@@ -1637,15 +1665,12 @@ msgstr "E601: Забагато вкладених :try"
 msgid "E603: :catch without :try"
 msgstr "E603: :catch без :try"
 
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch після :finally"
 
 msgid "E606: :finally without :try"
 msgstr "E606: :finally без :try"
 
-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607: Не одне :finally"
 
@@ -1742,7 +1767,6 @@ msgstr "Vim: Читається з stdin...\n"
 msgid "Reading from stdin..."
 msgstr "Читається з stdin..."
 
-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Конвертація унеможливила читання файлу!"
 
@@ -1834,9 +1858,6 @@ msgstr "E509: Не вдалося створити резервну копію (! щоб не зважати)"
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: Не вдалося зробити резервну копію (! щоб не зважати)"
 
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: Гілку ресурсів можна втратити (! щоб не зважати)"
-
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Не вдалося підшукати тимчасовий файл для запису"
 
@@ -1849,8 +1870,9 @@ msgstr "E166: Не вдалося відкрити для запису зв'язаний файл"
 msgid "E212: Can't open file for writing"
 msgstr "E212: Не вдалося відкрити файл для запису"
 
-msgid "E667: Fsync failed"
-msgstr "E667: Не вдалося виконати fsync"
+# msgstr "E79: "
+msgid "E949: File changed while writing"
+msgstr "E949: Файл змінивля під час запису"
 
 msgid "E512: Close failed"
 msgstr "E512: Не вдалося закрити"
@@ -1950,9 +1972,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[Неповний останній рядок]"
 
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ЗАСТЕРЕЖЕННЯ: Файл змінився з часу останнього читання!!!"
 
@@ -2030,7 +2049,6 @@ msgstr "--Знищено--"
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Автоматичне знищення автокоманди: %s <буфер=%d>"
 
-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Немає такої групи: «%s»"
@@ -2056,10 +2074,9 @@ msgid "E216: No such group or event: %s"
 msgstr "E216: Немає такої групи чи події: %s"
 
 # msgstr "E216: "
-#. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Автокоманди ---"
@@ -2080,7 +2097,7 @@ msgstr "E218: Забагато вкладених автокоманд"
 
 # msgstr "E218: "
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "Автокоманди %s для «%s»"
 
 #, c-format
@@ -2109,6 +2126,12 @@ msgstr "E350: Не вдалося створити згортку методом 'foldmethod'"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Не вдалося знищити згортку методом 'foldmethod'"
 
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld рядок згорнуто "
+msgstr[1] "+--%3ld рядків згорнуто "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: Додати до буфера читання"
 
@@ -2250,18 +2273,15 @@ msgstr "Знайти:"
 msgid "Replace with:"
 msgstr "Замінити на:"
 
-#. whole word only button
 msgid "Match whole word only"
 msgstr "Лише повне слово"
 
-#. match case button
 msgid "Match case"
 msgstr "Зважати на регістр"
 
 msgid "Direction"
 msgstr "Напрям"
 
-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr "Вгору"
 
@@ -2335,14 +2355,12 @@ msgid "Open tab..."
 msgstr "Відкрити вкладку..."
 
 # msgstr "E245: "
-msgid "Find string (use '\\\\' to find  a '\\')"
+msgid "Find string (use '\\\\' to find a '\\')"
 msgstr "Знайти рядок ('\\\\' щоб знайти '\\')"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgid "Find & Replace (use '\\\\' to find a '\\')"
 msgstr "Знайти і замінити ('\\\\' щоб знайти '\\')"
 
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
 msgid "Not Used"
 msgstr "Немає"
 
@@ -2419,7 +2437,6 @@ msgstr "Vim - Вибір шрифту"
 msgid "Name:"
 msgstr "Назва:"
 
-#. create toggle button
 msgid "Show size in Points"
 msgstr "Показати розмір у пунктах"
 
@@ -2671,7 +2688,6 @@ msgstr "E261: З'єднання з cscope %s не знайдено"
 msgid "cscope connection %s closed"
 msgstr "З'єднання з cscope %s закінчено"
 
-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: Фатальна помилка в cs_manage_matches"
 
@@ -2834,7 +2850,6 @@ msgstr "неправильна назва буфера"
 msgid "not implemented yet"
 msgstr "ще не реалізовано"
 
-#. ???
 msgid "cannot set line(s)"
 msgstr "не вдалося встановити рядки"
 
@@ -2874,7 +2889,6 @@ msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr "Не вдалося зареєструвати подію: буфер/вікно уже знищується"
 
-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@@ -2977,7 +2991,6 @@ msgstr "Vim: Застереження: Вивід не у термінал\n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Застереження: Уведення не з терміналу\n"
 
-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "команди перед vimrc"
 
@@ -3008,7 +3021,7 @@ msgstr "-q [файл]       перейти до першої помилки"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -3240,6 +3253,9 @@ msgstr ""
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tВикористати <viminfo> замість .viminfo"
 
+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible', Vim початково, без розширень, без viminfo"
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  чи  --help\tНадрукувати це повідомлення і вийти"
 
@@ -3339,11 +3355,9 @@ msgstr "--windowid <HWND>\tВідкрити Vim всередині іншого елементу win32"
 msgid "No display"
 msgstr "Немає дисплею"
 
-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr ": Не вдалося відіслати.\n"
 
-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": Не вдалося відіслати. Спроба виконати на місці\n"
 
@@ -3365,7 +3379,6 @@ msgid "E283: No marks matching \"%s\""
 msgstr "E283: Помітку «%s» не знайдено"
 
 # msgstr "E283: "
-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3373,7 +3386,6 @@ msgstr ""
 "\n"
 "пом. ряд.  кол. файл/текст"
 
-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3382,7 +3394,6 @@ msgstr ""
 " точка ряд. стовп. файл/текст"
 
 # msgstr "E283: "
-#. Highlight title
 msgid ""
 "\n"
 "change line  col text"
@@ -3398,7 +3409,6 @@ msgstr ""
 "\n"
 "# Помітки:\n"
 
-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3475,7 +3485,6 @@ msgstr "E298: Немає блоку 2?"
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843: Помилка поновлення шифрування файлу обміну"
 
-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ой, втрачено файл обміну!!!"
 
@@ -3662,7 +3671,6 @@ msgstr ""
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr "Для текстового файлу використовується ключ шифру з файлу обміну.\n"
 
-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Знайдено файли обміну:"
 
@@ -3841,8 +3849,6 @@ msgstr "При відкритті файлу \""
 msgid "      NEWER than swap file!\n"
 msgstr "      НОВІШИЙ за файл обміну!\n"
 
-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3934,7 +3940,6 @@ msgstr "E328: Меню може бути тільки в іншому режимі"
 msgid "E329: No menu \"%s\""
 msgstr "E329: Немає меню «%s»"
 
-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792: Порожня назва меню"
 
@@ -3951,8 +3956,6 @@ msgid "E332: Separator cannot be part of
 msgstr "E332: Роздільник не може бути частиною шляху меню"
 
 # msgstr "E332: "
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3963,6 +3966,11 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "Відірвати це меню"
 
+# msgstr "E334: "
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: Для режиму %s меню не визначено"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Шлях повинен вести до елемента меню"
 
@@ -3971,11 +3979,6 @@ msgstr "E333: Шлях повинен вести до елемента меню"
 msgid "E334: Menu not found: %s"
 msgstr "E334: Меню не знайдено: %s"
 
-# msgstr "E334: "
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Для режиму %s меню не визначено"
-
 # msgstr "E335: "
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Шлях повинен вести до підменю"
@@ -4048,7 +4051,6 @@ msgstr "Запам'ятати файл"
 msgid "Open File dialog"
 msgstr "Відкрити файл"
 
-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: Вибачте, але в консолі немає діалогу вибору файлу"
 
@@ -4223,7 +4225,8 @@ msgid "E663: At end of changelist"
 msgstr "E663: Кінець списку змін"
 
 msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
-msgstr "Уведіть  :qa!  і натисніть <Enter>, щоб відкинути всі зміни і вийти з Vim"
+msgstr ""
+"Уведіть  :qa!  і натисніть <Enter>, щоб відкинути всі зміни і вийти з Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4255,7 +4258,6 @@ msgstr "Вирівняно рядків: %ld"
 msgid "E748: No previously used register"
 msgstr "E748: Регістри перед цим не вживались"
 
-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "не вдалося запам'ятати; все одно знищити?"
 
@@ -4270,26 +4272,31 @@ msgstr "Змінено рядків: %ld"
 msgid "freeing %ld lines"
 msgstr "Звільнено рядків: %ld"
 
-msgid "block of 1 line yanked"
-msgstr "Запам'ятав блок з одного рядка"
-
-msgid "1 line yanked"
-msgstr "Запам'ятав один рядок"
-
-#, c-format
-msgid "block of %ld lines yanked"
-msgstr "Запам'ятав блок із %ld рядків"
-
-#, c-format
-msgid "%ld lines yanked"
-msgstr "Запам'ятав рядків: %ld"
+#, c-format
+msgid " into \"%c"
+msgstr " у \"%c"
+
+#, c-format
+msgid "block of 1 line yanked%s"
+msgstr "блок з 1 рядка висмикнуто%s"
+
+#, c-format
+msgid "1 line yanked%s"
+msgstr "1 рядок висмикнуто%s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "блок із %ld рядків висмикнуто%s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld рядків висмикнуто%s"
 
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: У регістрі %s нічого немає"
 
 # msgstr "E353: "
-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4347,11 +4354,8 @@ msgstr ""
 "байт %lld з %lld"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld для BOM)"
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Стор. %N"
+msgid "(+%lld for BOM)"
+msgstr "(+%lld для BOM)"
 
 msgid "Thanks for flying Vim"
 msgstr "Дякуємо за вибір Vim"
@@ -4403,6 +4407,10 @@ msgstr "E835: Конфліктує із значенням 'fillchars'"
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: Не можна змінити в GUI GTK+ 2"
 
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: Не можна перетворити між %s і %s"
+
 msgid "E524: Missing colon"
 msgstr "E524: Бракує двокрапки"
 
@@ -4460,6 +4468,9 @@ msgstr "E541: Забагато елементів"
 msgid "E542: unbalanced groups"
 msgstr "E542: Групи не збалансовано"
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: Не можна зробити модифіковним термінал із запущеним завданням"
+
 msgid "E590: A preview window already exists"
 msgstr "E590: Вікно перегляду вже існує"
 
@@ -4467,6 +4478,9 @@ msgid "W17: Arabic requires UTF-8, do ':
 msgstr ""
 "W17: Для арабської мови потрібне UTF-8, виконайте ':set encoding=utf-8'"
 
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24-розрядні кольори не підтримуються у цьому оточенні"
+
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Потрібно щонайменше %d рядків"
@@ -4479,9 +4493,6 @@ msgstr "E594: Потрібно щонайменше %d стовпців"
 msgid "E355: Unknown option: %s"
 msgstr "E355: Невідома опція: %s"
 
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Потрібно вказати Number: &%s = '%s'"
@@ -4559,7 +4570,6 @@ msgstr "не можу змінити режим консолі ?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: не консоль??\n"
 
-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: Не вдалося запустити оболонку з опцією -f"
 
@@ -4763,6 +4773,9 @@ msgstr "Застереження Vim"
 msgid "shell returned %d"
 msgstr "оболонка повернула %d"
 
+msgid "E926: Current location list was changed"
+msgstr "E926: Поточний список місць змінився"
+
 # msgstr "E371: "
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4793,7 +4806,6 @@ msgid "E377: Invalid %%%c in format stri
 msgstr "E377: Помилковий `%%%c' у рядку формату"
 
 # msgstr "E377: "
-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' не містить зразок"
 
@@ -4810,9 +4822,6 @@ msgstr "E924: Поточне вікно було закрито"
 msgid "E925: Current quickfix was changed"
 msgstr "E925: Поточний quickfix змінився"
 
-msgid "E926: Current location list was changed"
-msgstr "E926: Поточний список місць змінився"
-
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d з %d)%s%s: "
@@ -4833,9 +4842,6 @@ msgstr "E381: Вершина стеку виправлень"
 msgid "No entries"
 msgstr "Нічого"
 
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: Не можу записати, вказана опція 'buftype'"
-
 # msgstr "E231: "
 msgid "Error file"
 msgstr "Файл помилок"
@@ -4884,7 +4890,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( тут не дозволено"
 
 # msgstr "E406: "
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 та ін. тут не дозволено"
 
 #, c-format
@@ -4986,11 +4992,13 @@ msgstr "E877: (NFA regexp) Неправильний клас символу: %ld"
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Невідомий оператор '\\z%c'"
 
+msgid "E951: \\% value too large"
+msgstr "E951: значення \\% завелике"
+
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) Невідомий оператор '\\%%%c'"
 
-#. should never happen
 msgid "E868: Error building NFA with equivalence class!"
 msgstr "E868: Не вдалося побудувати NFA з класом еквівалентності!"
 
@@ -5001,11 +5009,9 @@ msgstr "E869: (NFA) Невідомий оператор '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA regexp) Не вдалося прочитати межі повторення"
 
-#. Can't have a multi follow a multi.
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Мульти не може бути за мульти!"
-
-#. Too many `('
+msgid "E871: (NFA regexp) Can't have a multi follow a multi"
+msgstr "E871: (NFA regexp) Мульти не може бути за мульти"
+
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp) Забагато '('"
 
@@ -5015,7 +5021,7 @@ msgstr "E879: (NFA regexp) Забагато \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) помилка належного припинення"
 
-msgid "E874: (NFA) Could not pop the stack !"
+msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Стек порожній!"
 
 msgid ""
@@ -5031,8 +5037,7 @@ msgstr "E876: (NFA regexp) Недостатньо пам’яті, щоб зберегти весь NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Не вдалося отримати пам’ять для обходу гілок!"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
+msgid "Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Не вдалося відкрити тимчасовий файл журналу для запису, показується на "
 "stderr... "
@@ -5041,6 +5046,12 @@ msgstr ""
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) НЕ ВДАЛОСЯ ВІДКРИТИ %s!"
 
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"Не вдалося відкрити тимчасовий файл журналу для запису, показується на "
+"stderr ... "
+
 msgid "Could not open temporary log file for writing "
 msgstr "Не вдалося відкрити тимчасовий файл журналу для запису "
 
@@ -5114,7 +5125,6 @@ msgstr "E386: Після `;' має бути `?' або `/'"
 msgid " (includes previously listed match)"
 msgstr " (разом з попередніми збігами)"
 
-#. cursor at status line
 msgid "--- Included files "
 msgstr "--- Включені файли "
 
@@ -5193,8 +5203,6 @@ msgstr "Пробачте, немає пропозицій"
 msgid "Sorry, only %ld suggestions"
 msgstr "Пробачте, тільки %ld пропозицій"
 
-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Замінити «%.*s» на:"
@@ -5416,8 +5424,8 @@ msgid "E760: No word count in %s"
 msgstr "E760: Немає кількості слів у %s"
 
 #, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "рядок %6d, слово %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr "рядок %6d, слово %6ld - %s"
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
@@ -5481,10 +5489,6 @@ msgstr "Стиснено %d з %d вузлів; залишилося %d (%d%%)"
 msgid "Reading back spell file..."
 msgstr "Перечитується файл орфографії..."
 
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "Виконується згортання звуків..."
 
@@ -5507,8 +5511,9 @@ msgstr "Оцінка споживання пам'яті: %d байт"
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Вихідний файл не повинен мати назву регіону"
 
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: Підтримується тільки до восьми регіонів"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: Підтримується тільки до %ld регіонів"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5539,8 +5544,6 @@ msgstr "Слово '%.*s' додано до %s"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Символи у слові відрізняються у файлах орфографії"
 
-#. This should have been checked when generating the .spl
-#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Повторено символ у елементі MAP"
 
@@ -5834,7 +5837,6 @@ msgstr "E428: Це вже остання відповідна мітка"
 msgid "File \"%s\" does not exist"
 msgstr "Файл «%s» не існує"
 
-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "мітка %d з %d%s"
@@ -5850,7 +5852,6 @@ msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Файл «%s» не існує"
 
 # msgstr "E429: "
-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5884,7 +5885,6 @@ msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Файл міток не впорядкований: %s"
 
 # msgstr "E432: "
-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433: Немає файлу міток"
 
@@ -5923,7 +5923,6 @@ msgstr "E436: Немає запису «%s» про можливості терміналу"
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: Потрібна можливість терміналу «cm»"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5934,6 +5933,33 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Неможливо відкрити $VIMRUNTIME/rgb.txt"
 
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "Зупинити завдання у «%s»?"
+
+msgid "Terminal"
+msgstr "Термінал"
+
+msgid "Terminal-finished"
+msgstr "Термінал-закінчено"
+
+msgid "active"
+msgstr "активний"
+
+msgid "running"
+msgstr "виконується"
+
+msgid "finished"
+msgstr "закінчено"
+
+# msgstr "E226: "
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953: Файл вже існує: %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: Не буфер терміналу"
+
 msgid "new shell started\n"
 msgstr "запущено нову оболонку\n"
 
@@ -5944,12 +5970,9 @@ msgstr "Vim: Помилка читання вводу, робота завершується...\n"
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "Використано CUT_BUFFER0 замість порожнього виділення"
 
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: Кількість рядків несподівано змінилася"
 
-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "Скасування буде неможливе, все одно продовжити"
 
@@ -6248,24 +6271,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"MacOS X (unix) version"
-msgstr ""
-"\n"
-"Версія для MacOS X (unix)"
+"macOS version"
+msgstr ""
+"\n"
+"Версія macOS"
 
 msgid ""
 "\n"
-"MacOS X version"
-msgstr ""
-"\n"
-"Версія для MacOS X"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"Версія для MacOS"
+"macOS version w/o darwin feat."
+msgstr ""
+"\n"
+"Версія macOS без darwin."
 
 msgid ""
 "\n"
@@ -6369,9 +6385,6 @@ msgstr "з GUI Carbon."
 msgid "with Cocoa GUI."
 msgstr "з GUI Cocoa."
 
-msgid "with (classic) GUI."
-msgstr "з (класичним) GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Включені (+) або не включені (-) компоненти:\n"
 
@@ -6581,7 +6594,6 @@ msgstr "Порівняти з допомогою Vim"
 msgid "Edit with &Vim"
 msgstr "Редагувати за допомогою &Vim"
 
-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "Редагувати у вже запущеному Vim - "
 
@@ -6601,10 +6613,6 @@ msgstr "Шлях занадто довгий!"
 msgid "--No lines in buffer--"
 msgstr "--Жодного рядка--"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470: Команду перервано"
 
@@ -6682,6 +6690,14 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: Некоректний аргумент: %s"
 
 #, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: Некоректне значення для аргументу %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: Некоректне значення для аргументу %s: %s"
+
+#, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Неправильний вираз: %s"
 
@@ -6701,6 +6717,9 @@ msgstr "E17: «%s» — це каталог"
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: Бібліотечний виклик до «%s()» не вдався"
 
+msgid "E667: Fsync failed"
+msgstr "E667: Не вдалося виконати fsync"
+
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: Не вдалося завантажити бібліотечну функцію %s"
@@ -6813,12 +6832,6 @@ msgstr "E484: Не вдалося відкрити файл %s"
 msgid "E485: Can't read file %s"
 msgstr "E485: Не вдалося прочитати файл %s"
 
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Зміни не було записано (! щоб не зважати)"
-
-msgid "E37: No write since last change"
-msgstr "E37: Не записано попередні зміни"
-
 msgid "E38: Null argument"
 msgstr "E38: Відсутній аргумент"
 
@@ -7000,6 +7013,9 @@ msgstr "E850: Неправильна назва регістру"
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919: Теку не знайдено: '%s': «%s»"
 
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Автокоманди призвели до рекурсії"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Пошук дійшов до ПОЧАТКУ, продовжується з КІНЦЯ"
 
@@ -7108,7 +7124,6 @@ msgstr "списковий конструктор не приймає іменовані аргументи"
 msgid "list index out of range"
 msgstr "індекс списку за межами"
 
-#. No more suitable format specifications in python-2.3
 #, c-format
 msgid "internal error: failed to get vim list item %d"
 msgstr "внутрішня помилка: не вдалося отримати елемент списку vim %d"
@@ -7272,3 +7287,47 @@ msgid ""
 msgstr ""
 "Не вдалося встановити шлях: sys.path не список\n"
 "Вас слід додати vim.VIM_SPECIAL_PATH до sys.path"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Макроси Vim (*.vim)\t*.vim\n"
+"Всі файли (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "Всі файли (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Всі файли (*.*)\t*.*\n"
+"Першокод C (*.c, *.h)\t*.c;*.h\n"
+"Першокод C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Код VB (*.bas, *.frm)\t*.bas;*.frm\n"
+"Файли Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Макроси Vim (*.vim)\t*.vim\n"
+"Всі файли (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "Всі файли (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Всі файли (*)\t*\n"
+"Першокод C (*.c, *.h)\t*.c;*.h\n"
+"Першокод C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Файли Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -1573,7 +1573,7 @@ msgstr "E216: Nhóm hoặc sự kiện không có thật: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Câu lệnh tự động ---"
@@ -1588,7 +1588,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: câu lệnh tự động xếp lồng vào nhau quá xâu"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s câu lệnh tự động cho \"%s\""
 
 #, c-format
@@ -2328,7 +2328,7 @@ msgstr "-q [tập tin lỗi] soạn thảo tập tin với lỗi đầu tiên"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4043,7 +4043,7 @@ msgstr "E65: Không cho phép liên kết ngược lại"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( không thể sử dụng ở đây"
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: \\z1 và tương tự không được sử dụng ở đây"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -1769,7 +1769,7 @@ msgstr "E216: 无此组或事件: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- 自动命令 ---"
@@ -1788,7 +1788,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: 自动命令嵌套层数过深"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s 自动命令 \"%s\""
 
 #, c-format
@@ -2719,7 +2719,7 @@ msgstr "-q [errorfile]  编辑第一个出错处的文件"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4472,7 +4472,7 @@ msgstr "E65: 无效的回引"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: 此处不允许 \\z("
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: 此处不允许 \\z1 等"
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -1769,7 +1769,7 @@ msgstr "E216: ޴¼: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Զ ---"
@@ -1788,7 +1788,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: ԶǶײ"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Զ \"%s\""
 
 #, c-format
@@ -2719,7 +2719,7 @@ msgstr "-q [errorfile]  ༭һļ"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4472,7 +4472,7 @@ msgstr "E65: ЧĻ"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: ˴ \\z("
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: ˴ \\z1 "
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -1770,7 +1770,7 @@ msgstr "E216: ޴¼: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Զ ---"
@@ -1789,7 +1789,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: ԶǶײ"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
+msgid "%s Autocommands for \"%s\""
 msgstr "%s Զ \"%s\""
 
 #, c-format
@@ -2720,7 +2720,7 @@ msgstr "-q [errorfile]  ༭һļ"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4472,7 +4472,7 @@ msgstr "E65: ЧĻ"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: ˴ \\z("
 
-msgid "E67: \\z1 et al. not allowed here"
+msgid "E67: \\z1 - \\z9 not allowed here"
 msgstr "E67: ˴ \\z1 "
 
 msgid "E68: Invalid character after \\z"
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -1597,10 +1597,10 @@ msgstr "E216: 無此群組或事件: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: 無法對所有事件執行 autocommand"
@@ -1612,8 +1612,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommand 層數過深"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands: \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2333,7 +2333,7 @@ msgstr "-q [errorfile]  編輯時載入第一個錯誤"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4028,8 +4028,8 @@ msgstr "E65: 不正確的反向參考"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( 不能在此出現"
 
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 et al. 不能在此出現"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: \\z1 - \\z9 不能在此出現"
 
 msgid "E68: Invalid character after \\z"
 msgstr "E68: 後面有不正確的字元: \\z"
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -1590,10 +1590,10 @@ msgstr "E216: LsթΨƥ: %s"
 #. Highlight title
 msgid ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- Autocommands ---"
 
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: LkҦƥ autocommand"
@@ -1605,8 +1605,8 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: autocommand hƹL`"
 
 #, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands: \"%s\""
 
 #, c-format
 msgid "Executing %s"
@@ -2326,7 +2326,7 @@ msgstr "-q [errorfile]  sɸJĤ@ӿ~"
 msgid ""
 "\n"
 "\n"
-"usage:"
+"Usage:"
 msgstr ""
 "\n"
 "\n"
@@ -4021,8 +4021,8 @@ msgstr "E65: TϦVѦ"
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( bX{"
 
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 et al. bX{"
+msgid "E67: \\z1 - \\z9 not allowed here"
+msgstr "E67: \\z1 - \\z9 bX{"
 
 msgid "E68: Invalid character after \\z"
 msgstr "E68: ᭱Tr: \\z"