Update runtime files

42 files changed, 2008 insertions, 1076 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 61c8606d7..aeec2713f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -261,6 +261,7 @@ runtime/indent/julia.vim		@carlobaldassi
 runtime/indent/ld.vim			@dkearns
 runtime/indent/less.vim			@genoma
 runtime/indent/liquid.vim		@tpope
+runtime/indent/lua.vim			@marcuscf
 runtime/indent/make.vim			@dkearns
 runtime/indent/meson.vim		@Liambeguin
 runtime/indent/mma.vim			@dkearns
@@ -392,6 +393,7 @@ runtime/syntax/less.vim			@genoma
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
+runtime/syntax/lua.vim			@marcuscf
 runtime/syntax/lyrics.vim		@ObserverOfTime
 runtime/syntax/lynx.vim			@dkearns
 runtime/syntax/m3build.vim		@dkearns
diff --git a/nsis/lang/italian.nsi b/nsis/lang/italian.nsi
index bffe285a7..029737f03 100644
--- a/nsis/lang/italian.nsi
+++ b/nsis/lang/italian.nsi
@@ -3,9 +3,8 @@
 # italian.nsi : Italian language strings for gvim NSIS installer.
 #
 # Locale ID    : 1040
-# Locale Name  : it
 # fileencoding : UTF-8
-# Author       : Antonio Colombo
+# Author       : Antonio Colombo, bovirus - revision: 12.05.2023
 
 !insertmacro MUI_LANGUAGE "Italian"
 
@@ -22,10 +21,10 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 ##############################################################################
 
 #LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"
+#    "Cartella installazione (il percorso deve finire con $\"vim$\")"
 
 LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza README al termine dell'installazione"
+    "Visualizza file README a fine installazione"
 
 # Install types:
 LangString str_type_typical         ${LANG_ITALIAN} \
@@ -43,120 +42,119 @@ LangString str_type_full            ${LANG_ITALIAN} \
 ##############################################################################
 
 LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i"
+    "Disinstalla versioni esistenti"
 LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."
+    "Disinstalla versioni esistenti di Vim."
 
 LangString str_section_exe          ${LANG_ITALIAN} \
-    "Vim GUI e file di supporto"
+    "GUI e file supporto Vim"
 LangString str_desc_exe             ${LANG_ITALIAN} \
-    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."
+    "GUI programmi e file di supporto Vim.  Questa componente è indispensabile."
 
 LangString str_section_console      ${LANG_ITALIAN} \
-    "Vim console (vim.exe per MS-DOS)"
+    "Console Vim (vim.exe per MS-DOS)"
 LangString str_desc_console         ${LANG_ITALIAN} \
     "Versione console di Vim (vim.exe)."
 
 LangString str_section_batch        ${LANG_ITALIAN} \
     "Crea file .bat"
 LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file .bat per varianti di Vim nella directory \
+    "Crea file .bat per varianti di Vim nella cartella \
      di Windows, per utilizzo da riga di comando."
 
 LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone per Vim"
+    "Crea icone Vim"
 LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone per Vim in vari posti, per rendere facile l'accesso."
+    "Crea icone Vim per rendere facile l'accesso."
 
 LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Sul Desktop"
+    "Icone sul Desktop"
 LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone per programma gVim sul desktop."
+    "Crea icone programma gVim sul desktop."
 
 LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Nella cartella del menù START"
+    "Gruppo programmi menù START"
 LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiungi Vim alle cartelle del menù START."
+    "Aggiunge gruppo programmi al menù START."
 
 #LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Nella barra di Avvio Veloce"
+#    "Barra avvio veloce"
 #LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."
+#    "Aggiunge un collegamento a Vim nella barra di avvio veloce."
 
 LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al Menù Contestuale"
+    "Aggiungi Vim al menù contestuale"
 LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."
+    "Aggiunge Vim al menu contestuale $\"Apri con...$\"."
 
 #LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32-bit"
+#    "Versione a 32 bit"
 #LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 32-bit."
+#    "Aggiungi Vim al menu contestuale $\"Apri con...$\" \
+#     per applicazioni a 32 bit."
 
 #LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64-bit"
+#    "Versione a 64 bit"
 #LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 64-bit."
+#    "Aggiunge Vim al menu contestuale $\"Apri con...$\" \
+#     per applicazioni a 64 bit."
 
 LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione di default"
+    "Crea configurazione predefinita"
 LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea un file configurazione di default (_vimrc) se non \
-     ne esiste già uno."
+    "Crea, se non ne esiste già uno, un file configurazione predefinito (_vimrc) ."
 
 LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea directory per plugin"
+    "Crea cartella plugin"
 LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
-     a Vim mettendo file in una di queste directory."
+    "Crea cartella plugin.  I plugin consentono di aggiungere funzionalità \
+     a Vim copiando i relativi file in una di queste cartelle."
 
 LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Private"
+    "Privata"
 LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory HOME."
+    "Crea cartella plugin nella cartella HOME."
 
 LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivise"
+    "Condivisa"
 LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory di installazione di Vim \
+    "Crea cartella plugin nella cartella di installazione di Vim \
      per uso da parte di tutti gli utenti di questo sistema."
 
 LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto Multilingue (NLS)"
+    "Supporto nativo lingua (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa file per supportare messaggi in diverse lingue."
+    "Installa i file per il supporto nativo multilingua."
 
 LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Togli Vim dal Registry"
+    "Rimuovi Vim dal registro"
 LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Togli Vim dal Registry di configurazione sistema."
+    "Rimuove Vim dal registro di configurazione sistema."
 
 LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Cancella programmi/file di supporto Vim"
+    "Elimina programmi/file di supporto Vim"
 LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Cancella tutti i programmi/file di supporto di Vim."
+    "Elimina tutti i programmi/file di supporto di Vim."
 
 LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin"
+    "Elimina cartelle plugin"
 LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin se sono vuote."
+    "Elimina le cartelle plugin se sono vuote."
 
 LangString str_unsection_plugin_home ${LANG_ITALIAN} \
     "Private"
 LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory HOME."
+    "Elimina cartelle plugin nella cartella HOME."
 
 LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
     "Condivise"
 LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory di installazione di Vim."
+    "Elimina cartelle plugin nella cartella di installazione di Vim."
 
 LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim"
+    "Elimina la cartella di installazione di Vim"
 LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"
+    "Elimina la cartella di installazione di Vim. Contiene i file di configurazione!"
 
 
 ##############################################################################
@@ -164,75 +162,74 @@ LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
 ##############################################################################
 
 #LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
+#    "Rilevate nel sistema $vim_old_ver_count versioni di Vim.$\r$\n\
 #     Questo programma di installazione può gestire solo \
 #     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstallate qualche versione precedente e ricominciate."
+#     Disinstalla qualche versione precedente e ricomincia."
 
 #LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
+#    "Nome cartella di installazione non valida: $vim_install_root!$\r$\n\
 #     Dovrebbe terminare con $\"vim$\"."
 
 #LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella directory di installazione!$\r$\n$\r$\n\
-#     Cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema segnala invece $\"$INSTDIR$\"."
+#    "Conflitto nella cartella di installazione!$\r$\n$\r$\n\
+#     La cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
+#     ma il sistema indica che il percorso è $\"$INSTDIR$\"."
 
 #LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
-#     Chiudete tutte le sessioni attive di Vim per continuare."
+#    "Vim è ancora in esecuzione nel sistema.$\r$\n\
+#     Per continuare chiudi tutte le sessioni attive di Vim."
 
 #LangString str_msg_register_ole  ${LANG_ITALIAN} \
 #    "Tentativo di registrazione di Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."
 
 #LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di togliere dal Registry Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#    "Tentativo di rimozione di VIM dal registro via OLE. \
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."
 
 #LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della seguente versione:"
+#    "Disinstallazione della versione:"
 
 #LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la seguente versione:"
+#    "Disinstallazione non riuscita per la versione:"
 
 #LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Non riesco a trovare chiave di disinstallazione nel Registry."
+#    "Impossibile trovare chiave disinstallazione nel registro."
 
 #LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione nel Registry."
+#    "Impossibile trovare programma disinstallazione nel registro."
 
 #LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione."
+#    "Impossibile trovare programma disinstallazione."
 
 #LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Non riesco a copiare programma disinstallazione a una \
-#     directory temporanea."
+#    "Impossibile copiare il programma disinstallazione in una cartella temporanea."
 
 #LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Non riesco a eseguire programma disinstallazione."
+#    "Impossibile eseguire programma disinstallazione."
 
 #LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."
+#    "Il programma di disinstallazione verrà chiuso senza aver eseguito nessuna modifica."
 
 LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita. Miglior fortuna alla prossima!"
+    "Installazione non riuscita."
 
 LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
-     Dovreste cancellarli voi stessi."
+    "Alcuni file in $0 non sono stati eliminati!$\r$\n\
+     I file vanno rimossi manualmente."
 
 #LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"
+#    "AVVISO: impossibile eliminare $\"$vim_install_root$\", non è vuota!"
 
 LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Sto disinstallando la vecchia versione..."
+    "Disinstallazione vecchia versione Vim..."
 
 LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Sto aggiungendo Vim al Registry..."
+    "Aggiunta di Vim al registro..."
 
 LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Sto togliendo Vim dal Registry..."
+    "Rimozione di Vim dal registro..."
 
 
 ##############################################################################
@@ -242,37 +239,37 @@ LangString str_msg_unregistering ${LANG_ITALIAN} \
 LangString str_vimrc_page_title    ${LANG_ITALIAN} \
     "Scelta impostazioni _vimrc"
 LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni per funzionalità ulteriori, tastiera e mouse."
+    "Scelta impostazioni funzionalità aggiuntive, tastiera e mouse."
 
 LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " comportamento come Vi / Vim "
+    " Comportamento come Vi / Vim "
 LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità ulteriori"
+    "&Compatibilità e funzionalità"
 LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile con Vi"
+    "Compatibile Vi"
 LangString str_msg_compat_vim      ${LANG_ITALIAN} \
     "Vim originale"
 LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
+    "Vim con alcune funzionalità aggiuntive (defaults.vim)"
 LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"
+    "Vim con tutte le funzionalità aggiuntive (vimrc_example.vim) (predefinito)"
 
 LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature "
+    " Mappature tastiera "
 LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
+    "&Rimappa alcuni tasti Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
 LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non effettuare rimappature di tasti (Default)"
+    "Non rimappare i tasti (predefinito)"
 LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappare solo alcuni tasti"
+    "Rimappa solo alcuni tasti"
 
 LangString str_msg_mouse_title   ${LANG_ITALIAN} \
     " Mouse "
 LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento dei pulsanti destro e sinistro"
+    "&Comportamento pulsanti destro/sinistro"
 LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: modalità visuale (Default)"
+    "Destro: menu popup, Sinistro: modalità visuale (predefinito)"
 LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
+    "Destro: menu popup, Sinistro: selezione modalità (Windows)"
 LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"
+    "Destro: estensione selezione, Sinistro: modalità visuale (Unix)"
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index c3463c6e2..b55fab354 100644
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2023 Apr 17
+# Last Change:	2023 May 06
 
 export def DetectFiletype()
   var line1 = getline(1)
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 1372de4df..14b1ab20d 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Mar 15, 2023
-" Version:	172
+" Date:		May 03, 2023
+" Version:	173
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
  endfor
 endif
 
-let g:loaded_netrw = "v172"
+let g:loaded_netrw = "v173"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -5734,7 +5734,7 @@ fun! s:NetrwEditBuf(bufnum)
    exe "sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum)
   else
 "   call Decho("exe sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum))
-   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnume)
+   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum)
   endif
 "  call Dret("s:NetrwEditBuf")
 endfun
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
index a910d18be..d65f83144 100644
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
   finish
 endif
-let g:loaded_netrwSettings = "v18a"
+let g:loaded_netrwSettings = "v18"
 if v:version < 700
  echohl WarningMsg
  echo "***warning*** this version of netrwSettings needs vim 7.0"
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index f449c6e1e..9b4ecfeaf 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2022 Mar 03
+" Last change:	2023 May 10
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index beb7ac718..0cbfe2143 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.0.  Last change: 2023 Apr 19
+*builtin.txt*	For Vim version 9.0.  Last change: 2023 May 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2260,7 +2260,7 @@ execute({command} [, {silent}])					*execute()*
 		string.
 		{command} can be a string or a List.  In case of a List the
 		lines are executed one by one.
-		This is equivalent to: >
+		This is more or less equivalent to: >
 			redir => var
 			{command}
 			redir END
@@ -2276,7 +2276,7 @@ execute({command} [, {silent}])					*execute()*
 							*E930*
 		It is not possible to use `:redir` anywhere in {command}.
 
-		To get a list of lines use |split()| on the result: >
+		To get a list of lines use `split()` on the result: >
 			execute('args')->split("\n")
 
 <		To execute a command in another window than the current one
@@ -6767,17 +6767,20 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 		that was entered at the prompt.  This can be an empty string
 		if the user only typed Enter.
 		Example: >
-		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 		   func s:TextEntered(text)
 		     if a:text == 'exit' || a:text == 'quit'
 		       stopinsert
+		       " Reset 'modified' to allow the buffer to be closed.
+		       " We assume there is nothing useful to be saved.
+		       set nomodified
 		       close
 		     else
+		       " Do something useful with "a:text".  In this example
+		       " we just repeat it.
 		       call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
-		       " Reset 'modified' to allow the buffer to be closed.
-		       set nomodified
 		     endif
 		   endfunc
+		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 
 <		Can also be used as a |method|: >
 			GetBuffer()->prompt_setcallback(callback)
@@ -10259,7 +10262,7 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		The window will temporarily be made the current window,
 		without triggering autocommands or changing directory.  When
 		executing {command} autocommands will be triggered, this may
-		have unexpected side effects.  Use |:noautocmd| if needed.
+		have unexpected side effects.  Use `:noautocmd` if needed.
 		Example: >
 			call win_execute(winid, 'set syntax=python')
 <		Doing the same with `setwinvar()` would not trigger
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index a08befecb..da9aeb7fe 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 9.0.  Last change: 2022 Nov 02
+*editing.txt*   For Vim version 9.0.  Last change: 2023 Apr 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b863f42e6..de09c7b47 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.0.  Last change: 2023 Apr 15
+*eval.txt*	For Vim version 9.0.  Last change: 2023 Apr 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 477ea7b25..ae8e6584a 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 9.0.  Last change: 2023 Feb 15
+*filetype.txt*  For Vim version 9.0.  Last change: 2023 Apr 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -660,8 +660,8 @@ page in a Vim window: >
 
 MANPAGER				      *manpager.vim*
 
-The |:Man| command allows you to turn Vim into a manpager (that syntax highlights
-manpages and follows linked manpages on hitting CTRL-]).
+The |:Man| command allows you to turn Vim into a manpager (that syntax
+highlights manpages and follows linked manpages on hitting CTRL-]).
 
 For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
 
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 7c22c1c09..0fcceddb6 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 9.0.  Last change: 2023 Mar 01
+*gui.txt*       For Vim version 9.0.  Last change: 2023 Apr 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1226,10 +1226,9 @@ This section describes other features which are related to the GUI.
   like this to set options specifically for each type of GUI: >
 
 	if has("gui_running")
-	    if has("gui_gtk2")
+	    if has("gui_gtk")
 		:set guifont=Luxi\ Mono\ 12
 	    elseif has("x11")
-		" Also for GTK 1
 		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
 	    elseif has("gui_win32")
 		:set guifont=Luxi_Mono:h12:cANSI
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 281185bb3..7949e9173 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 9.0.  Last change: 2022 Mar 13
+*if_perl.txt*   For Vim version 9.0.  Last change: 2023 May 14
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -254,23 +254,14 @@ $main::curbuf
 
 							*script-here*
 When using a script language in-line, you might want to skip this when the
-language isn't supported.  But this mechanism doesn't work: >
+language isn't supported.  >
    if has('perl')
      perl << EOF
-       this will NOT work!
+       print 'perl works'
    EOF
    endif
-Instead, put the Perl/Python/Ruby/etc. command in a function and call that
-function: >
-    if has('perl')
-      function DefPerl()
-	perl << EOF
-	  this works
-    EOF
-      endfunction
-      call DefPerl()
-    endif
-Note that "EOF" must be at the start of the line.
+Note that "EOF" must be at the start of the line without preceding white
+space.
 
 ==============================================================================
 4. Dynamic loading					*perl-dynamic*
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 8f2fe7573..aa0502910 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.0.  Last change: 2023 Mar 09
+*map.txt*       For Vim version 9.0.  Last change: 2023 May 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1873,8 +1873,14 @@ remains unmodified.  Also see |f-args-example| below.  Overview:
 	XX a\\\ b	   'a\ b'
 	XX a\\\\b	   'a\\b'
 	XX a\\\\ b	   'a\\', 'b'
+	XX		   [nothing]
 
 
+Note that if the "no arguments" situation is to be handled, you have to make
+sure that the function can be called without arguments.  For a compiled
+function you might want to use variable arguments, see
+|vim9-variable-arguments|.
+
 Examples for user commands: >
 
    " Delete everything after here to the end
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c487f1769..05113373f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.0.  Last change: 2023 Apr 12
+*options.txt*	For Vim version 9.0.  Last change: 2023 May 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -925,6 +925,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'autowriteall' for that.
 	Some buffers will not be written, specifically when 'buftype' is
 	"nowrite", "nofile", "terminal" or "prompt".
+	USE WITH CARE: If you make temporary changes to a buffer that you
+	don't want to be saved this option may cause it to be saved anyway.
+	Renaming the buffer with ":file {name}" may help avoid this.
 
 			 *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
 'autowriteall' 'awa'	boolean	(default off)
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index a7238a9ea..30c164660 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 9.0.  Last change: 2023 Apr 22
+*pi_netrw.txt*  For Vim version 9.0.  Last change: 2023 May 14
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -208,7 +208,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
 	  http:   g:netrw_http_cmd     = "links"      elseif links is available
 	  http:   g:netrw_http_cmd     = "curl"       elseif curl  is available
 	  http:   g:netrw_http_cmd     = "wget"       elseif wget  is available
-          http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
+	  http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
 	  http:   *g:netrw_http_put_cmd* = "curl -T"
 	   rcp:   *g:netrw_rcp_cmd*      = "rcp"
 	 rsync:   *g:netrw_rsync_cmd*    = "rsync"     (see |g:netrw_rsync_sep|)
@@ -968,7 +968,7 @@ itself:
      fun! NetReadFixup(method, line1, line2)
        if method == 3   " ftp (no <.netrc>)
         let fourblanklines= line2 - 3
-        silent fourblanklines.",".line2."g/^\s*/d"
+        silent fourblanklines .. "," .. line2 .. "g/^\s*/d"
        endif
      endfunction
     endif
@@ -1198,7 +1198,7 @@ If there are marked files and/or directories, mb will add them to the bookmark
 list.
 
 								*netrw-:NetrwMB*
-Addtionally, one may use :NetrwMB to bookmark files or directories. >
+Additionally, one may use :NetrwMB to bookmark files or directories. >
 
 	:NetrwMB[!] [files/directories]
 
@@ -1625,8 +1625,10 @@ A further approach is to delete files which match a pattern.
       This will cause the matching files to be marked.  Then,
       press "D".
 
-Please note that only empty directories may be deleted with the "D" mapping.
-Regular files are deleted with |delete()|, too.
+If your vim has 7.4 with patch#1107, then |g:netrw_localrmdir| no longer
+is used to remove directories; instead, vim's |delete()| is used with
+the "d" option.  Please note that only empty directories may be deleted
+with the "D" mapping.  Regular files are deleted with |delete()|, too.
 
 The |g:netrw_rm_cmd|, |g:netrw_rmf_cmd|, and |g:netrw_rmdir_cmd| variables are
 used to control the attempts to remove remote files and directories.  The
@@ -1645,7 +1647,8 @@ to remove it again using the g:netrw_rmf_cmd variable.  Its default value is:
 	|g:netrw_rmf_cmd|: ssh HOSTNAME rm -f
 
 Related topics: |netrw-d|
-Associated setting variable: |g:netrw_rm_cmd| |g:netrw_ssh_cmd|
+Associated setting variable: |g:netrw_localrmdir| |g:netrw_rm_cmd|
+                             |g:netrw_rmdir_cmd|   |g:netrw_ssh_cmd|
 
 
 *netrw-explore*  *netrw-hexplore* *netrw-nexplore* *netrw-pexplore*
@@ -1688,11 +1691,7 @@ DIRECTORY EXPLORATION COMMANDS  {{{2
 	  to 2; edits will thus preferentially be made in window#2.
 
 	  The [N] specifies a |g:netrw_winsize| just for the new :Lexplore
-	  window. That means that
-	    if [N] < 0 : use |N| columns for the Lexplore window
-	    if [N] = 0 : a normal split is made
-	    if [N] > 0 : use N% of the current window will be used for the
-	                 new window
+	  window.
 
 	  Those who like this method often also like tree style displays;
 	  see |g:netrw_liststyle|.
@@ -1976,7 +1975,7 @@ To use this function, simply assign its output to |g:netrw_list_hide| option.  >
 	Example: let g:netrw_list_hide= netrw_gitignore#Hide('my_gitignore_file')
 		Function can take additional files with git-ignore patterns.
 
-	Example: g:netrw_list_hide= netrw_gitignore#Hide() . '.*\.swp$'
+	Example: let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
 		Combining 'netrw_gitignore#Hide' with custom patterns.
 <
 
@@ -2816,7 +2815,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				= 2: wide listing (multiple files in columns)
 				= 3: tree style listing
 
-  *g:netrw_list_hide*		comma separated pattern list for hiding files
+  *g:netrw_list_hide*		comma-separated pattern list for hiding files
 				Patterns are regular expressions (see |regexp|)
 				There's some special support for git-ignore
 				files: you may add the output from the helper
@@ -2826,7 +2825,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 
 				Examples:
 				 let g:netrw_list_hide= '.*\.swp$'
-				 let g:netrw_list_hide= netrw_gitignore#Hide().'.*\.swp$'
+				 let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
 				default: ""
 
   *g:netrw_localcopycmd*	="cp"           Linux/Unix/MacOS/Cygwin
@@ -2864,6 +2863,14 @@ your browsing preferences.  (see also: |netrw-settings|)
 				=" /c move"                     Windows
 				Options for |g:netrw_localmovecmd|
 
+  *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
+				=expand("$COMSPEC")             Windows
+				Remove directory command (rmdir)
+				This variable is only used if your vim is
+				earlier than 7.4 or if your vim doesn't
+				have patch#1107.  Otherwise, |delete()|
+				is used with the "d" option.
+
   *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
 				    listings fit on 80 column displays.
 				If your screen is wider, and you have file
@@ -3774,7 +3781,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 	     Netrw uses several system level commands to do things (see
 
 		 |g:netrw_localcopycmd|, |g:netrw_localmovecmd|,
-		 |g:netrw_mkdir_cmd|).
+		 |g:netrw_localrmdir|, |g:netrw_mkdir_cmd|).
 
 	    You may need to adjust the default commands for one or more of
 	    these commands by setting them properly in your .vimrc.  Another
@@ -3900,13 +3907,8 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1
 
-	v172:	Sep 02, 2021	* (Bram Moolenaar) Changed "l:go" to "go"
-				* (Bram Moolenaar) no need for "b" in
-				  netrw-safe guioptions
-		Nov 15, 2021	* removed netrw_localrm and netrw_localrmdir
-				  references
-		Aug 18, 2022	* (Miguel Barro) improving compatability with
-				  powershell
+	v172:	Apr 22, 2023	* removed g:netrw_localrmdiropt
+				  removed g:netrw_localrmdir
 	v171:	Oct 09, 2020	* included code in s:NetrwOptionsSafe()
 				  to allow |'bh'| to be set to delete when
 				  rather than hide when g:netrw_fastbrowse
@@ -3991,8 +3993,10 @@ netrw:
 		Nov 09, 2016	* Broke apart the command from the options,
 				  mostly for Windows.  Introduced new netrw
 				  settings: |g:netrw_localcopycmdopt|
-				  |g:netrw_localcopydircmdopt| |g:netrw_localmkdiropt|
-				  |g:netrw_localmovecmdopt| g:netrw_localrmdiropt
+				  |g:netrw_localcopydircmdopt|
+				  |g:netrw_localmkdiropt|
+				  |g:netrw_localmovecmdopt|
+				  g:netrw_localrmdiropt
 		Nov 21, 2016	* (mattn) provided a patch for preview; swapped
 				  winwidth() with winheight()
 		Nov 22, 2016	* (glacambre) reported that files containing
@@ -4052,7 +4056,7 @@ netrw:
 				  refreshes.  However, inside a |:map-<expr>|,
 				  tab and window changes are disallowed.  Fixed.
 				  (affects netrw's s:LocalBrowseRefresh())
-				* g:netrw_localrmdir not used any more, but
+				* |g:netrw_localrmdir| not used any more, but
 				  the relevant patch that causes |delete()| to
 				  take over was #1107 (not #1109).
 				* |expand()| is now used on |g:netrw_home|;
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 8c458fb29..307a0a952 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.0.  Last change: 2023 Apr 02
+*repeat.txt*    For Vim version 9.0.  Last change: 2023 May 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -65,7 +65,7 @@ Using the underscore after `:d` avoids clobbering registers or the clipboard.
 This also makes it faster.
 
 Instead of the '/' which surrounds the {pattern}, you can use any other
-single byte character, but not an alphabetic character, '\', '"' or '|'.
+single byte character, but not an alphabetic character, '\', '"', '|' or '!'.
 This is useful if you want to include a '/' in the search pattern or
 replacement string.
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 10b6901d1..8a5e5f4c9 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.0.  Last change: 2023 Apr 05
+*syntax.txt*	For Vim version 9.0.  Last change: 2023 Apr 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4929,7 +4929,7 @@ is mostly used, because it looks better.
 ==============================================================================
 13. Colorschemes				*color-schemes*
 
-In the next section you can find information about indivisual highlight groups
+In the next section you can find information about individual highlight groups
 and how to specify colors for them.  Most likely you want to just select a set
 of colors by using the `:colorscheme` command, for example: >
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 296aba901..ad18f8d54 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4186,7 +4186,6 @@ E1133	vim9.txt	/*E1133*
 E1134	vim9.txt	/*E1134*
 E1135	eval.txt	/*E1135*
 E1136	map.txt	/*E1136*
-E1137	map.txt	/*E1137*
 E1138	eval.txt	/*E1138*
 E1139	vim9.txt	/*E1139*
 E114	eval.txt	/*E114*
@@ -7422,6 +7421,7 @@ g:netrw_localmkdir	pi_netrw.txt	/*g:netrw_localmkdir*
 g:netrw_localmkdiropt	pi_netrw.txt	/*g:netrw_localmkdiropt*
 g:netrw_localmovecmd	pi_netrw.txt	/*g:netrw_localmovecmd*
 g:netrw_localmovecmdopt	pi_netrw.txt	/*g:netrw_localmovecmdopt*
+g:netrw_localrmdir	pi_netrw.txt	/*g:netrw_localrmdir*
 g:netrw_maxfilenamelen	pi_netrw.txt	/*g:netrw_maxfilenamelen*
 g:netrw_menu	pi_netrw.txt	/*g:netrw_menu*
 g:netrw_mkdir_cmd	pi_netrw.txt	/*g:netrw_mkdir_cmd*
@@ -9885,6 +9885,7 @@ string	eval.txt	/*string*
 string()	builtin.txt	/*string()*
 string-functions	usr_41.txt	/*string-functions*
 string-match	builtin.txt	/*string-match*
+string-offset-encoding	eval.txt	/*string-offset-encoding*
 strlen()	builtin.txt	/*strlen()*
 strpart()	builtin.txt	/*strpart()*
 strpbrk()	builtin.txt	/*strpbrk()*
@@ -9894,6 +9895,7 @@ strridx()	builtin.txt	/*strridx()*
 strspn()	builtin.txt	/*strspn()*
 strstr()	builtin.txt	/*strstr()*
 strtrans()	builtin.txt	/*strtrans()*
+strutf16len()	builtin.txt	/*strutf16len()*
 strwidth()	builtin.txt	/*strwidth()*
 style-changes	develop.txt	/*style-changes*
 style-compiler	develop.txt	/*style-compiler*
@@ -10556,6 +10558,7 @@ utf-8	mbyte.txt	/*utf-8*
 utf-8-char-arg	mbyte.txt	/*utf-8-char-arg*
 utf-8-in-xwindows	mbyte.txt	/*utf-8-in-xwindows*
 utf-8-typing	mbyte.txt	/*utf-8-typing*
+utf16idx()	builtin.txt	/*utf16idx()*
 utf8	mbyte.txt	/*utf8*
 v	visual.txt	/*v*
 v:	eval.txt	/*v:*
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 2f6387d02..26f1a8f9e 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 9.0.  Last change: 2022 Dec 30
+*testing.txt*	For Vim version 9.0.  Last change: 2023 May 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -448,13 +448,14 @@ assert_beeps({cmd})					*assert_beeps()*
 assert_equal({expected}, {actual} [, {msg}])
 		When {expected} and {actual} are not equal an error message is
 		added to |v:errors| and 1 is returned.  Otherwise zero is
-		returned |assert-return|.
+		returned. |assert-return|
+		The error is in the form "Expected {expected} but got
+		{actual}".  When {msg} is present it is prefixed to that.
+
 		There is no automatic conversion, the String "4" is different
 		from the Number 4.  And the number 4 is different from the
 		Float 4.0.  The value of 'ignorecase' is not used here, case
 		always matters.
-		When {msg} is omitted an error in the form "Expected
-		{expected} but got {actual}" is produced.
 		Example: >
 	assert_equal('foo', 'bar')
 <		Will result in a string to be added to |v:errors|:
@@ -533,11 +534,12 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 assert_false({actual} [, {msg}])			*assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
+		The error is in the form "Expected False but got {actual}".
+		When {msg} is present it is prepended to that.
 		Also see |assert-return|.
+
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
-		When {msg} is omitted an error in the form
-		"Expected False but got {actual}" is produced.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_false()
@@ -546,14 +548,16 @@ assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
 		than {lower} or higher than {upper} an error message is added
 		to |v:errors|.  Also see |assert-return|.
-		When {msg} is omitted an error in the form
-		"Expected range {lower} - {upper}, but got {actual}" is
-		produced.
+		The error is in the form "Expected range {lower} - {upper},
+		but got {actual}".  When {msg} is present it is prefixed to
+		that.
 
 								*assert_match()*
 assert_match({pattern}, {actual} [, {msg}])
 		When {pattern} does not match {actual} an error message is
 		added to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Pattern {pattern} does not match
+		{actual}".  When {msg} is present it is prefixed to that.
 
 		{pattern} is used as with |=~|: The matching is always done
 		like 'magic' was set and 'cpoptions' is empty, no matter what
@@ -563,8 +567,6 @@ assert_match({pattern}, {actual} [, {msg}])
 		Use "^" and "$" to match with the start and end of the text.
 		Use both to match the whole text.
 
-		When {msg} is omitted an error in the form
-		"Pattern {pattern} does not match {actual}" is produced.
 		Example: >
 	assert_match('^f.*o$', 'foobar')
 <		Will result in a string to be added to |v:errors|:
@@ -614,8 +616,7 @@ assert_true({actual} [, {msg}])				*assert_true()*
 		Also see |assert-return|.
 		A value is TRUE when it is a non-zero number.  When {actual}
 		is not a number the assert fails.
-		When {msg} is omitted an error in the form "Expected True but
-		got {actual}" is produced.
+		When {msg} is given it precedes the default message.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_true()
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index 8c9c0c6ca..d69355bb1 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 9.0.  Last change: 2022 Dec 19
+*textprop.txt*  For Vim version 9.0.  Last change: 2023 Apr 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -165,8 +165,8 @@ prop_add({lnum}, {col}, {props})
 		   text_padding_left				*E1296*
 				used when "text" is present and {col} is zero;
 				padding between the end of the text line
-				(leftmost column for "below") and the virtual
-				text, not highlighted
+				(leftmost column for "above" and "below") and
+				the virtual text, not highlighted
 		   text_wrap	when "text" is present and {col} is zero,
 				specifies what happens if the text doesn't
 				fit:
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 178abbd25..5c1d38a10 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 9.0.  Last change: 2023 Apr 22
+*todo.txt*      For Vim version 9.0.  Last change: 2023 May 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,17 +38,9 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Delete ci/load-snd-dummy.sh?
-Update Filelist
-
-When using ":set no<CTRL-A>" add options starting with "no", not all boolean
-options.
-
 Crash when splitting window: #11961.  Set RedrawingDisabled in
 win_split_ins().
 
-In runtime/autoload/dist/script.vim change "set ft=" to "setlocal ft=" ?
-
 CTRL-J mapping is not used if halfway another mapping. #12002
 Is simplified mapping not used but escape code has been simplified?
 
@@ -57,16 +49,40 @@ in restore_snapshot_rec() restore more values from the snapshot, instead of
 calling frame_new_height() and frame_new_width(), especially w_topline and
 w_skipcol.
 
-'smoothscroll' problem: #12199
-Problems related to 'smoothscroll': #12218 and #12211
+Check places that source "path/*.vim" to not match other extensions, e.g.
+.vim9, on MS-Windows (short file name match, gets expanded to long file name).
+E.g. for startup files, plugins, packs, etc.
+
+When a help item can't be found, then open 'helpfile'.  Search for the tag in
+that file and gtive E149 only when not found.  Helps for a tiny Vim installed
+without all the help files.
+
+Virtual text problems:
+-  Deleting character before a wrapping virtual text, causes for the following
+   lines to dissapear (Issue #12244)
+-  If 'list' is on, 'below' virtual text which includes 1 or 2 characters are
+   gone (Issue #12028)
+-  Virtual text aligned "above": Wrong indentation when using tabs  (Issue
+   #12232)
+-  Virtual text to the right of the line that fits exactly on screen causes
+   that line and all lines below it not to be displayed (Issue #12213)
+-  Window screen gets wrong when a virtual text is placed on 'above' or
+   'below' on an empty line (Issue #11959)
 
 include #12140: positional arguments in printf(), fixes #10577
 
 Include #11818: attach custom data to quickfix items.
 
-When a help item can't be found, then open 'helpfile'.  Search for the tag in
-that file and gtive E149 only when not found.  Helps for a tiny Vim installed
-without all the help files.
+Include #12292: buffer argument for undotree()?
+
+When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be
+highlighted. (van-de-bugger, 2018 Jan 23, #2576)
+
+Improve profiling by caching matching functions:  PR  #12192
+
+Add filecopy() ?  #12346
+
+Implement foreach()  PR  #12166
 
 Errors when running tests with valgrind:
 - test_codestyle.vim:  e.g.:
@@ -100,8 +116,21 @@ Further Vim9 improvements, possibly after launch:
 - implement :class and :interface: See |vim9-classes
   - Change access: public by default, private by prefixing "_".
 	Check for error: can't have same name twice (ignoring "_" prefix).
+  - Cannot use class type of itself in the method (Issue #12369)
+  - class members initialized during definition (Issue #12041)
+  - cannot call class member of funcref type  (Issue #12324)
+  - nested function unable to directly modify private member (Issue #12076)
+      And: can't use "this" keyword in lambda function (Issue #12336)
+  - "return this" required for early return from constructor (inconsistent)
+    (Issue #12040)
+  - class/method confusion inside ":def" when using "class extends" (Issue
+    #12089)
+  - null_object - constant type 17 not supported (Issue #12043)
+  - problem compiling object method call as function call argument (Issue
+    #12081)
   - Make ":defcompile ClassName" compile all functions and methods in the
     class.
+  - object's method in stacktrace missing information (Issue #12078)
   - Forward declaration of a class?  E.g. for Clone() function.
 	email lifepillar 2023 Mar 26
   - Getting member of variable with "any" type should be handled at runtime.
@@ -112,12 +141,18 @@ Further Vim9 improvements, possibly after launch:
     Perhaps use "private" keyword instead of "_" prefix?
   - "final" object members - can only be set in the constructor.
   - "obj.Method()" does not always work in a compiled function, assumes "obj"
-    is a dictionary.  #12196
+    is a dictionary.  #12196  Issue #12024 might be the same problem.
+    Issue #11822: any.Func() can be a dict or an object call, need to handle
+    this at runtime.  Also see #12198 for an example.
+    Possibly issue #11981 can be fixed at the same time (has two examples).
   - accept line breaks in member initialization.  #11957
   - object empty(), len() - can class define a method to be used for them?
   - add to help: when using a default new() method then reordering object
     members may cause trouble.  Can define new() without arguments to avoid.
   - TODO items: check types for "implements" - members and methods
+  - When "Meta" is a class, is "const MetaAlias = Meta" allowed?  It should
+    either work or given an error. possibly give an error now and implement it
+    later (using a typedef).  #12006
   - how about lock/unlock?
   - When checking "implements" also check types of members and function args.
   - For chaining, allow using the class name as type for function return
@@ -127,8 +162,6 @@ Further Vim9 improvements, possibly after launch:
   - More efficient way for interface member index than iterating over list?
   - a variant of type() that returns a different type for each class?
       list<number> and list<string> should also differ.
-  - Issue #11822: any.Func() can be a dict or an object call, need to handle
-    this at runtime.  Also see #12198 for an example.
 - implement :type
 - implement :enum
 - Promise class, could be used to wait on a popup close callback?
@@ -271,6 +304,11 @@ Terminal emulator window:
 - When in terminal-Normal mode when the job finishes, the cursor jumps to the
   end but the window is not updated.  This only happens when typing "a".
       :term bash -c "for V in {0..5}; do echo $V; sleep 1; done"
+- GUI: cursor color is not updated when going to Terminal-Job mode.  #12328
+- GUI: cursor color is not updated when switching between tabs with a key.
+  #12329
+- GUI: cursor color is not updated when switching between tabs with a mouse
+  click.  #12330
 - When started with ":terminal ++close" and the shell exits but there is a
   background process, the window remains open, because the channel still
   exists (and output still shows).  Perhaps close the window when an explicit
@@ -345,6 +383,11 @@ Add BufDeletePost.  #11041
 
 Add winid arg to col() and charcol()  #11466 (request #11461)
 
+When :argument has a non-number argument, use it like :buffer to find the
+argument by name.  #12272
+
+Fold unexpectedly closed when inserting fold marker with CTRL-V (Issue #12320)
+
 Can we make 'noendofline' and 'endoffile' visible?  Should show by default,
 since it's an unusual situation.
 - Show 'noendofline' when it would be used for writing ('fileformat' "dos")
@@ -763,6 +806,9 @@ Improve fallback for menu translations, to avoid having to create lots of
 files that source the actual file.  E.g. menu_da_de -> menu_da
 Include part of #3242?
 
+Patch for different behavior of text objects with quotes: #11976
+Is this actually better?
+
 Patch to have text objects defined by arbitrary single characters. (Daniel
 Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
 Added tests (James McCoy, 2016 Aug 3, #958).  Still needs more work.
@@ -1031,9 +1077,6 @@ option_save({list})					*option_save()*
 directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266)
 Also see #1689.
 
-When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be
-highlighted. (van-de-bugger, 2018 Jan 23, #2576)
-
 No profile information for function that executes ":quit". (Daniel Hahler,
 2017 Dec 26, #2501)
 
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index 2cb74d47c..e8279fd30 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 9.0.  Last change: 2019 Nov 21
+*usr_01.txt*	For Vim version 9.0.  Last change: 2023 May 12
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -161,7 +161,7 @@ filename.  For French:
 ==============================================================================
 *01.4*	Copyright					*manual-copyright*
 
-The Vim user manual and reference manual are Copyright (c) 1988-2003 by Bram
+The Vim user manual and reference manual are Copyright (c) 1988 by Bram
 Moolenaar.  This material may be distributed only subject to the terms and
 conditions set forth in the Open Publication License, v1.0 or later.  The
 latest version is presently available at:
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 4e194d33d..2d89e46e4 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.0.  Last change: 2023 Jan 17
+*usr_41.txt*	For Vim version 9.0.  Last change: 2023 May 06
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index fe1a88857..16bf8f9dd 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2023 Mar 28
+" Last Change:	2023 May 10
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
diff --git a/runtime/ftplugin/luau.vim b/runtime/ftplugin/luau.vim
new file mode 100644
index 000000000..458d0b05a
--- /dev/null
+++ b/runtime/ftplugin/luau.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:	Luau
+" Maintainer:	None yet
+" Last Change:	2023 Apr 30
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Luau is a superset of Lua
+runtime! ftplugin/lua.vim
+
+
+" vim: nowrap sw=2 sts=2 ts=8
diff --git a/runtime/ftplugin/usd.vim b/runtime/ftplugin/usd.vim
new file mode 100644
index 000000000..c795ba591
--- /dev/null
+++ b/runtime/ftplugin/usd.vim
@@ -0,0 +1,18 @@
+" Vim filetype plugin file
+" Language:     Pixar Animation's Universal Scene Description format
+" Maintainer:   Colin Kennedy <colinvfx@gmail.com>
+" Last Change:  2023 May 9
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:did_ftplugin = 1
+
+setlocal commentstring=#\ %s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/indent/dts.vim b/runtime/indent/dts.vim
new file mode 100644
index 000000000..e87f8153c
--- /dev/null
+++ b/runtime/indent/dts.vim
@@ -0,0 +1,63 @@
+" Vim indent file
+" Language:		Device Tree
+" Maintainer:		Roland Hieber, Pengutronix <rhi@pengutronix.de>
+"
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal nosmartindent
+setlocal indentkeys=o,O,0},0<>>,!<Ctrl-F>
+setlocal indentexpr=GetDTSIndent()
+setlocal nolisp
+
+let b:undo_indent = 'setl autoindent< smartindent< indentkeys< indentexpr< lisp<'
+
+function GetDTSIndent()
+    let sw        = shiftwidth()
+    let lnum      = v:lnum
+    let line      = getline(lnum)
+    let prevline  = getline(prevnonblank(lnum-1))
+    let prevind   = indent(prevnonblank(lnum-1))
+
+    if prevnonblank(lnum-1) < 1
+        return 0
+    endif
+
+    " Don't indent header and preprocessor directives
+    if line =~ '^\s*\(/dts-\|#\(include\|define\|undef\|warn\(ing\)\?\|error\|if\(n\?def\)\?\|else\|elif\|endif\)\)'
+        return 0
+
+    " Don't indent /node and &label blocks
+    elseif line =~ '^\s*[/&].\+{\s*$'
+        return 0
+
+    " Indent to matching bracket or remove one shiftwidth if line begins with } or >
+    elseif line =~ '^\s*[}>]'
+        " set cursor to closing bracket on current line
+        let col = matchend(line, '^\s*[>}]')
+        call cursor(lnum, col)
+        
+        " determine bracket type, {} or <>
+        let pair = strpart('{}<>', stridx('}>', line[col-1]) * 2, 2)
+
+        " find matching bracket pair
+        let pairline = searchpair(pair[0], '', pair[1], 'bW')
+
+        if pairline > 0 
+            return indent(pairline)
+        else
+            return prevind - sw
+        endif
+
+    " else, add one level of indent if line ends in { or < or = or ,
+    elseif prevline =~ '[{<=,]$'
+        return prevind + sw
+
+    else
+        return prevind
+    endif
+
+endfunction
diff --git a/runtime/indent/luau.vim b/runtime/indent/luau.vim
new file mode 100644
index 000000000..69893f739
--- /dev/null
+++ b/runtime/indent/luau.vim
@@ -0,0 +1,14 @@
+" Vim filetype indent file
+" Language:    Luau
+" Maintainer:  None yet
+" Last Change: 2023 Apr 30
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+" Luau is a superset of Lua
+runtime! indent/lua.vim
+
+
diff --git a/runtime/indent/testdir/dts.in b/runtime/indent/testdir/dts.in
new file mode 100644
index 000000000..64e56e901
--- /dev/null
+++ b/runtime/indent/testdir/dts.in
@@ -0,0 +1,46 @@
+/* vim: set ft=dts noet sw=8 : */
+
+/* START_INDENT */
+/dts-v1/;
+#include <dt-bindings/pinctrl/pinctrl-imx6q.h>
+	#include "imx6qdl.dtsi"
+#include "imx6qdl-someboard.dtsi"
+
+	/delete-node/ &{/memory@10000000};
+
+	/ {
+compatible = "some,board";
+/delete-node/ memory;
+
+	chosen {
+environment = &{usdhc4/partitions/partition@0};
+};
+}
+
+	&iomuxc {
+pinctrl-names = "default";
+pinctrl-0 = <&pinctrl_hog>;
+
+pinctrl_gpiohog: gpiohoggrp {
+fsl,pins = <
+MX6QDL_PAD_GPIO_9__GPIO1_IO09           0x130b0
+MX6QDL_PAD_GPIO_17__GPIO7_IO12          0x130b0
+>;
+};
+}
+
+&usdhc4 {
+partitions {
+compatible = "fixed-partitions";
+
+partition@0 {
+label = "environment";
+reg = <0x0 0xe0000>;
+};
+};
+};
+
+&{/aliases} {
+usb0 = &usb;
+};
+/* END_INDENT */
diff --git a/runtime/indent/testdir/dts.ok b/runtime/indent/testdir/dts.ok
new file mode 100644
index 000000000..d249766fd
--- /dev/null
+++ b/runtime/indent/testdir/dts.ok
@@ -0,0 +1,46 @@
+/* vim: set ft=dts noet sw=8 : */
+
+/* START_INDENT */
+/dts-v1/;
+#include <dt-bindings/pinctrl/pinctrl-imx6q.h>
+#include "imx6qdl.dtsi"
+#include "imx6qdl-someboard.dtsi"
+
+/delete-node/ &{/memory@10000000};
+
+/ {
+	compatible = "some,board";
+	/delete-node/ memory;
+
+	chosen {
+		environment = &{usdhc4/partitions/partition@0};
+	};
+}
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_gpiohog: gpiohoggrp {
+		fsl,pins = <
+			MX6QDL_PAD_GPIO_9__GPIO1_IO09           0x130b0
+			MX6QDL_PAD_GPIO_17__GPIO7_IO12          0x130b0
+		>;
+	};
+}
+
+&usdhc4 {
+	partitions {
+		compatible = "fixed-partitions";
+
+		partition@0 {
+			label = "environment";
+			reg = <0x0 0xe0000>;
+		};
+	};
+};
+
+&{/aliases} {
+	usb0 = &usb;
+};
+/* END_INDENT */
diff --git a/runtime/menu.vim b/runtime/menu.vim
index dc90eeb60..f8f7e7ad7 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Nov 27
+" Last Change:	2023 May 03
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -607,7 +607,9 @@ def s:XxdBack()
     exe ':%!' .. g:xxdprogram .. ' -r'
   endif
   set ft=
-  doautocmd filetypedetect BufReadPost
+  if exists('#filetypedetect') && exists('#BufReadPost')
+    doautocmd filetypedetect BufReadPost
+  endif
   &mod = mod
 enddef
 
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index 431d9ad9c..a347781e6 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_netrwPlugin")
  finish
 endif
-let g:loaded_netrwPlugin = "v172"
+let g:loaded_netrwPlugin = "v173"
 let s:keepcpo = &cpo
 set cpo&vim
 "DechoRemOn
diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim
index be51ab5b1..bb7eff7be 100644
--- a/runtime/syntax/dts.vim
+++ b/runtime/syntax/dts.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
 " Maintainer:	Daniel Mack <vim@zonque.org>
-" Last Change:	2022 Jun 14
+" Last Change:	2023 Apr 28
 
 if exists("b:current_syntax")
   finish
@@ -10,9 +10,10 @@ let b:current_syntax = 'dts'
 
 syntax region dtsComment        start="/\*"  end="\*/"
 syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
+syntax match  dtsReference      "&{[[:alpha:][:digit:]@_/-]\+}"
 syntax region dtsBinaryProperty start="\[" end="\]"
 syntax match  dtsStringProperty "\".*\""
-syntax match  dtsKeyword        "/.\{-1,\}/"
+syntax match  dtsKeyword        "/[[:alpha:][:digit:]-]\+/\([[:space:]]\|;\)"he=e-1
 syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
 syntax match  dtsNode           /[[:alpha:][:digit:]-_]\+\(@[0-9a-fA-F]\+\|\)[[:space:]]*{/he=e-1
 syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
diff --git a/runtime/syntax/luau.vim b/runtime/syntax/luau.vim
new file mode 100644
index 000000000..59eccac10
--- /dev/null
+++ b/runtime/syntax/luau.vim
@@ -0,0 +1,15 @@
+" Vim syntax file
+" Language:	Luau
+" Maintainer:	None yet
+" Last Change:	2023 Apr 30
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Luau is a superset of lua
+runtime! syntax/lua.vim
+
+let b:current_syntax = "luau"
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index d76303322..0eb82fad1 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -3,8 +3,12 @@
 " Maintainer:	Andrii Sokolov	<andriy145@gmail.com>
 " Original Author:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
 " Former Maintainer:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
-" Contributors: Leonard König <leonard.r.koenig@gmail.com> (C string highlighting), Peter Stanhope <dev.rptr@gmail.com> (Add missing 64-bit mode registers)
-" Last Change:	2017 Jan 23
+" Contributors: 
+" 	Leonard König <leonard.r.koenig@gmail.com> (C string highlighting),
+" 	Peter Stanhope <dev.rptr@gmail.com> (Add missing 64-bit mode registers)
+" 	Frédéric Hamel <rederic.hamel123@gmail.com> (F16c support, partial AVX
+" 						     support, other)
+" Last Change:	2022 May 3
 " NASM Home:	http://www.nasm.us/
 
 
@@ -277,7 +281,7 @@ syn match   nasmInstrModifier	"\<F\(ADD\|MUL\|\(DIV\|SUB\)R\=\)\s\+TO\>"lc=5,ms=
 "  NAsm directives
 syn keyword nasmRepeat		TIMES
 syn keyword nasmDirective	ALIGN[B] INCBIN EQU NOSPLIT SPLIT
-syn keyword nasmDirective	ABSOLUTE BITS SECTION SEGMENT
+syn keyword nasmDirective	ABSOLUTE BITS SECTION SEGMENT DEFAULT
 syn keyword nasmDirective	ENDSECTION ENDSEGMENT
 syn keyword nasmDirective	__SECT__
 "  Macro created standard directives: (requires %include)
@@ -309,7 +313,7 @@ syn match   nasmStdInstruction	"\<\(CMOV\|J\|SET\)\(N\=\([ABGL]E\=\|[CEOSZ]\)\|P
 syn match   nasmStdInstruction	"\<POP\>"
 syn keyword nasmStdInstruction	AAA AAD AAM AAS ADC ADD AND
 syn keyword nasmStdInstruction	BOUND BSF BSR BSWAP BT[C] BTR BTS
-syn keyword nasmStdInstruction	CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ
+syn keyword nasmStdInstruction	CALL CBW CDQ CDQE CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ
 syn keyword nasmStdInstruction	CMPXCHG CMPXCHG8B CPUID CWD[E] CQO
 syn keyword nasmStdInstruction	DAA DAS DEC DIV ENTER
 syn keyword nasmStdInstruction	IDIV IMUL INC INT[O] IRET[D] IRETW IRETQ
@@ -319,6 +323,7 @@ syn keyword nasmStdInstruction	LODSW LOOP[E] LOOPNE LOOPNZ LOOPZ LSS
 syn keyword nasmStdInstruction	MOVSB MOVSD MOVSW MOVSX MOVSQ MOVZX MUL NEG NOP NOT
 syn keyword nasmStdInstruction	OR POPA[D] POPAW POPF[D] POPFW POPFQ
 syn keyword nasmStdInstruction	PUSH[AD] PUSHAW PUSHF[D] PUSHFW PUSHFQ
+syn keyword nasmStdInstruction	PAUSE
 syn keyword nasmStdInstruction	RCL RCR RETF RET[N] ROL ROR
 syn keyword nasmStdInstruction	SAHF SAL SAR SBB SCASB SCASD SCASW
 syn keyword nasmStdInstruction	SHL[D] SHR[D] STC STD STOSB STOSD STOSW STOSQ SUB
@@ -405,6 +410,62 @@ syn keyword nasmSseInstruction	ORPS RCPPS RCPSS RSQRTPS RSQRTSS
 syn keyword nasmSseInstruction	SHUFPS SQRTPS SQRTSS STMXCSR SUBPS SUBSS
 syn keyword nasmSseInstruction	UCOMISS UNPCKHPS UNPCKLPS XORPS
 
+" F16c Instructions
+syn keyword nasmF16CInstruction VCVTPH2PS VCVTPS2PH
+
+" AVX Instructions
+syn keyword nasmAVXInstruction	VCVTDQ2PD VCVTDQ2PS VCVTPD2DQ VCVTPD2P VCVTPD2PS
+syn keyword nasmAVXInstruction	VCVTPS2DQ VCVTPS2PD
+syn keyword nasmAVXInstruction	VCVTSD2SI VCVTSD2SS VCVTSI2SD VCVTSI2SS VCVTSS2SD VCVTSS2SI
+syn keyword nasmAVXInstruction	VMAXPS VMAXSS VMINPS VMINSS VMOVAPS VMOVHLPS VMOVHPS
+syn keyword nasmAVXInstruction	VMAXPD VMAXSD VMINPD VMINSD VMOVAPD VMOVHLPD VMOVHPD
+syn keyword nasmAVXInstruction	VMOVLHPS VMOVLPS VMOVMSKPS VMOVNTPS VMOVSS VMOVUPS
+syn keyword nasmAVXInstruction	VMULPS VMULSS VPXOR
+
+syn match   nasmInstructnError  "\<VP\a\{3}R\a\>"
+syn match   nasmAVXInstruction  "\<VP\(INS\|EXT\)R[BDQW]\>"
+
+syn keyword nasmAVXInstruction VORPS VPABSB VPABSD VPABSW
+syn keyword nasmAVXInstruction PACKSSDW VPACKSSWB VPACKUSDW VPACKUSWB VPADDD
+syn keyword nasmAVXInstruction PADDQ VPADDSB VPADDSW VPADDUSB VPADDUSW
+syn keyword nasmAVXInstruction PADDW VPALIGNR VPAND VPANDN VPAVGB
+syn keyword nasmAVXInstruction PAVGW VPBLENDD VPBLENDVB VPBLENDW VPBROADCASTB
+syn keyword nasmAVXInstruction PBROADCASTD VPBROADCASTQ VPBROADCASTW VPCLMULQDQ VPCMOV
+syn keyword nasmAVXInstruction PCMPEQB VPCMPEQD VPCMPEQQ VPCMPEQW VPCMPESTRI
+syn keyword nasmAVXInstruction PCMPESTRM VPCMPGTB VPCMPGTD VPCMPGTQ VPCMPGTW
+syn keyword nasmAVXInstruction PCMPISTRI VPCMPISTRM VPCOMB VPCOMD VPCOMQ
+syn keyword nasmAVXInstruction PCOMUB VPCOMUD VPCOMUQ VPCOMUW VPCOMW
+syn keyword nasmAVXInstruction PERM2FVPERM2IVPERMD VPERMIL2PD VPERMIL2PS VPERMILPD VPERMILPS
+syn keyword nasmAVXInstruction PERMPD VPERMPS VPERMQ VPEXTRB VPEXTRD
+syn keyword nasmAVXInstruction PEXTRQ VPEXTRW VPGATHERDD VPGATHERDQ VPGATHERQD
+syn keyword nasmAVXInstruction PGATHERQQ VPHADDBD VPHADDBQ VPHADDBW VPHADDD
+syn keyword nasmAVXInstruction PHADDDQ VPHADDSW VPHADDUBQ VPHADDUBW VPHADDUDQ
+syn keyword nasmAVXInstruction PHADDUWD VPHADDUWQ VPHADDW VPHADDWD VPHADDWQ
+syn keyword nasmAVXInstruction PHMINPOSUW VPHSUBBW VPHSUBD VPHSUBDQ VPHSUBSW
+syn keyword nasmAVXInstruction PHSUBW VPHSUBWD VPINSRB VPINSRD VPINSRQ
+syn keyword nasmAVXInstruction PINSRW VPMACSDD VPMACSDQH
+syn keyword nasmAVXInstruction VPMACSDQL VPMACSSDD VPMACSSDQL VPMACSSQH VPMACSSWD
+syn keyword nasmAVXInstruction VPMACSSWW VPMACSWD VPMACSWW VPMADCSSWD VPMADCSWD
+syn keyword nasmAVXInstruction VPMADDUBSW VPMADDWD VPMASKMOVD VPMASKMOVQ VPMAXSB
+syn keyword nasmAVXInstruction VPMAXSD VPMAXSW VPMAXUB VPMAXUD VPMAXUW
+syn keyword nasmAVXInstruction VPMINSB VPMINSD VPMINSW VPMINUB VPMINUD
+syn keyword nasmAVXInstruction VPMINUW VPMOVMSKB VPMOVSXBD VPMOVSXBQ VPMOVSXBW
+syn keyword nasmAVXInstruction VPMOVSXDQ VPMOVSXWD VPMOVSXWQ VPMOVZXBD VPMOVZXBQ
+syn keyword nasmAVXInstruction VPMOVZXBW VPMOVZXDQ VPMOVZXWD VPMOVZXWQ VPMULDQ
+syn keyword nasmAVXInstruction VPMULHRSW VPMULHUW VPMULHW VPMULLD VPMULLW
+syn keyword nasmAVXInstruction VPMULUDQ VPOR VPPERM VPROTB VPROTD
+syn keyword nasmAVXInstruction VPROTQ VPROTW VPSADBW VPSHAB VPSHAD
+syn keyword nasmAVXInstruction VPSHAQ VPSHAW VPSHLB VPSHLD VPSHLQ
+syn keyword nasmAVXInstruction VPSHLW VPSHUFB VPSHUFD VPSHUFHW VPSHUFLW
+syn keyword nasmAVXInstruction VPSIGNB VPSIGND VPSIGNW VPSLLD VPSLLDQ
+syn keyword nasmAVXInstruction VPSLLQ VPSLLVD VPSLLVQ VPSLLW VPSRAD
+syn keyword nasmAVXInstruction VPSRAVD VPSRAW VPSRLD VPSRLDQ VPSRLQ
+syn keyword nasmAVXInstruction VPSRLVD VPSRLVQ VPSRLW VPSUBB VPSUBD
+syn keyword nasmAVXInstruction VPSUBQ VPSUBSB VPSUBSW VPSUBUSB VPSUBUSW
+syn keyword nasmAVXInstruction VPSUBW VPTEST VPUNPCKHBW VPUNPCKHDQ VPUNPCKHQDQ
+syn keyword nasmAVXInstruction VPUNPCKHWD VPUNPCKLBW VPUNPCKLDQ VPUNPCKLQDQ VPUNPCKLWD
+syn keyword nasmAVXInstruction VPXOR VRCPPS
+
 
 " Three Dimensional Now Packed Instructions: (requires 3DNow! unit)
 syn keyword nasmNowInstruction	FEMMS PAVGUSB PF2ID PFACC PFADD PFCMPEQ PFCMPGE
@@ -515,13 +576,14 @@ hi def link nasmDbgInstruction	Debug
 hi def link nasmFpuInstruction	Statement
 hi def link nasmMmxInstruction	Statement
 hi def link nasmSseInstruction	Statement
+hi def link nasmF16cInstruction	Statement
+hi def link nasmAVXInstruction	Statement
 hi def link nasmNowInstruction	Statement
 hi def link nasmAmdInstruction	Special
 hi def link nasmCrxInstruction	Special
 hi def link nasmUndInstruction	Todo
 hi def link nasmInstructnError	Error
 
-
 let b:current_syntax = "nasm"
 
 " vim:ts=8 sw=4
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 8db0f0e04..d1ce01ec8 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 9.0 script
 " Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Last Change:	April 13, 2023
-" Version:	9.0-24
+" Last Change:	May 09, 2023
+" Version:	9.0-25
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
 " Automatically generated keyword lists: {{{1
 
@@ -19,13 +19,13 @@ syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
 syn cluster vimCommentGroup	contains=vimTodo,@Spell
 
 " regular vim commands {{{2
-syn keyword vimCommand contained	a ar[gs] argl[ocal] bad[d] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoc[onsole] elsei[f] endf[unction] enum exu[sage] fin[d] foldc[lose] go[to] ha[rdcopy] hid[e] if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] stopi[nsert] sunmenu sync tab tabfir[st] tabp[revious] tcl th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] up[date] vie[w] vne[w] win[size] wq xmapc[lear] xr[estore]
-syn keyword vimCommand contained	ab arga[dd] argu[ment] balt bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] delep dell diffg[et] dig[raphs] do dsp[lit] echoe[rr] em[enu] endfo[r] eval f[ile] fina[lly] foldd[oopen] gr[ep] helpc[lose] his[tory] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] sts[elect] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] v vim9[cmd] vs[plit] winc[md] wqa[ll] xme xunme
-syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletel delm[arks] diffo[ff] dir doau e[dit] echom[sg] en[dif] endinterface ex files fini[sh] folddoc[losed] grepa[dd] helpf[ind] hor[izontal] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] public py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] substitutepattern sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] ve[rsion] vim9s[cript] wN[ext] windo wundo xmenu xunmenu
-syn keyword vimCommand contained	abo[veleft] argded[upe] au bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletep delp diffp[atch] disa[ssemble] doaut ea echon endclass endt[ry] exi[t] filet fir[st] foldo[pen] gui helpg[rep] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] leg[acy] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] substituterepeat sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl verb[ose] vim[grep] w[rite] winp[os] wv[iminfo] xnoreme xwininfo
-syn keyword vimCommand contained	abstract argdo bN[ext] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] defer deletl dep diffpu[t] dj[ump] dp earlier echow[indow] enddef endw[hile] exp filetype fix[del] for gvim helpt[ags] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp static sun[hide] sy tN[ext] tabe[dit] tabnew tc[d] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unlo[ckvar] vert[ical] vimgrepa[dd] wa[ll] wn[ext] x[it] xnoremenu y[ank]
-syn keyword vimCommand contained	addd arge[dit] b[uffer] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec el[se] endenum ene[w] export filt[er] fo[ld] fu[nction] h[elp] hi iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stj[ump] sunme syn ta[g] tabf[ind] tabo[nly] tch[dir] tf[irst] tln tmapc[lear] try una[bbreviate] uns[ilent] vi[sual] viu[sage] wh[ile] wp[revious] xa[ll] xprop z[^.=]
-syn keyword vimCommand contained	al[l] argg[lobal] ba[ll]
+syn keyword vimCommand contained	a ar[gs] argl[ocal] bad[d] bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] delep dell diffg[et] dig[raphs] do dsp[lit] echoe[rr] em[enu] endfo[r] eval f[ile] fina[lly] foldd[oopen] gr[ep] helpc[lose] his[tory] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] sts[elect] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] v vim9[cmd] vs[plit] win[size] wq xmapc[lear] xr[estore]
+syn keyword vimCommand contained	ab arga[dd] argu[ment] balt bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletel delm[arks] diffo[ff] dir doau e[dit] echom[sg] en[dif] endinterface ex files fini[sh] folddoc[losed] grepa[dd] helpf[ind] hor[izontal] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] public py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] substitutepattern sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] ve[rsion] vim9s[cript] wN[ext] winc[md] wqa[ll] xme xunme
+syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] bd[elete] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletep delp diffp[atch] disa[ssemble] doaut ea echon endclass endt[ry] exi[t] filet fir[st] foldo[pen] gui helpg[rep] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] leg[acy] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] substituterepeat sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl verb[ose] vim[grep] w[rite] windo wundo xmenu xunmenu
+syn keyword vimCommand contained	abo[veleft] argded[upe] au bel[owright] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] defer deletl dep diffpu[t] dj[ump] dp earlier echow[indow] enddef endw[hile] exp filetype fix[del] for gvim helpt[ags] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp static sun[hide] sy tN[ext] tabe[dit] tabnew tc[d] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unlo[ckvar] vert[ical] vimgrepa[dd] wa[ll] winp[os] wv[iminfo] xnoreme xwininfo
+syn keyword vimCommand contained	abstract argdo bN[ext] bf[irst] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec el[se] endenum ene[w] export filt[er] fo[ld] fu[nction] h[elp] hi iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stj[ump] sunme syn ta[g] tabf[ind] tabo[nly] tch[dir] tf[irst] tln tmapc[lear] try una[bbreviate] uns[ilent] vi[sual] viu[sage] wh[ile] wn[ext] x[it] xnoremenu y[ank]
+syn keyword vimCommand contained	addd arge[dit] b[uffer] bl[ast] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoc[onsole] elsei[f] endf[unction] enum exu[sage] fin[d] foldc[lose] go[to] ha[rdcopy] hid[e] if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] stopi[nsert] sunmenu sync tab tabfir[st] tabp[revious] tcl th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] up[date] vie[w] vne[w] wi wp[revious] xa[ll] xprop z[^.=]
+syn keyword vimCommand contained	al[l] argg[lobal] ba[ll] bm[odified]
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Until Winbar XMLent XMLns
 
@@ -79,12 +79,12 @@ syn match vimHLGroup contained	"Conceal"
 syn case match
 
 " Function Names {{{2
-syn keyword vimFuncName contained	abs argc assert_equal assert_match atan balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled extendnew findfile fnameescape foldtextresult get getchangelist getcmdcompltype getcompletion getfperm getline getpid getscriptinfo getwininfo glob2regpat histadd hlID indexof inputsecret isinf job_setoptions js_encode libcall list2str log10 mapnew matchdelete matchstrpos mzeval popup_atcursor popup_dialog popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdline setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_channel test_null_partial test_setmouse timer_info tolower type values winbufnr win_getid win_id2win winnr win_splitmove
-syn keyword vimFuncName contained	acos argidx assert_equalfile assert_nobeep atan2 balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp feedkeys flatten fnamemodify foreground getbufinfo getchar getcmdline getcurpos getfsize getloclist getpos gettabinfo getwinpos globpath histdel hlset input insert islocked job_start json_decode libcallnr listener_add luaeval mapset matchend max nextnonblank popup_beval popup_filter_menu popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_dict test_null_string test_settime timer_pause toupper typename virtcol wincol win_gettype winlayout winrestcmd winwidth
-syn keyword vimFuncName contained	add arglistid assert_exception assert_notequal autocmd_add blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filereadable flattennew foldclosed fullcommand getbufline getcharmod getcmdpos getcursorcharpos getftime getmarklist getqflist gettabvar getwinposx has histget hostname inputdialog interrupt isnan job_status json_encode line listener_flush map match matchfuzzy menu_info nr2char popup_clear popup_filter_yesno popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapfilelist synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_function test_option_not_set test_srand_seed timer_start tr undofile virtcol2col windowsversion win_gotoid winline winrestview wordcount
-syn keyword vimFuncName contained	and argv assert_fails assert_notmatch autocmd_delete browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filewritable float2nr foldclosedend funcref getbufoneline getcharpos getcmdscreenpos getcwd getftype getmatches getreg gettabwinvar getwinposy has_key histnr iconv inputlist invert items job_stop keys line2byte listener_remove maparg matchadd matchfuzzypos min or popup_close popup_findecho popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_mswin_event test_null_job test_override test_unknown timer_stop trim undotree visualmode win_execute winheight win_move_separator winsaveview writefile
-syn keyword vimFuncName contained	append asin assert_false assert_report autocmd_get browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath expr10 filter floor foldlevel function getbufvar getcharsearch getcmdtype getenv getimstatus getmousepos getreginfo gettagstack getwinvar haslocaldir hlexists indent inputrestore isabsolutepath job_getchannel join keytrans lispindent localtime mapcheck matchaddpos matchlist mkdir pathshorten popup_create popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor
-syn keyword vimFuncName contained	appendbufline assert_beeps assert_inrange assert_true balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extend finddir fmod foldtext garbagecollect getcellwidths getcharstr getcmdwintype getfontname getjumplist getmouseshape getregtype gettext glob hasmapto hlget index inputsave isdirectory job_info js_decode len list2blob log maplist matcharg matchstr mode perleval
+syn keyword vimFuncName contained	abs argc assert_equal assert_match atan balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled extendnew findfile fnameescape foldtextresult get getchangelist getcmdcompltype getcompletion getfperm getline getpid getscriptinfo getwininfo glob2regpat histadd hlID indexof inputsecret isinf job_setoptions js_encode libcall list2str log10 mapnew matchdelete matchstrpos mzeval popup_atcursor popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx substitute synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_dict test_null_string test_settime timer_pause toupper typename values winbufnr win_getid win_id2win winnr win_splitmove
+syn keyword vimFuncName contained	acos argidx assert_equalfile assert_nobeep atan2 balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp feedkeys flatten fnamemodify foreground getbufinfo getchar getcmdline getcurpos getfsize getloclist getpos gettabinfo getwinpos globpath histdel hlset input insert islocked job_start json_decode libcallnr listener_add luaeval mapset matchend max nextnonblank popup_beval popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapfilelist synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_function test_option_not_set test_srand_seed timer_start tr undofile virtcol wincol win_gettype winlayout winrestcmd winwidth
+syn keyword vimFuncName contained	add arglistid assert_exception assert_notequal autocmd_add blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filereadable flattennew foldclosed fullcommand getbufline getcharmod getcmdpos getcursorcharpos getftime getmarklist getqflist gettabvar getwinposx has histget hostname inputdialog interrupt isnan job_status json_encode line listener_flush map match matchfuzzy menu_info nr2char popup_clear popup_findecho popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strutf16len swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_mswin_event test_null_job test_override test_unknown timer_stop trim undotree virtcol2col windowsversion win_gotoid winline winrestview wordcount
+syn keyword vimFuncName contained	and argv assert_fails assert_notmatch autocmd_delete browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filewritable float2nr foldclosedend funcref getbufoneline getcharpos getcmdscreenpos getcwd getftype getmatches getreg gettabwinvar getwinposy has_key histnr iconv inputlist invert items job_stop keys line2byte listener_remove maparg matchadd matchfuzzypos min or popup_close popup_findinfo popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdline setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart strwidth swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq visualmode win_execute winheight win_move_separator winsaveview writefile
+syn keyword vimFuncName contained	append asin assert_false assert_report autocmd_get browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath expr10 filter floor foldlevel function getbufvar getcharsearch getcmdtype getenv getimstatus getmousepos getreginfo gettagstack getwinvar haslocaldir hlexists indent inputrestore isabsolutepath job_getchannel join keytrans lispindent localtime mapcheck matchaddpos matchlist mkdir pathshorten popup_create popup_findpreview popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime submatch synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_channel test_null_partial test_setmouse timer_info tolower type utf16idx wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor
+syn keyword vimFuncName contained	appendbufline assert_beeps assert_inrange assert_true balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extend finddir fmod foldtext garbagecollect getcellwidths getcharstr getcmdwintype getfontname getjumplist getmouseshape getregtype gettext glob hasmapto hlget index inputsave isdirectory job_info js_decode len list2blob log maplist matcharg matchstr mode perleval popup_dialog popup_getoptions
 
 "--- syntax here and above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index be9f38723..efacdb9dc 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -1,10 +1,12 @@
 " Vim syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
-" Last Change:	2021 Oct 04
-" Version:	5.4n.1
+" Last Change:	2023 May 11
+" Version:	5.4n.2
 "               Jemma Nelson added termguicolors support
 "               Dominique Pellé fixed spelling support
+"               Christian J. Robinson fixed use of global variables, moved
+"               loop into a compiled function
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -21,108 +23,119 @@ syn region  xpmPixelString	start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@xpmCo
 
 if has("gui_running") || has("termguicolors") && &termguicolors
 
-let color  = ""
-let chars  = ""
-let colors = 0
-let cpp    = 0
-let n      = 0
-let i      = 1
+def s:CreateSyntax(): void
+   var color  = ""
+   var chars  = ""
+   var colors = 0
+   var cpp    = 0
+   var n      = 0
+   var lines  = getline(1, '$')
 
-while i <= line("$")		" scanning all lines
+   for line in lines			# scanning all lines
 
-   let s = matchstr(getline(i), '".\{-1,}"')
-   if s != ""			" does line contain a string?
+      var s = matchstr(line, '".\{-1,}"')
 
-      if n == 0			" first string is the Values string
+      if s != ""			# does line contain a string?
 
-	 " get the 3rd value: colors = number of colors
-	 let colors = substitute(s, '"\s*\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
-	 " get the 4th value: cpp = number of character per pixel
-	 let cpp = substitute(s, '"\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
-	 if cpp =~ '[^0-9]'
-	    break  " if cpp is not made of digits there must be something wrong
-	 endif
+	 if n == 0			# first string is the Values string
 
-	 " Highlight the Values string as normal string (no pixel string).
-	 " Only when there is no slash, it would terminate the pattern.
-	 if s !~ '/'
-	    exe 'syn match xpmValues /' . s . '/'
-	 endif
-	 hi link xpmValues String
+	    var values = split(s[1 : -2])
+
+	    # Values string invalid, bail out
+	    if len(values) != 4
+	       return
+	    endif
 
-	 let n = 1		" n = color index
+	    # get the 3rd value: colors = number of colors
+	    colors = str2nr(values[2])
+	    # get the 4th value: cpp = number of character per pixel
+	    cpp = str2nr(values[3])
 
-      elseif n <= colors	" string is a color specification
+	    # these values must be positive, nonzero
+	    if colors < 1 || cpp < 1
+	       return
+	    endif
+
+	    # Highlight the Values string as normal string (no pixel string).
+	    # Only when there is no slash, it would terminate the pattern.
+	    if s !~ '/'
+	       exe 'syn match xpmValues /' .. s .. '/'
+	    endif
+	    hi link xpmValues String
 
-	 " get chars = <cpp> length string representing the pixels
-	 " (first incl. the following whitespace)
-	 let chars = substitute(s, '"\(.\{'.cpp.'}\s\).*"', '\1', '')
+	    n = 1		# n = color index
 
-	 " now get color, first try 'c' key if any (color visual)
-	 let color = substitute(s, '".*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*"', '\1', '')
-	 if color == s
-	    " no 'c' key, try 'g' key (grayscale with more than 4 levels)
-	    let color = substitute(s, '".*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*"', '\1', '')
+	 elseif n <= colors	# string is a color specification
+
+	    # get chars = <cpp> length string representing the pixels
+	    # (first incl. the following whitespace)
+	    chars = substitute(s, '"\(.\{' .. cpp .. '}\s\).*"', '\1', '')
+
+	    # now get color, first try 'c' key if any (color visual)
+	    color = substitute(s, '".*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*"', '\1', '')
 	    if color == s
-	       " next try: 'g4' key (4-level grayscale)
-	       let color = substitute(s, '".*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*"', '\1', '')
+	       # no 'c' key, try 'g' key (grayscale with more than 4 levels)
+	       color = substitute(s, '".*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*"', '\1', '')
 	       if color == s
-		  " finally try 'm' key (mono visual)
-		  let color = substitute(s, '".*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*"', '\1', '')
+		  # next try: 'g4' key (4-level grayscale)
+		  color = substitute(s, '".*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*"', '\1', '')
 		  if color == s
-		     let color = ""
+		     # finally try 'm' key (mono visual)
+		     color = substitute(s, '".*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*"', '\1', '')
+		     if color == s
+			color = ""
+		     endif
 		  endif
 	       endif
 	    endif
-	 endif
 
-	 " Vim cannot handle RGB codes with more than 6 hex digits
-	 if color =~ '#\x\{10,}$'
-	    let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
-	 elseif color =~ '#\x\{7,}$'
-	    let color = substitute(color, '\(\x\x\)\x', '\1', 'g')
-	 " nor with 3 digits
-	 elseif color =~ '#\x\{3}$'
-	    let color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
-	 endif
+	    # Vim cannot handle RGB codes with more than 6 hex digits
+	    if color =~ '#\x\{10,}$'
+	       color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
+	    elseif color =~ '#\x\{7,}$'
+	       color = substitute(color, '\(\x\x\)\x', '\1', 'g')
+	    # nor with 3 digits
+	    elseif color =~ '#\x\{3}$'
+	       color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
+	    endif
 
-	 " escape meta characters in patterns
-	 let s = escape(s, '/\*^$.~[]')
-	 let chars = escape(chars, '/\*^$.~[]')
-
-	 " now create syntax items
-	 " highlight the color string as normal string (no pixel string)
-	 exe 'syn match xpmCol'.n.'Def /'.s.'/ contains=xpmCol'.n.'inDef'
-	 exe 'hi link xpmCol'.n.'Def String'
-
-	 " but highlight the first whitespace after chars in its color
-	 exe 'syn match xpmCol'.n.'inDef /"'.chars.'/hs=s+'.(cpp+1).' contained'
-	 exe 'hi link xpmCol'.n.'inDef xpmColor'.n
-
-	 " remove the following whitespace from chars
-	 let chars = substitute(chars, '.$', '', '')
-
-	 " and create the syntax item contained in the pixel strings
-	 exe 'syn match xpmColor'.n.' /'.chars.'/ contained'
-	 exe 'syn cluster xpmColors add=xpmColor'.n
-
-	 " if no color or color = "None" show background
-	 if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
-	    exe 'hi xpmColor'.n.' guifg=bg'
-	    exe 'hi xpmColor'.n.' guibg=NONE'
-	 elseif color !~ "'"
-	    exe 'hi xpmColor'.n." guifg='".color."'"
-	    exe 'hi xpmColor'.n." guibg='".color."'"
+	    # escape meta characters in patterns
+	    s = escape(s, '/\*^$.~[] ')
+	    chars = escape(chars, '/\*^$.~[] ')
+
+	    # now create syntax items
+	    # highlight the color string as normal string (no pixel string)
+	    exe 'syn match xpmCol' .. n .. 'Def /' .. s .. '/ contains=xpmCol' .. n .. 'inDef'
+	    exe 'hi link xpmCol' .. n .. 'Def String'
+
+	    # but highlight the first whitespace after chars in its color
+	    exe 'syn match xpmCol' .. n .. 'inDef /"' .. chars .. '/hs=s+' .. (cpp + 1) .. ' contained'
+	    exe 'hi link xpmCol' .. n .. 'inDef xpmColor' .. n
+
+	    # remove the following whitespace from chars
+	    chars = substitute(chars, '.$', '', '')
+
+	    # and create the syntax item contained in the pixel strings
+	    exe 'syn match xpmColor' .. n .. ' /' .. chars .. '/ contained'
+	    exe 'syn cluster xpmColors add=xpmColor' .. n
+
+	    # if no color or color = "None" show background
+	    if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
+	       exe 'hi xpmColor' .. n .. ' guifg=bg'
+	       exe 'hi xpmColor' .. n .. ' guibg=NONE'
+	    elseif color !~ "'"
+	       exe 'hi xpmColor' .. n .. " guifg='" .. color .. "'"
+	       exe 'hi xpmColor' .. n .. " guibg='" .. color .. "'"
+	    endif
+	    n += 1
+	 else
+	    break		# no more color string
 	 endif
-	 let n = n + 1
-      else
-	 break		" no more color string
       endif
-   endif
-   let i = i + 1
-endwhile
+   endfor
+enddef
 
-unlet color chars colors cpp n i s
+call s:CreateSyntax()
 
 endif          " has("gui_running") || has("termguicolors") && &termguicolors
 
diff --git a/src/INSTALLmac.txt b/src/INSTALLmac.txt
index 9980d258c..2e8a65650 100644
--- a/src/INSTALLmac.txt
+++ b/src/INSTALLmac.txt
@@ -59,6 +59,8 @@ To build libtool from source:
 Build and install the GUI version with X-Windows
 ----------------------------------------------------------------------------
 
+NOTE: this probably no longer works, since Athena support has been removed.
+
 First, install XQuartz, which you can download from https://www.xquartz.org.
 
 To tell configure to use a GUI you can edit the Makefile and uncomment these
diff --git a/src/po/de.po b/src/po/de.po
index e2ed9143d..e4f0612f3 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 19:01+0200\n"
+"POT-Creation-Date: 2023-05-12 23:23+0200\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
 "Last-Translator: Christian Brabandt <cb@256bit.org>\n"
 "Language-Team: German\n"
@@ -157,6 +157,10 @@ msgstr "Ende"
 msgid "Top"
 msgstr "Anfang"
 
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
 msgid "[Prompt]"
 msgstr "[Prompt]"
 
@@ -271,6 +275,42 @@ msgstr "Die Schl�ssel stimmen nicht �berein!"
 msgid "[crypted]"
 msgstr "[verschl�sselt]"
 
+#, c-format
+msgid "xchacha20v2: using custom opslimit \"%llu\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung eines benutzerdefinierten Berechnungslimit \"%llu\" "
+"f�r die Schl�sselableitung"
+
+#, c-format
+msgid "xchacha20v2: using default opslimit \"%llu\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung des Standard-Berechnungslimit \"%llu\" "
+"f�r die Schl�sselableitung"
+
+#, c-format
+msgid "xchacha20v2: using custom memlimit \"%lu\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung eines benutzerdefinierten Speicherlimits \"%lu\" "
+"f�r die Schl�sselableitung"
+
+#, c-format
+msgid "xchacha20v2: using default memlimit \"%lu\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung des Standard-Speicherlimits \"%lu\" "
+"f�r die Schl�sselableitung"
+
+#, c-format
+msgid "xchacha20v2: using custom algorithm \"%d\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung des benutzerdefinierten Algorithmus \"%d\" "
+"f�r die Schl�sselableitung"
+
+#, c-format
+msgid "xchacha20v2: using default algorithm \"%d\" for Key derivation."
+msgstr ""
+"xchacha20v2: Verwendung des Standard-Algorithmus \"%d\" "
+"f�r die Schl�sselableitung"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Debug-Modus. Geben Sie \"cont\" zum Fortsetzen ein."
 
@@ -1332,9 +1372,6 @@ msgstr " Vorschlag der Rechtschreibpr�fung (s^N^P)"
 msgid " Keyword Local completion (^N^P)"
 msgstr " Lokale Stichwort-Vervollst�ndigung(^N^P)"
 
-msgid "Hit end of paragraph"
-msgstr "Absatzende erreicht"
-
 msgid "'dictionary' option is empty"
 msgstr "Die Option 'dictionary' ist leer"
 
@@ -1367,6 +1404,12 @@ msgstr " F�ge hinzu"
 msgid "-- Searching..."
 msgstr "-- Suche..."
 
+msgid "Hit end of paragraph"
+msgstr "Absatzende erreicht"
+
+msgid "Pattern not found"
+msgstr "Muster nicht gefunden"
+
 msgid "Back at original"
 msgstr "Zur�ck am Ursprung"
 
@@ -1627,6 +1670,9 @@ msgstr ""
 "--not-a-term\t\tKeine Warnung ausgeben, wenn Eingabe/Ausgabe nicht auf einem "
 "Terminal ausgegeben wird"
 
+msgid "--gui-dialog-file {fname}  For testing: write dialog text"
+msgstr "--gui-dialog-file {fname} Zum testen: Dialogtext schreiben"
+
 msgid "--ttyfail\t\tExit if input or output is not a terminal"
 msgstr ""
 "--ttyfail\t\tBeende, wenn Ein- oder Ausgabe nicht auf einem Terminal "
@@ -1828,6 +1874,32 @@ msgstr "-P <parent title>\t�ffne Vim innerhalb der Vater-Applikation"
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
 msgstr "--windowid <HWND>\t�ffne Vim in einem anderen Win32 widget"
 
+msgid "Seen modifyOtherKeys: true\n"
+msgstr "Habe modifyOtherKeys gesehen\n"
+
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgid "Off"
+msgstr "Aus"
+
+msgid "On"
+msgstr "An"
+
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+msgid "Cleared"
+msgstr "Gel�scht"
+
+#, c-format
+msgid "modifyOtherKeys detected: %s\n"
+msgstr "modifyOtherKeys erkannt: %s\n"
+
+#, c-format
+msgid "Kitty keyboard protocol: %s\n"
+msgstr "Kitty Keyboard Protokoll: %s\n"
+
 msgid "No abbreviation found"
 msgstr "Keine Kurzform gefunden"
 
@@ -1959,6 +2031,9 @@ msgstr "??? von hier bis ???ENDE k�nnten die Zeilen falsch sein"
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? von hier bis ???ENDE k�nnten Zeilen eingef�gt oder gel�scht sein"
 
+msgid "??? lines may be missing"
+msgstr "??? Zeilen k�nnen fehlen"
+
 msgid "???END"
 msgstr "???ENDE"
 
@@ -2233,9 +2308,6 @@ msgstr "Unterbrechung: "
 msgid "Press ENTER or type command to continue"
 msgstr "Bet�tigen Sie die EINGABETASTE oder geben Sie einen Befehl ein"
 
-msgid "Unknown"
-msgstr "Unbekannt"
-
 #, c-format
 msgid "%s line %ld"
 msgstr "%s Zeile %ld"
@@ -3519,13 +3591,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"Big version "
-msgstr ""
-"\n"
-"Gro�e Version "
-
-msgid ""
-"\n"
 "Normal version "
 msgstr ""
 "\n"
@@ -3533,13 +3598,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"Small version "
-msgstr ""
-"\n"
-"Kleine Version "
-
-msgid ""
-"\n"
 "Tiny version "
 msgstr ""
 "\n"
@@ -3891,9 +3949,9 @@ msgstr "Unterbrochen"
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ sollte von /, ? oder & gefolgt werden"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgid "E11: Invalid in command-line window; :q<CR> closes the window"
 msgstr ""
-"E11: Ung�ltig im Kommandozeilen-Fenster; <CR> f�hrt aus, CTRL-C beendet"
+"E11: Ung�ltig im Kommandozeilen-Fenster; :q<CR> schlie�t das Fenster"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
@@ -5614,6 +5672,10 @@ msgstr "E476: Ung�ltiger Befehl"
 msgid "E476: Invalid command: %s"
 msgstr "E476: Ung�ltiger Befehl: %s"
 
+#, c-format
+msgid "E476: Invalid command: %s, expected %s"
+msgstr "E476: Ung�ltiger Befehl: %s, erwartete %s"
+
 msgid "E477: No ! allowed"
 msgstr "E477: Kein ! erlaubt"
 
@@ -5655,6 +5717,10 @@ msgstr "E486: Muster nicht gefunden: %s"
 msgid "E487: Argument must be positive"
 msgstr "E487: Argument muss positiv sein"
 
+#, c-format
+msgid "E487: Argument must be positive: %s"
+msgstr "E487: Argument muss positiv sein: %s"
+
 msgid "E488: Trailing characters"
 msgstr "E488: �bersch�ssige Zeichen"
 
@@ -5759,8 +5825,8 @@ msgid ""
 "E513: Write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Schreibfehler, Konvertierung f�r Zeile %ld fehlgeschlagen (leere 'fenc' "
-"zum Erzwingen)"
+"E513: Schreibfehler, Konvertierung f�r Zeile %ld fehlgeschlagen (leere "
+"'fenc' zum Erzwingen)"
 
 msgid "E514: Write error (file system full?)"
 msgstr "E514: Schreibfehler (Dateisystem voll?)"
@@ -5980,9 +6046,6 @@ msgstr "'>' fehlt"
 msgid "Illegal register name"
 msgstr "Unzul�ssiger Register Name"
 
-msgid "E578: Not allowed to change text here"
-msgstr "E578: Nicht erlaubt Text hier zu �ndern"
-
 # TODO: Capitalise first word of message?
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if Schachtelung zu tief"
@@ -6231,8 +6294,9 @@ msgstr "E674: printmbcharset darf nicht leer sein mit Multi-Byte Kodierung."
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Keine Standardschriftart angegeben f�r Multi-Byte Ausdruck."
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Keine �bereinstimmenden Autokommandos f�r acwrite Buffer"
+#, c-format
+msgid "E676: No matching autocommands for buftype=%s buffer"
+msgstr "E676: Keine �bereinstimmenden Autokommandos buftype-Option=%s Buffer"
 
 msgid "E677: Error writing temp file"
 msgstr "E677: Fehler beim Schreiben einer tempor�ren Datei"
@@ -6888,8 +6952,8 @@ msgstr ""
 "E859: Konvertierung von zur�ckgegebenen Pythonobjekt zu Vim Wert "
 "fehlgeschlagen"
 
-msgid "E860: Need 'id' and 'type' with 'both'"
-msgstr "E860: Ben�tige 'id' und 'type' mit 'both'"
+msgid "E860: Need 'id' and 'type' or 'types' with 'both'"
+msgstr "E860: Ben�tige 'id' und 'type' oder 'typen' mit 'beiden'"
 
 msgid "E861: Cannot open a second popup with a terminal"
 msgstr "E861: Kann kein zweites Popup mit Terminal �ffen"
@@ -7135,10 +7199,6 @@ msgstr "E920: F�r _io Datei muss _name gesetzt ist"
 msgid "E921: Invalid callback argument"
 msgstr "E921: Ung�lg�ltiges Callback Argument"
 
-# TODO: Capitalise first word of message?
-msgid "E922: Expected a dict"
-msgstr "E922: Erwarte ein Dictionary"
-
 msgid "E923: Second argument of function() must be a list or a dict"
 msgstr ""
 "E923: Zweites Argument von function() muss eine Liste oder ein Dictionary "
@@ -7454,11 +7514,13 @@ msgstr "E1006: %s wird als Argument verwendet"
 msgid "E1007: Mandatory argument after optional argument"
 msgstr "E1007: obligatorisches Argument nach optionalem Argument"
 
-msgid "E1008: Missing <type>"
-msgstr "E1008: Fehlendes <type>"
+#, c-format
+msgid "E1008: Missing <type> after %s"
+msgstr "E1008: Fehlendes <type> after %s"
 
-msgid "E1009: Missing > after type"
-msgstr "E1009: Fehlendes '>' nach Typ"
+#, c-format
+msgid "E1009: Missing > after type: %s"
+msgstr "E1009: Fehlendes '>' nach Typ: %s"
 
 #, c-format
 msgid "E1010: Type not recognized: %s"
@@ -7701,9 +7763,6 @@ msgstr "E1074: Keine Leerzeichen nach Punkt erlaubt"
 msgid "E1075: Namespace not supported: %s"
 msgstr "E1075: Namespace nicht unterst�tzt: %s"
 
-msgid "E1076: This Vim is not compiled with float support"
-msgstr "E1076: Vim wurde nicht mit der \"float\"-Eigenschaft �bersetzt"
-
 #, c-format
 msgid "E1077: Missing argument type for %s"
 msgstr "E1077: Fehlender Argumenttyp f�r %s"
@@ -7813,10 +7872,6 @@ msgid "E1107: String, List, Dict or Blob required"
 msgstr "E1107: Zeichenkette, Liste, Dictionary oder Blob ben�tigt"
 
 #, c-format
-msgid "E1108: Item not found: %s"
-msgstr "E1108: Element nicht gefunden: %s"
-
-#, c-format
 msgid "E1109: List item %d is not a List"
 msgstr "E1109: Listenwert %d ist keine Liste"
 
@@ -7910,10 +7965,6 @@ msgstr "E1135: Verwende Zeichenkette als Bool: \"%s\""
 msgid "E1136: <Cmd> mapping must end with <CR> before second <Cmd>"
 msgstr "E1136: <Cmd> Mapping muss mit <CR> vor weiterem <Cmd> enden"
 
-#, c-format
-msgid "E1137: <Cmd> mapping must not include %s key"
-msgstr "E1137: <Cmd> Mapping darf %s Taste nicht enthalten"
-
 msgid "E1138: Using a Bool as a Number"
 msgstr "E1138: Bool als Zahl verwendet"
 
@@ -7927,8 +7978,9 @@ msgid "E1141: Indexable type required"
 msgstr "E1141: indexierbarer Typ erforderlich"
 
 msgid "E1142: Calling test_garbagecollect_now() while v:testing is not set"
-msgstr "E1142: Rufe test_garbagecollect_now() auf, obwohl v:testing nicht"
-"definiert wurde"
+msgstr ""
+"E1142: Rufe test_garbagecollect_now() auf, obwohl v:testing nichtdefiniert "
+"wurde"
 
 #, c-format
 msgid "E1143: Empty expression: \"%s\""
@@ -7983,8 +8035,9 @@ msgid "E1157: Missing return type"
 msgstr "E1157: Fehlender R�ckgabetyp"
 
 msgid "E1158: Cannot use flatten() in Vim9 script, use flattennew()"
-msgstr "E1158: flatten() kann nicht in Vim9 Script verwendet werden"
-"Benutze flattennew()"
+msgstr ""
+"E1158: flatten() kann nicht in Vim9 Script verwendet werdenBenutze "
+"flattennew()"
 
 msgid "E1159: Cannot split a window when closing the buffer"
 msgstr ""
@@ -8345,10 +8398,6 @@ msgstr ""
 msgid "E1252: String, List or Blob required for argument %d"
 msgstr "E1252: Zeichenkette, Liste oder Blob erforderlich f�r Argument %d"
 
-#, c-format
-msgid "E1253: String expected for argument %d"
-msgstr "E1253: Zeichenkette erwartet f�r Argument %d"
-
 msgid "E1254: Cannot use script variable in for loop"
 msgstr "E1254: Kann Skriptvariable nicht in einer for Schleife verwenden"
 
@@ -8398,8 +8447,8 @@ msgid ""
 "E1266: Critical error in python3 initialization, check your python3 "
 "installation"
 msgstr ""
-"E1266: Kritischer Fehler bei der Python3 Initializierierung, bitte "
-"pr�fe Python3 Installation"
+"E1266: Kritischer Fehler bei der Python3 Initializierierung, bitte pr�fe "
+"Python3 Installation"
 
 #, c-format
 msgid "E1267: Function name must start with a capital: %s"
@@ -8456,6 +8505,306 @@ msgstr "E1280: Ung�ltiges Zeichen in Wort"
 msgid "E1281: Atom '\\%%#=%c' must be at the start of the pattern"
 msgstr "E1281: Atom '\\%%#=%c' muss am Anfang des Muster stehen"
 
+msgid "E1282: Bitshift operands must be numbers"
+msgstr "E1282: Bitshift Operanden m�ssen Zahlen sein"
+
+msgid "E1283: Bitshift amount must be a positive number"
+msgstr "E1283: Bithift-Betrag muss eine positive Zahl sein"
+
+#, c-format
+msgid "E1284: Argument 1, list item %d: Dictionary required"
+msgstr "E1284: Argument 1, Listenelement %d: muss Dictionary sein"
+
+#, c-format
+msgid "E1285: Could not clear timeout: %s"
+msgstr "E1285: Timeout konnte nicht gel�scht werden: %s"
+
+#, c-format
+msgid "E1286: Could not set timeout: %s"
+msgstr "E1286: Konnte keinen Timeout setzen: %s"
+
+#, c-format
+msgid "E1287: Could not set handler for timeout: %s"
+msgstr "E1287: Konnte Handler f�r Timeout nicht setzen: %s"
+
+#, c-format
+msgid "E1288: Could not reset handler for timeout: %s"
+msgstr "E1288: Konnte Handler f�r Timeout nicht zur�cksetzen: %s"
+
+#, c-format
+msgid "E1289: Could not check for pending SIGALRM: %s"
+msgstr "E1289: Konnte nicht auf anstehende SIGALRM pr�fen: %s"
+
+msgid "E1290: substitute nesting too deep"
+msgstr "E1290: Zu tiefe Schachtelung der subsitute-Funktion"
+
+#, c-format
+msgid "E1291: Invalid argument: %ld"
+msgstr "E1291: Ung�ltiges Argument: %ld"
+
+msgid "E1292: Command-line window is already open"
+msgstr "E1292: Befehlszeilenfenster ist bereits ge�ffnet"
+
+msgid "E1293: Cannot use a negative id after adding a textprop with text"
+msgstr ""
+"E1293: Negative ID kann nicht verwendet werden, nachdem eine Textproperty"
+"mit Text hinzugef�gt wurde"
+
+msgid "E1294: Can only use text_align when column is zero"
+msgstr "E1294: Kann text_align nur verwenden, wenn die Spalte Null ist"
+
+msgid "E1295: Cannot specify both 'type' and 'types'"
+msgstr "E1295: Kann nicht sowohl 'type' als auch 'types' angeben"
+
+msgid "E1296: Can only use left padding when column is zero"
+msgstr "E1296: Kann nur links ausrichten, wenn Spalte Null ist"
+
+#, c-format
+msgid "E1297: Non-NULL Dictionary required for argument %d"
+msgstr "E1297: Nicht leeres Dictionary ben�tigt f�r Argument %d"
+
+#, c-format
+msgid "E1298: Non-NULL List required for argument %d"
+msgstr "E1298: Nicht leere Liste erforderlich f�r Argument %d"
+
+msgid "E1299: Window unexpectedly closed while searching for tags"
+msgstr "E1299: Fenster w�hrend Suche nach tags unerwarted geschlossen"
+
+msgid "E1300: Cannot use a partial with dictionary for :defer"
+msgstr "E1300: Kann kein Partial mit Dictionary f�r :defer verwenden"
+
+#, c-format
+msgid "E1301: String, Number, List or Blob required for argument %d"
+msgstr "E1301: Zeichenkette, Zahl, Liste oder Blob erforderlich f�r Argument %d"
+
+msgid "E1302: Script variable was deleted"
+msgstr "E1302: Scriptvariable wurde gel�scht"
+
+#, c-format
+msgid "E1303: Custom list completion function does not return a List but a %s"
+msgstr "E1303: Benutzerdefinierte Listenvervollst�ndigungsfunktion gibt keine Liste, sondern ein %s zur�ck"
+
+#, c-format
+msgid "E1304: Cannot use type with this variable: %s"
+msgstr "E1304: Typ Kann nicht mit dieser Variable verwenden: %s"
+
+msgid ""
+"E1305: Cannot use \"length\", \"end_col\" and \"end_lnum\" with \"text\""
+msgstr ""
+"E1305: Verwendung von \"length\", \"end_col\" und \"end_lnum\" mit \"text\" nicht m�glich"
+
+msgid "E1306: Loop nesting too deep"
+msgstr "E1306: Schleifen-Schachtelung zu tief"
+
+#, c-format
+msgid "E1307: Argument %d: Trying to modify a const %s"
+msgstr "E1307: Argument %d: Versuche eine Konstante zu �ndern %s"
+
+msgid "E1308: Cannot resize a window in another tab page"
+msgstr "E1308: Kann Fenster in anderem Reiter nicht �ndern"
+
+msgid "E1309: Cannot change mappings while listing"
+msgstr "E1309: Mappings k�nnen w�hrend der Auflistung nicht ge�ndert werden"
+
+msgid "E1310: Cannot change menus while listing"
+msgstr "E1310: Men�s k�nnen w�hrend der Auflistung nicht ge�ndert werden"
+
+msgid "E1311: Cannot change user commands while listing"
+msgstr "E1311: Befehle k�nnen w�hrend der Auflistung nicht ge�ndert werden"
+
+msgid "E1312: Not allowed to change the window layout in this autocmd"
+msgstr "E1312: Nicht erlaubt, das Fensterlayout in diesem Autocmd zu �ndern"
+
+#, c-format
+msgid "E1313: Not allowed to add or remove entries (%s)"
+msgstr "E1313: Nicht erlaubt Eintr�ge (%s) hinzuzuf�gen oder zu entfernen"
+
+#, c-format
+msgid "E1314: Class name must start with an uppercase letter: %s"
+msgstr "E1314: Klasse muss mit einen Gro�buchstaben anfangen: %s"
+
+#, c-format
+msgid "E1315: White space required after name: %s"
+msgstr "E1315: Leerzeichen erforderlich nach Name: %s"
+
+msgid "E1316: Class can only be defined in Vim9 script"
+msgstr "E1316: Klasse kann nur in Vim9-Script definiert werden"
+
+#, c-format
+msgid "E1317: Invalid object member declaration: %s"
+msgstr "E1317: Ung�ltige Objekt-Member-Deklaration: %s"
+
+#, c-format
+msgid "E1318: Not a valid command in a class: %s"
+msgstr "E1318: Ung�ltiger Befehl in Klasse: %s"
+
+msgid "E1319: Using a class as a Number"
+msgstr "E1319: Klasse als Zahl verwendet"
+
+msgid "E1320: Using an object as a Number"
+msgstr "E1320: Objekt als Zahl verwendet"
+
+msgid "E1321: Using a class as a Float"
+msgstr "E1321: Klasse als Float verwendet"
+
+msgid "E1322: Using an object as a Float"
+msgstr "E1322: Objekt als Float verwendet"
+
+msgid "E1323: Using a class as a String"
+msgstr "E1323: Klasse als Zeichenkette verwendet"
+
+msgid "E1324: Using an object as a String"
+msgstr "E1324: Objekt als Zeichenkette verwendet"
+
+#, c-format
+msgid "E1325: Method not found on class \"%s\": %s"
+msgstr "E1325: Methode in Klasse nicht gefunden '%s': \"%s\""
+
+#, c-format
+msgid "E1326: Member not found on object \"%s\": %s"
+msgstr "E1326: Klassen-Member in Objekt nicht gefunden: \"%s\": %s"
+
+# TODO: Capitalise first word of message?
+#, c-format
+msgid "E1327: Object required, found %s"
+msgstr "E1327: Objekt ben�tigt, gefunden %s"
+
+#, c-format
+msgid "E1328: Constructor default value must be v:none: %s"
+msgstr "E1328: Der Standardwert des Konstruktors muss v:none sein: %s"
+
+#, c-format
+msgid "E1329: Cannot get object member type from initializer: %s"
+msgstr "E1329: Objekttyp kann nicht vom Initialisierer gefunden werden: %s"
+
+#, c-format
+msgid "E1330: Invalid type for object member: %s"
+msgstr "E1330: Ung�ltiger Typ f�r Objekt-Member: %s"
+
+msgid "E1331: Public must be followed by \"this\" or \"static\""
+msgstr "E1331: Auf \"pubic\" muss \"this\" oder \"static\" folgen"
+
+#, c-format
+msgid "E1332: Public member name cannot start with underscore: %s"
+msgstr "E1332: Public Member darf nicht mit einem Unterstrich beginnen: %s"
+
+#, c-format
+msgid "E1333: Cannot access private member: %s"
+msgstr "E1333: Kann nicht auf private Member zugreifen: %s"
+
+#, c-format
+msgid "E1334: Object member not found: %s"
+msgstr "E1334: Objekt-Member nicht gefunden: %s"
+
+#, c-format
+msgid "E1335: Member is not writable: %s"
+msgstr "E1335: Member ist nicht beschreibbar: %s"
+
+msgid "E1336: Internal error: shortmess too long"
+msgstr "E1336: Interner Fehler: shortmess Option zu lang"
+
+#, c-format
+msgid "E1337: Class member not found: %s"
+msgstr "E1337: Klassenelement nicht gefunden: %s"
+
+#, c-format
+msgid "E1338: Member not found on class \"%s\": %s"
+msgstr "E1338: Member nicht in Klasse gefunden \"%s\": %s"
+
+msgid ""
+"E1339: Cannot add a textprop with text after using a textprop with a "
+"negative id"
+msgstr ""
+"Kann kein Textproperty mit Text hinzuf�gen, nach einenm Textproperty mit einer "
+"negativen ID"
+
+#, c-format
+msgid "E1340: Argument already declared in the class: %s"
+msgstr "E1340: Argument bereits in Klasse deklariert: %s"
+
+#, c-format
+msgid "E1341: Variable already declared in the class: %s"
+msgstr "E1341: Variable bereits in Klasse deklariert: %s"
+
+msgid "E1342: Interface can only be defined in Vim9 script"
+msgstr "E1342: Interface kann nur in Vim9-Script definiert werden"
+
+#, c-format
+msgid "E1343: Interface name must start with an uppercase letter: %s"
+msgstr "E1343: Interface-Name muss mit einem Gro�buchstaben beginnen: %s"
+
+msgid "E1344: Cannot initialize a member in an interface"
+msgstr "E1344: Kann ein Member eines Interfaces nicht initialisieren"
+
+#, c-format
+msgid "E1345: Not a valid command in an interface: %s"
+msgstr "E1345: Kein g�ltiger Befehl in einem Interface: %s"
+
+#, c-format
+msgid "E1346: Interface name not found: %s"
+msgstr "E1346: Interfacename nicht gefunden: %s"
+
+#, c-format
+msgid "E1347: Not a valid interface: %s"
+msgstr "E1347: Kein g�ltiges Interface: %s"
+
+#, c-format
+msgid "E1348: Member \"%s\" of interface \"%s\" not implemented"
+msgstr "E1348: Member \"%s\" des Interfaces \"%s\" nicht implementiert"
+
+#, c-format
+msgid "E1349: Function \"%s\" of interface \"%s\" not implemented"
+msgstr "E1349: Funktion \"%s\" des Interfaces \"%s\" nicht implementiert"
+
+msgid "E1350: Duplicate \"implements\""
+msgstr "E1350: Doppeltes \"implements\""
+
+#, c-format
+msgid "E1351: Duplicate interface after \"implements\": %s"
+msgstr "E1351: Doppeltes Interface nach \"implements\": %s"
+
+msgid "E1352: Duplicate \"extends\""
+msgstr "E1352: Doppeltes \"extends\""
+
+#, c-format
+msgid "E1353: Class name not found: %s"
+msgstr "E1353: Klassenname nicht gefunden: %s"
+
+#, c-format
+msgid "E1354: Cannot extend %s"
+msgstr "E1354: Kann nicht erweitern %s"
+
+#, c-format
+msgid "E1355: Duplicate function: %s"
+msgstr "E1355: Doppelte Funktion: %s"
+
+msgid "E1356: \"super\" must be followed by a dot"
+msgstr "E1356: \"super\" muss von einem Punkt gefolgt werden"
+
+msgid "E1357: Using \"super\" not in a class function"
+msgstr "E1357: Verwendung von \"super\" nicht in einer Klassenfunktion"
+
+msgid "E1358: Using \"super\" not in a child class"
+msgstr "E1358: Verwendung von \"super\" nicht in einer untergeordneten Klasse"
+
+msgid "E1359: Cannot define a \"new\" function in an abstract class"
+msgstr "E1359: In einer abstrakten Klasse kann keine \"new\" Funktion definiert werden"
+
+msgid "E1360: Using a null object"
+msgstr "E1360: Verwenden eines Null-Objekts"
+
+msgid "E1361: Cannot use color \"none\", did you mean \"NONE\"?"
+msgstr "E1361: Kann die Farbe \"none\" nicht verwenden, meinten Sie \"NONE\"?"
+
+msgid "E1362: Cannot use a non-null object"
+msgstr "E1362: Kann kein Nicht-Null-Objekt verwenden"
+
+msgid "E1363: Incomplete type"
+msgstr "E1363: Unvollst�ndiger Typ"
+
+msgid "E1364: Warning: Pointer block corrupted"
+msgstr "E1364: Warnung: Pointer-Block korrupt"
+
 msgid "--No lines in buffer--"
 msgstr "--Keine Zeilen im Buffer--"
 
@@ -8977,6 +9326,9 @@ msgstr "anzuzeigender Text"
 msgid "number of lines to scroll for CTRL-U and CTRL-D"
 msgstr "Anzahl zu scrollender Zeilen f�r CTRL-U und CTRL-D"
 
+msgid "scroll by screen line"
+msgstr "bildschirmzeilenweise scrollen"
+
 msgid "number of screen lines to show around the cursor"
 msgstr "Anzahl anzuzeigender Zeilen um den Cursor herum"
 
@@ -9186,6 +9538,9 @@ msgstr ""
 msgid "a new window is put below the current one"
 msgstr "neues Fenster wird unter dem aktuellen ge�ffnet"
 
+msgid "determines scroll behavior for split windows"
+msgstr "bestimmt das Scrollverhalten f�r geteilte Fenster"
+
 msgid "a new window is put right of the current one"
 msgstr "neues Fenster wird rechts neben dem aktuellen ge�ffnet"
 
@@ -9256,6 +9611,9 @@ msgstr "Abfrage von Terminal-Tastencodes, wenn ein xterm erkannt wird"
 msgid "terminal that requires extra redrawing"
 msgstr "Terminal ben�tigt zus�tzliche Redraws"
 
+msgid "what keyboard protocol to use for which terminal"
+msgstr "welches Tastaturprotokoll f�r welches Terminal zu verwenden ist"
+
 msgid "recognize keys that start with <Esc> in Insert mode"
 msgstr "erkennt Tasten die mit <Esc> in Einf�ge-Modus anfangen"
 
@@ -9430,8 +9788,11 @@ msgstr "f�ge 's' Flag in 'shortmess' hinzu (keine Suchmeldung anzeigen)"
 msgid "list of flags to make messages shorter"
 msgstr "Liste an Flags um Meldungen k�rzer auszugeben"
 
-msgid "show (partial) command keys in the status line"
-msgstr "zeige (partielle) Befehlstasten in der Statuszeile"
+msgid "show (partial) command keys in location given by 'showcmdloc'"
+msgstr "zeige (teilweise) Befehlstasten an dem mit 'showcmdloc' angegebenen Ort"
+
+msgid "location where to show the (partial) command keys for 'showcmd'"
+msgstr "Ort, an dem die (teilweisen) Befehlstasten f�r 'showcmd' angezeigt werden sollen"
 
 msgid "display the current mode in the status line"
 msgstr "zeige aktuellen Modus in der Statuszeile"
@@ -9669,6 +10030,9 @@ msgstr "aktiviere Lisp Modus"
 msgid "words that change how lisp indenting works"
 msgstr "W�rter, die die Funktionsweise des Lisp-Einzugs �ndern"
 
+msgid "options for Lisp indenting"
+msgstr "Optionen f�r Lisp-Einr�cken"
+
 msgid "folding"
 msgstr "Faltung"
 
@@ -9776,6 +10140,9 @@ msgstr "bin�res Dateibearbeiten"
 msgid "last line in the file has an end-of-line"
 msgstr "letzte Zeile einer Datei hat ein Zeilenendezeichen"
 
+msgid "last line in the file followed by CTRL-Z"
+msgstr "letzte Zeile der Datei, gefolgt von CTRL-Z"
+
 msgid "fixes missing end-of-line at end of text file"
 msgstr "behebt ein fehlendes Zeilenendezeichen am Ende einer Textdatei"
 
@@ -10208,3 +10575,6 @@ msgstr "Name der dynamischen MzScheme Bibliothek"
 
 msgid "name of the MzScheme GC dynamic library"
 msgstr "Name der dynamischen MzScheme GC Bibliothek"
+
+msgid "You discovered the command-line window! You can close it with \":q\"."
+msgstr "Sie haben das Befehlszeilenfenster entdeckt! Schlie�en Sie es mit \":q\"."
diff --git a/src/po/fi.po b/src/po/fi.po
index 569591d9f..c2fc86011 100644
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -17,14 +17,15 @@ msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-01-17 00:43+0100\n"
-"PO-Revision-Date: 2022-01-19 16:54+0100\n"
-"Last-Translator: Flammie A Pirinen <flammie@iki.fi>\n"
+"PO-Revision-Date: 2023-05-07 16:29+0300\n"
+"Last-Translator: Juhani Krekelä <juhani@krekelä.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2.2\n"
 
 msgid "ERROR: "
 msgstr "VIRHE: "
@@ -35,7 +36,7 @@ msgid ""
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
 msgstr ""
 "\n"
-"[tavua] yht. alloc-free %lu-%lu, käytössä %lu, käyttöhuippu %lu\n"
+"[tavua] yht. alloc-freed %lu-%lu, käytössä %lu, käyttöhuippu %lu\n"
 
 #, c-format
 msgid ""
@@ -190,7 +191,7 @@ msgstr " MUUNNOSVIRHE"
 
 #, c-format
 msgid " in line %ld;"
-msgstr " rivillä %ld"
+msgstr " rivillä %ld;"
 
 msgid "[NOT converted]"
 msgstr "[EI muunnettu]"
@@ -280,7 +281,7 @@ msgstr "Siirrytään vianetsintätilaan, kirjoita cont jatkaaksesi."
 
 #, c-format
 msgid "Oldval = \"%s\""
-msgstr "vanha-arvo = %s"
+msgstr "Vanha-arvo = %s"
 
 #, c-format
 msgid "Newval = \"%s\""
@@ -403,7 +404,7 @@ msgstr "Bopomofo"
 
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
-"Ei tarpeeksi muistia viitteiden asettamista varten, roskiekeruu peruttiin."
+"Ei tarpeeksi muistia viitteiden asettamista varten, roskienkeruu peruttiin."
 
 msgid ""
 "\n"
@@ -459,7 +460,7 @@ msgstr "> %d, heksana %04x, oktaalina %o, digraafi %s"
 
 #, c-format
 msgid "> %d, Hex %08x, Oct %o, Digr %s"
-msgstr "> %d, hekdana %08x, oktaalina %o, digraafi %s"
+msgstr "> %d, heksana %08x, oktaalina %o, digraafi %s"
 
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
@@ -467,7 +468,7 @@ msgstr "> %d, heksana %04x, oktaalina %o"
 
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, hekdana %08x, oktaalina %o"
+msgstr "> %d, heksana %08x, oktaalina %o"
 
 #, c-format
 msgid "%ld line moved"
@@ -483,11 +484,11 @@ msgid "[No write since last change]\n"
 msgstr "[Viimeisintä muutosta ei ole kirjoitettu]\n"
 
 msgid "Write partial file?"
-msgstr "Kirjoita osittainen tiedosto"
+msgstr "Kirjoita osittainen tiedosto?"
 
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
-msgstr "Ylikirjoitetaanko olemassaoleva tiedosto %s?"
+msgstr "Ylikirjoitetaanko olemassa oleva tiedosto %s?"
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
@@ -519,7 +520,7 @@ msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "korvaa kohteella %s (y/n/a/q/l/^E/^Y)?"
 
 msgid "(Interrupted) "
-msgstr "(Keskeytetty)"
+msgstr "(Keskeytetty) "
 
 #, c-format
 msgid "%ld match on %ld line"
@@ -575,7 +576,7 @@ msgstr "Takaperoinen arvoalue annettu, OK kääntää"
 msgid ""
 "INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
 msgstr ""
-"Sisäinen: Ei voi käyttää EX_DFLALLia yhdessä ADDR_NONEn, ADDR_UNSIGNEDin tai"
+"Sisäinen: Ei voi käyttää EX_DFLALLia yhdessä ADDR_NONEn, ADDR_UNSIGNEDin tai "
 "ADDR_QUICKFIXin kanssa"
 
 #, c-format
@@ -594,14 +595,14 @@ msgid "Already only one tab page"
 msgstr "Vain yksi välilehti jäljellä enää"
 
 msgid "Edit File in new tab page"
-msgstr "Muokkaa uudessa tabissa"
+msgstr "Muokkaa uudessa välilehdessä"
 
 msgid "Edit File in new window"
 msgstr "Muokkaa uudessa ikkunassa"
 
 #, c-format
 msgid "Tab page %d"
-msgstr "Tabisivu %d"
+msgstr "Välilehtisivu %d"
 
 msgid "No swap file"
 msgstr "Ei swap-tiedostoa"
@@ -691,7 +692,7 @@ msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Luetaan vakiosyötteestä...\n"
 
 msgid "Reading from stdin..."
-msgstr "Luetaan vakiosyötteestä"
+msgstr "Luetaan vakiosyötteestä..."
 
 msgid "[fifo]"
 msgstr "[fifo]"
@@ -721,7 +722,7 @@ msgid "[READ ERRORS]"
 msgstr "[LUKUVIRHEITÄ]"
 
 msgid "Can't find temp file for conversion"
-msgstr "Ei voi löytää väliaikaistiedstoa muuntamiseksi"
+msgstr "Ei voi löytää väliaikaistiedostoa muuntamiseksi"
 
 msgid "Conversion with 'charconvert' failed"
 msgstr "Muunnos charconvert epäonnistui"
@@ -761,15 +762,14 @@ msgstr[1] "%lld tavua"
 
 # ei rivinvaihtoja
 msgid "[noeol]"
-msgstr "[eiriviv.]"
+msgstr "[eirivinv.]"
 
 msgid "[Incomplete last line]"
 msgstr "[Vajaa viimeinen rivi]"
 
 #, c-format
 msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
+"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well"
 msgstr ""
 "W12: Varoitus: Tiedostoa %s on muutettu ja Vimin puskurissa on muutoksia "
 "tiedostoon"
@@ -812,7 +812,7 @@ msgid "<empty>"
 msgstr "<tyhjä>"
 
 msgid "writefile() first argument must be a List or a Blob"
-msgstr "writefile()-funktion ensimmäisen argumentin on oltava List tai Blob "
+msgstr "writefile()-funktion ensimmäisen argumentin on oltava List tai Blob"
 
 msgid "Select Directory dialog"
 msgstr "Hakemiston valintaikkuna"
@@ -829,8 +829,8 @@ msgstr "ei täsmäyksiä"
 #, c-format
 msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld rivi taiteltu"
-msgstr[1] "+--%3ld riviä taiteltu"
+msgstr[0] "+--%3ld rivi taiteltu "
+msgstr[1] "+--%3ld riviä taiteltu "
 
 #, c-format
 msgid "+-%s%3ld line: "
@@ -854,7 +854,7 @@ msgid "Vim dialog"
 msgstr "Vim-ikkuna"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Vierityspalkki: Pixmapin geometria ei selviä"
+msgstr "Vierityspalkki: Pixmapin geometria ei selviä."
 
 msgid "No match at cursor, finding next"
 msgstr "Ei täsmäystä kursorin alla, etsitään seuraava"
@@ -1074,7 +1074,7 @@ msgstr "Tulostustyö lähetetty."
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "ohjetiedostoa %s ei löydy"
+msgstr "Ohjetiedostoa %s ei löydy"
 
 msgid "W18: Invalid character in group name"
 msgstr "W18: Virheellinen merkki ryhmän nimessä"
@@ -1243,7 +1243,7 @@ msgid "invalid mark name"
 msgstr "virheellinen merkin nimi"
 
 msgid "mark not set"
-msgstr "merkko ei ole asetettu"
+msgstr "merkki ei ole asetettu"
 
 #, c-format
 msgid "row %d column %d"
@@ -1267,8 +1267,7 @@ msgstr "näppäimistökeskeytys"
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr "ei voi luoda puskuri- tai ikkunakomentoa, olio on poistumassa"
 
-msgid ""
-"cannot register callback command: buffer/window is already being deleted"
+msgid "cannot register callback command: buffer/window is already being deleted"
 msgstr "callbackia ei voi rekisteröidä: puskuri tai ikkuna on poistettu"
 
 msgid "cannot register callback command: buffer/window reference not found"
@@ -1282,7 +1281,7 @@ msgstr "Komentopalvelimen nimen rekisteröinti ei onnistu"
 
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "%ld riviä sisennettävänä..."
+msgstr "%ld riviä sisennettävänä... "
 
 #, c-format
 msgid "%ld line indented "
@@ -1447,13 +1446,13 @@ msgid "This Vim was not compiled with the diff feature."
 msgstr "Tähän Vimiin ei ole käännetty diff-toimintoja mukaan."
 
 msgid "Attempt to open script file again: \""
-msgstr "Yritettiin avata skriptitiedostoa uudestaan:"
+msgstr "Yritettiin avata skriptitiedostoa uudestaan: \""
 
 msgid "Cannot open for reading: \""
-msgstr "Ei voi avata luettavaksi: "
+msgstr "Ei voi avata luettavaksi: \""
 
 msgid "Cannot open for script output: \""
-msgstr "Ei voi avata skriptin tulostetta varten: "
+msgstr "Ei voi avata skriptin tulostetta varten: \""
 
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: Virhe: Gvimin käynnistys NetBeansistä ei onnistu\n"
@@ -1513,8 +1512,7 @@ msgid ""
 "Where case is ignored prepend / to make flag upper case"
 msgstr ""
 "\n"
-"Jos aakkoslaji on ohitettu, lisää alkuun / tehdäksesi asetuksesta "
-"suuraakkosia"
+"Jos aakkoslaji on ohitettu, lisää alkuun / tehdäksesi asetuksesta suuraakkosia"
 
 msgid ""
 "\n"
@@ -1526,13 +1524,13 @@ msgstr ""
 "Argumentit:\n"
 
 msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tvain tiedostonimiä tämän jälkeen"
+msgstr "--\t\t\tVain tiedostonimiä tämän jälkeen"
 
 msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tÄlä käsittele jokerimerkkejä "
+msgstr "--literal\t\tÄlä käsittele jokerimerkkejä"
 
 msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\trekisteröi gvim OLEa varten"
+msgstr "-register\t\tRekisteröi gvim OLEa varten"
 
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tPoista gvim OLE-rekisteristä"
@@ -1547,7 +1545,7 @@ msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi-tila (kuten villä)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx-tila (kute exillä)"
+msgstr "-e\t\t\tEx-tila (kuten exillä)"
 
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\tParanneltu Ex-tila"
@@ -1586,8 +1584,7 @@ msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tEi Vi-yhteensopivuutta: nocompatible"
 
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-"-V[N][tnimi]\t\tMonisanainen tuloste [Taso N] [kirjoita tuloste tnimeen] "
+msgstr "-V[N][tnimi]\t\tMonisanainen tuloste [Taso N] [kirjoita tuloste tnimeen]"
 
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tVianetsintätila"
@@ -1602,7 +1599,7 @@ msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (tiedostonimi)\tPalauta kaatunut sessio"
 
 msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tkuten -r"
+msgstr "-L\t\t\tKuten -r"
 
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\tÄlä käytä newcli:tä ikkunan avaamiseen"
@@ -1611,10 +1608,10 @@ msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <laite>\t\tKäytä <laitetta> IO:hon"
 
 msgid "-A\t\t\tStart in Arabic mode"
-msgstr "-A\t\t\tkäynnistä arabia-tilassa"
+msgstr "-A\t\t\tKäynnistä arabia-tilassa"
 
 msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\tkäynnistä heprea-tilassa"
+msgstr "-H\t\t\tKäynnistä heprea-tilassa"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminaali>\tAseta terminaalin tyypiksi <terminaali>"
@@ -1684,25 +1681,22 @@ msgstr ""
 
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr ""
-"--remote-silent <tiedostoja>\tSama, mutta älä ilmoita puuttuvasta "
-"palvelimesta"
+"--remote-silent <tiedostoja>\tSama, mutta älä ilmoita puuttuvasta palvelimesta"
 
-msgid ""
-"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgid "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr ""
-"--remote-wait <tiedostoja>  kuten --remote, mutta odota tiedostojen "
+"--remote-wait <tiedostoja>  Kuten --remote, mutta odota tiedostojen "
 "muokkaamista"
 
-msgid ""
-"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgid "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr ""
-"--remote-wait-silent <tiedostoja>  sama, mutta älä ilmoita puuttuvasta "
+"--remote-wait-silent <tiedostoja>  Sama, mutta älä ilmoita puuttuvasta "
 "palvelimesta"
 
 msgid ""
 "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
 msgstr ""
-"--remote-tab[-wait][-silent] <tiedostoja>  kuten --remote, mutta avaa "
+"--remote-tab[-wait][-silent] <tiedostoja>  Kuten --remote, mutta avaa "
 "välilehti joka tiedostolle"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
@@ -1726,8 +1720,7 @@ msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tKäytä <viminfo>-tiedostoa .viminfon sijaan"
 
 msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
-msgstr ""
-"--clean\t\t'nocompatible', Vimin oletukset,ei liitännäisiä tai viminfoa"
+msgstr "--clean\t\t'nocompatible', Vimin oletukset,ei liitännäisiä tai viminfoa"
 
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h tai --help\tTulosta ohje (tämä viesti) ja lopeta"
@@ -1778,21 +1771,19 @@ msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <fontti>\tKäytä <fonttia> kursivoidussa tekstissä"
 
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr ""
-"-geometry <geom>\tKäytä mittoja <geom> ikkunan asetteluun (myös: -geom)"
+msgstr "-geometry <geom>\tKäytä mittoja <geom> ikkunan asetteluun (myös: -geom)"
 
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidt <leveys>\tKäytä <leveyttä> reunuksissa (myös: -bw) "
+msgstr "-borderwidt <leveys>\tKäytä <leveyttä> reunuksissa (myös: -bw)"
 
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-msgstr ""
-"-scrollbarwidth <leveys>  Käytä <leveyttä> vierityspalkissa (myös: -sw)"
+msgstr "-scrollbarwidth <leveys>  Käytä <leveyttä> vierityspalkissa (myös: -sw)"
 
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <korkeus>\tKäytä <korkeutta> valikossa (myös: -mh)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
-msgstr "-reverse\t\tKäytä käänteisvärejä (myös: -rv) "
+msgstr "-reverse\t\tKäytä käänteisvärejä (myös: -rv)"
 
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\tÄlä käytä käänteisvärejä (myös: +rv)"
@@ -1816,7 +1807,7 @@ msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <rooli>\tAseta pääikkunalle ainutlaatuinen rooli tunnisteeksi"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tAvaa Vim annettuun GTK-olioon "
+msgstr "--socketid <xid>\tAvaa Vim annettuun GTK-olioon"
 
 msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
 msgstr "--echo-wid\t\tTulosta gvimin Window ID vakiotulosteeseen"
@@ -1825,7 +1816,7 @@ msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <otsikko>\tAvaa Vim isäntäohjelman sisään"
 
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-msgstr "--windowid <HWND>\tAvaa Vim annettuun win32-olioon "
+msgstr "--windowid <HWND>\tAvaa Vim annettuun win32-olioon"
 
 msgid "No abbreviation found"
 msgstr "Lyhennettä ei löydy"
@@ -1930,7 +1921,7 @@ msgid ""
 "to use the same key for text file and swap file"
 msgstr ""
 "\n"
-"käyttääksesi samaa avainta teksti- ja swäppitiedostoille"
+"käyttääksesi samaa avainta teksti- ja swap-tiedostoille"
 
 msgid "???MANY LINES MISSING"
 msgstr "???PALJON RIVEJÄ PUUTTUU"
@@ -1957,7 +1948,7 @@ msgid "???END"
 msgstr "???LOPPU"
 
 msgid "See \":help E312\" for more information."
-msgstr ":help E312 kertoo lisätietoja"
+msgstr ":help E312 kertoo lisätietoja."
 
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Palautus onnistui. Tarkista, että kaikki on kunnossa."
@@ -1990,7 +1981,7 @@ msgstr ""
 "Huom: prosessi on vielä käynnissä: "
 
 msgid "Using crypt key from swap file for the text file.\n"
-msgstr "Käytetään swäpin salausavainta tekstitiedostolle\n"
+msgstr "Käytetään swap-tiedoston salausavainta tekstitiedostolle\n"
 
 msgid "Swap files found:"
 msgstr "Swap-tiedostoja löytyi:"
@@ -2014,7 +2005,7 @@ msgid "   dated: "
 msgstr "  ajalta: "
 
 msgid "             dated: "
-msgstr "            ajalta:"
+msgstr "            ajalta: "
 
 msgid "         [from Vim version 3.0]"
 msgstr "         [Vimin 3.0-versiosta]"
@@ -2108,7 +2099,7 @@ msgstr ""
 "Swap-tiedosto löytyi: \""
 
 msgid "While opening file \""
-msgstr "Avattaessa tiedostoa "
+msgstr "Avattaessa tiedostoa \""
 
 msgid "      CANNOT BE FOUND"
 msgstr "      EI LÖYTYNYT"
@@ -2141,7 +2132,7 @@ msgstr ""
 "    palauttaaksesi muutokset (lisätietoja: \":help recovery\").\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    Jos teit jo näin, poista swap-tiedosto "
+msgstr "    Jos teit jo näin, poista swap-tiedosto \""
 
 msgid ""
 "\"\n"
@@ -2154,16 +2145,16 @@ msgid "Found a swap file that is not useful, deleting it"
 msgstr "Swap-tiedosto löytyi mutta on käyttökelvoton joten se poistetaan"
 
 msgid "Swap file \""
-msgstr "Swap-tiedosto "
+msgstr "Swap-tiedosto \""
 
 msgid "\" already exists!"
-msgstr " on jo olemassa"
+msgstr "\" on jo olemassa!"
 
 msgid "VIM - ATTENTION"
 msgstr "VIM - HUOMAUTUS"
 
 msgid "Swap file already exists!"
-msgstr "Swap-tiedosto on jo olemassa"
+msgstr "Swap-tiedosto on jo olemassa."
 
 msgid ""
 "&Open Read-Only\n"
@@ -2222,7 +2213,7 @@ msgid "Interrupt: "
 msgstr "Keskeytys: "
 
 msgid "Press ENTER or type command to continue"
-msgstr "Paina enteriä tai kirjoita komento aloittaaksesi "
+msgstr "Paina enteriä tai kirjoita komento aloittaaksesi"
 
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -2310,7 +2301,7 @@ msgstr[0] "%ld rivi %s %d kertaa"
 msgstr[1] "%ld riviä %s %d kertaa"
 
 msgid "cannot yank; delete anyway"
-msgstr "Ei voi kopioida; poista joka tapauksessa"
+msgstr "ei voi kopioida; poista joka tapauksessa"
 
 #, c-format
 msgid "%ld line changed"
@@ -2345,8 +2336,8 @@ msgstr "Sarake %s/%s, Rivi %ld/%ld, sana %lld/%lld, tavu %lld/%lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
-"%lld of %lld"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte %lld "
+"of %lld"
 msgstr ""
 "Sarake %s/%s, rivi %ld/%ld, sana %lld/%lld, merkki %lld/%lld, tavu %lld/%lld"
 
@@ -2356,7 +2347,7 @@ msgid "(+%lld for BOM)"
 msgstr "(+%lld BOMista)"
 
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabialle pitää olla UTF-8:aa, aseta :set encoding=utf-8"
+msgstr "W17: Arabia vaatii UTF-8:n, aseta :set encoding=utf-8"
 
 msgid ""
 "\n"
@@ -2488,7 +2479,7 @@ msgstr "Ei voitu asettaa turvallisuuskontekstia %s kohteelle %s"
 # mikä security context?
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "Ei saatu turvallisuuskontekstia %s kohteelle %s ja se poistetaan"
+msgstr "Ei saatu turvallisuuskontekstia %s kohteelle %s ja se poistetaan."
 
 msgid ""
 "\n"
@@ -2578,7 +2569,7 @@ msgid ""
 msgstr ""
 "VIMRUN.EXEä ei löydy muuttujasta $PATH.\n"
 "Ulkoiset komennot eivät pysähdy suorituksen lopussa.\n"
-"Lisätietoja komennolla  :help win32-vimrun"
+"Lisätietoja komennolla  :help win32-vimrun."
 
 msgid "Vim Warning"
 msgstr "Vim-varoitus"
@@ -2596,7 +2587,7 @@ msgstr " (rivi poistettu)"
 
 #, c-format
 msgid "%serror list %d of %d; %d errors "
-msgstr "%svirhelista %d/%d, %d virhettä"
+msgstr "%svirhelista %d/%d, %d virhettä "
 
 msgid "No entries"
 msgstr "Ei kenttiä"
@@ -2879,16 +2870,14 @@ msgstr "FLAG kohteessa %s lippujen jälkeen rivillä %d: %s"
 
 #, c-format
 msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"
 msgstr ""
 "COMPOUNDFORBIDFLAG PFX:n jälkeen voi antaa vääriä tuloksia kohteessa %s "
 "rivillä %d"
 
 #, c-format
 msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"
 msgstr ""
 "COMPOUNDPERMITFLAG PFX:n jälkeen voi antaa vääriä tuloksia kohteessa %s "
 "rivillä %d"
@@ -2992,7 +2981,7 @@ msgstr "%s-arvo eroaa toisessa .aff-tiedostossa olevasta"
 
 #, c-format
 msgid "Reading dictionary file %s..."
-msgstr "Luetaan sanakirjatiedostoa %s"
+msgstr "Luetaan sanakirjatiedostoa %s..."
 
 #, c-format
 msgid "line %6d, word %6ld - %s"
@@ -3102,11 +3091,11 @@ msgid "Word '%.*s' added to %s"
 msgstr "Sana %.*s lisätty kohteeseen %s"
 
 msgid "Sorry, no suggestions"
-msgstr "ei ehdotuksia"
+msgstr "Ei ehdotuksia"
 
 #, c-format
 msgid "Sorry, only %ld suggestions"
-msgstr "vain %ld ehdotusta"
+msgstr "Vain %ld ehdotusta"
 
 #, c-format
 msgid "Change \"%.*s\" to:"
@@ -3129,7 +3118,7 @@ msgid "syntax conceal off"
 msgstr "syntaksin piilotus pois"
 
 msgid "syntax case ignore"
-msgstr "syntaksin merkkitason ohitus "
+msgstr "syntaksin merkkitason ohitus"
 
 msgid "syntax case match"
 msgstr "syntaksin merkkitason täsmäys"
@@ -3198,7 +3187,7 @@ msgid "minimal "
 msgstr "vähintään "
 
 msgid "maximal "
-msgstr "enitntään "
+msgstr "enintään "
 
 msgid "; match "
 msgstr "; täsmää "
@@ -3223,7 +3212,7 @@ msgid " or more"
 msgstr " tai useammasta"
 
 msgid "  Using tag with different case!"
-msgstr "  Tägissä eri kirjaintaso"
+msgstr "  Tägissä eri kirjaintaso."
 
 msgid "  # pri kind tag"
 msgstr "  # arvo tyyppi tägi"
@@ -3236,7 +3225,7 @@ msgid ""
 "  # TO tag         FROM line  in file/text"
 msgstr ""
 "\n"
-"  # TILL tagg          FRÅN LINJE  i fil/text"
+"  # TILL tagg          FRÅN linje  i fil/text"
 
 #, c-format
 msgid "Searching tags file %s"
@@ -3254,10 +3243,10 @@ msgid "Duplicate field name: %s"
 msgstr "Kaksoiskappale kentän nimestä: %s"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr " ei tunnettu. Tuetut terminaalit:"
+msgstr "' ei tunnettu. Tuetut terminaalit:"
 
 msgid "defaulting to '"
-msgstr "oletusarvona "
+msgstr "oletusarvona '"
 
 msgid ""
 "\n"
@@ -3268,7 +3257,7 @@ msgstr ""
 
 #, c-format
 msgid "Kill job in \"%s\"?"
-msgstr "Tapetaanko komento kohteessa %s"
+msgstr "Tapetaanko komento kohteessa %s?"
 
 msgid "Terminal"
 msgstr "Terminaali"
@@ -3314,7 +3303,7 @@ msgstr "Ei voitu lukea kumoustiedostoa mistään undodir-muuttujan hakemistosta"
 
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "Ei ylikirjoitetat kumoustiedostolla, koska ei voida lukea: %s"
+msgstr "Ei ylikirjoiteta kumoustiedostolla, koska ei voida lukea: %s"
 
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
@@ -3336,12 +3325,11 @@ msgid "Reading undo file: %s"
 msgstr "Luetaan kumoustiedostoa: %s"
 
 msgid "File contents changed, cannot use undo info"
-msgstr ""
-"Tiedoston sisältö on muuttunut, joen kumoustiedot ovat käyttökelvottomia"
+msgstr "Tiedoston sisältö on muuttunut, joen kumoustiedot ovat käyttökelvottomia"
 
 #, c-format
 msgid "Finished reading undo file %s"
-msgstr "Ladattu kumoustiedoto %s"
+msgstr "Ladattu kumoustiedosto %s"
 
 msgid "Already at oldest change"
 msgstr "Vanhimmassa muutoksessa"
@@ -3475,7 +3463,7 @@ msgid ""
 "macOS version w/o darwin feat."
 msgstr ""
 "\n"
-"macOS-versio ilman darwinia"
+"macOS-versio ilman darwinia."
 
 msgid ""
 "\n"
@@ -3625,7 +3613,7 @@ msgid "Compilation: "
 msgstr "Käännös: "
 
 msgid "Compiler: "
-msgstr "Käännin: "
+msgstr "Kääntäjä: "
 
 msgid "Linking: "
 msgstr "Linkitys: "
@@ -3646,7 +3634,7 @@ msgid "Vim is open source and freely distributable"
 msgstr "Vim on avointa lähdekoodia ja vapaasti jaossa"
 
 msgid "Help poor children in Uganda!"
-msgstr "Auta Ugandan köyhiä lapsia"
+msgstr "Auta Ugandan köyhiä lapsia."
 
 msgid "type  :help iccf<Enter>       for information "
 msgstr "kirjoita :help iccf<Enter>    lisätietoa varten            "
@@ -3655,16 +3643,16 @@ msgid "type  :q<Enter>               to exit         "
 msgstr "kirjoita :q<Enter>            lopettaaksesi                "
 
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "kirjoita :help<Enter> tai <F1> ohjetta varten              "
+msgstr "kirjoita :help<Enter> tai <F1> ohjetta varten"
 
 msgid "type  :help version9<Enter>   for version info"
-msgstr "kirjoita :help version9<Enter> versiotietoja varten        "
+msgstr "kirjoita :help version9<Enter> versiotietoja varten"
 
 msgid "Running in Vi compatible mode"
 msgstr "Suoritetaan Vi-yhteensopivuustilaa"
 
 msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "kirjoita :set nocp<Enter>      Vimin oletuksiin            "
+msgstr "kirjoita :set nocp<Enter>      Vimin oletuksiin"
 
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "kirjoita :help cp-default<Enter> ohjetta oletuksista varten"
@@ -3676,7 +3664,7 @@ msgid "Running modeless, typed text is inserted"
 msgstr "Suoritetaan tilattomana, kirjoitettu teksti syötetään"
 
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda syötetilaa"
+msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda syötetilaa  "
 
 msgid "                              for two modes      "
 msgstr "                              kahta tilaa varten "
@@ -3685,22 +3673,22 @@ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda Vi-yhteensopivuutta"
 
 msgid "                              for Vim defaults   "
-msgstr "                              Vim-oletuksia varten"
+msgstr "                              Vim-oletuksia varten   "
 
 msgid "Sponsor Vim development!"
-msgstr "Tue Vimin kehitystä"
+msgstr "Tue Vimin kehitystä."
 
 msgid "Become a registered Vim user!"
 msgstr "Rekisteröidy Vim-käyttäjäksi."
 
 msgid "type  :help sponsor<Enter>    for information "
-msgstr "kirjoita :help sponsor<Enter>  lisätietoja varten"
+msgstr "kirjoita :help sponsor<Enter>  lisätietoja varten "
 
 msgid "type  :help register<Enter>   for information "
-msgstr "kirjoita :help register<Enter> lisätietoja varten"
+msgstr "kirjoita :help register<Enter> lisätietoja varten "
 
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "valikko Ohje->Sponsoroi/Rekisteröi lisätietoja varten"
+msgstr "valikko Ohje->Sponsoroi/Rekisteröi lisätietoja varten    "
 
 msgid "global"
 msgstr "globaali"
@@ -3857,7 +3845,7 @@ msgid "E370: Could not load library %s"
 msgstr "E370: Kirjaston %s lataaminen ei onnistu"
 
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr "komento ei toimi, Perl kirjastoa ei voinut ladata."
+msgstr "Komento ei toimi, Perl kirjastoa ei voinut ladata."
 
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr "E299: Perl-suoritus kielletty hiekkalaatikossa ilman Safe-moduulia"
@@ -3875,16 +3863,16 @@ msgid "Edit with &Vim"
 msgstr "Muokkaa &Vimillä"
 
 msgid "Edit with existing Vim"
-msgstr "Muokkaa olemassaolevalla Vimillä"
+msgstr "Muokkaa olemassa olevalla Vimillä"
 
 msgid "Edit with existing Vim - "
-msgstr "Muokkaa olemassaolevalla Vimillä - "
+msgstr "Muokkaa olemassa olevalla Vimillä - "
 
 msgid "Edits the selected file(s) with Vim"
 msgstr "Muokkaa valittuja tiedostoja Vimillä"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "Virhe prosessin käynnistämisessä, varmista että gvim on polulla"
+msgstr "Virhe prosessin käynnistämisessä: Varmista että gvim on polulla."
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll-virhe"
@@ -3900,8 +3888,7 @@ msgstr "E11: Virheellinen komentorivi-ikkuna, <CR> suorittaa, Ctrl C lopettaa"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
-"E12: Komentoa ei tueta exrc:ssä tai vimrc:ssä tässä hakemistossa tai "
-"tägihaussa"
+"E12: Komentoa ei tueta exrc:ssä tai vimrc:ssä tässä hakemistossa tai tägihaussa"
 
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Tiedosto on jo olemassa (lisää ! ohittaaksesi)"
@@ -3936,7 +3923,7 @@ msgid "E22: Scripts nested too deep"
 msgstr "E22: Liian monta tasoa skripteissä"
 
 msgid "E23: No alternate file"
-msgstr "E23: Eo vaihtoehtoista tiedostoa"
+msgstr "E23: Ei vaihtoehtoista tiedostoa"
 
 msgid "E24: No such abbreviation"
 msgstr "E24: Lyhennettä ei ole"
@@ -3996,7 +3983,7 @@ msgid "E40: Can't open errorfile %s"
 msgstr "E40: virhetiedostoa %s ei voi avata"
 
 msgid "E41: Out of memory!"
-msgstr "E41: Muisti loppui"
+msgstr "E41: Muisti loppui."
 
 # ;-)
 msgid "E42: No Errors"
@@ -4050,9 +4037,8 @@ msgid "E55: Unmatched %s)"
 msgstr "E55: Pariton %s)"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E59: Invalid character after %s@"
-msgstr "E59: virheellinen merkki kohdan %s@ jälkeen"
+msgstr "E59: Virheellinen merkki kohdan %s@ jälkeen"
 
 #, c-format
 msgid "E60: Too many complex %s{...}s"
@@ -4066,9 +4052,8 @@ msgstr "E61: Sisäkkäistetty %s*"
 msgid "E62: Nested %s%c"
 msgstr "E62: Sisäkkäistetty %s%c"
 
-# TODO: Capitalise first word of message?
 msgid "E63: Invalid use of \\_"
-msgstr "E63: väärinkäytetty \\_"
+msgstr "E63: Väärinkäytetty \\_"
 
 #, c-format
 msgid "E64: %s%c follows nothing"
@@ -4101,9 +4086,8 @@ msgstr "E71: Virheellinen merkki merkinnän %s%% jäljessä"
 msgid "E72: Close error on swap file"
 msgstr "E72: Swap-tiedoston sulkemisvirhe"
 
-# TODO: Capitalise first word of message?
 msgid "E73: Tag stack empty"
-msgstr "E73: tägipino tyhjä"
+msgstr "E73: Tägipino tyhjä"
 
 msgid "E74: Command too complex"
 msgstr "E74: Liian monimutkainen komento"
@@ -4154,8 +4138,7 @@ msgstr "E88: Ensimmäisen puskurin ohi ei voi edetä"
 #, c-format
 msgid "E89: No write since last change for buffer %d (add ! to override)"
 msgstr ""
-"E89: Puskurin %d muutoksia ei ole tallennettu (lisää komentoon ! "
-"ohittaaksesi)"
+"E89: Puskurin %d muutoksia ei ole tallennettu (lisää komentoon ! ohittaaksesi)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Ei voi vapauttaa viimeistä puskuria"
@@ -4327,7 +4310,7 @@ msgstr "E137: Viminfo-tiedostoon ei voitu kirjoittaa: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Viminfo-tiedoston kirjoittaminen ei onnistu %s"
+msgstr "E138: Viminfo-tiedoston kirjoittaminen ei onnistu %s."
 
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Tiedosto on ladattu toiseen puskuriin"
@@ -4347,7 +4330,6 @@ msgstr ""
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Autocommand poisti uuden puskurin odotuksen vastaisesti %s"
 
-# TODO: Capitalise first word of message?
 msgid "E144: Non-numeric argument to :z"
 msgstr "E144: :z:n argumentti ei ole numero"
 
@@ -4475,7 +4457,6 @@ msgid "E178: Invalid default value for count"
 msgstr "E178: Lukumäärän oletusarvo on väärä"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E179: Argument required for %s"
 msgstr "E179: %s vaatii argumentin"
 
@@ -4549,8 +4530,7 @@ msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiivinen ikkuna tai puskuri poistettu"
 
 msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr ""
-"E200: *ReadPre-autocommand-komennot tekivät tiedostosta lukukelvottoman"
+msgstr "E200: *ReadPre-autocommand-komennot tekivät tiedostosta lukukelvottoman"
 
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre-autocommand-komennot eivät saa muuttaa puskuria"
@@ -4569,9 +4549,8 @@ msgstr "E204: Autocommand-komento muutti rivien määrä odottamatta"
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patch-tilassa ei voi tallentaa alkuperäistiedostoa"
 
-# TODO: Capitalise first word of message?
 msgid "E206: Patchmode: can't touch empty original file"
-msgstr "E206: patch-tilassa ei voi muuttaa tyhjää alkuperäistiedostoa"
+msgstr "E206: Patch-tilassa ei voi muuttaa tyhjää alkuperäistiedostoa"
 
 msgid "E207: Can't delete backup file"
 msgstr "E207: Ei voi poistaa varmuuskopiota"
@@ -4596,8 +4575,7 @@ msgid "E212: Can't open file for writing"
 msgstr "E212: Tiedoston avaus kirjoittamista varten ei onnistu"
 
 msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr ""
-"E213: Muunnos ei onnistu (lisää komentoon ! kirjoittaaksesi muuntamatta)"
+msgstr "E213: Muunnos ei onnistu (lisää komentoon ! kirjoittaaksesi muuntamatta)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Ei voi löytää väliaikaistiedostoa kirjoitettavaksi"
@@ -4617,9 +4595,8 @@ msgstr "E216: Ryhmää tai eventtiä ei ole: %s"
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Ei voi suorittaa autocommandsia kaikille eventeille"
 
-# TODO: Capitalise first word of message?
 msgid "E218: Autocommand nesting too deep"
-msgstr "E218: liian monta tasoa autocommandissa"
+msgstr "E218: Liian monta tasoa autocommandissa"
 
 msgid "E219: Missing {."
 msgstr "E219: { puuttuu."
@@ -4633,29 +4610,24 @@ msgstr "E221: Merkintä ei voi alkaa pienaakkosella"
 msgid "E222: Add to internal buffer that was already read from"
 msgstr "E222: Lisäys sisäiseen puskuriin josta on jo luettu"
 
-# TODO: Capitalise first word of message?
 msgid "E223: Recursive mapping"
-msgstr "E223: rekursiivinen kuvaus"
+msgstr "E223: Rekursiivinen kuvaus"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E224: Global abbreviation already exists for %s"
-msgstr "E224: globaali lyhenne merkinnälle %s on jo olemassa"
+msgstr "E224: Globaali lyhenne merkinnälle %s on jo olemassa"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E225: Global mapping already exists for %s"
-msgstr "E225: globaali kuvaus merkinnälle %s on jo olemassa"
+msgstr "E225: Globaali kuvaus merkinnälle %s on jo olemassa"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E226: Abbreviation already exists for %s"
-msgstr "E226: lyhenne on jo olemassa %s"
+msgstr "E226: Lyhenne on jo olemassa %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E227: Mapping already exists for %s"
-msgstr "E227: kuvaus on jo olemassa %s"
+msgstr "E227: Kuvaus on jo olemassa %s"
 
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Virheellinen tila"
@@ -4673,9 +4645,8 @@ msgstr "E231: guifontwide virheellinen"
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Ei voi luoda BalloonEvalia viestille ja callbackille"
 
-# TODO: Capitalise first word of message?
 msgid "E233: Cannot open display"
-msgstr "E233: näyttöä ei voi avata"
+msgstr "E233: Näyttöä ei voi avata"
 
 #, c-format
 msgid "E234: Unknown fontset: %s"
@@ -4713,7 +4684,7 @@ msgstr "E242: Ei voida halkaista ikkunaa kun toista suljetaan"
 # OLE on object linking and embedding på windowska
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: Argumenttia ei tueta: -%s, käytä OLE-versiota"
+msgstr "E243: Argumenttia ei tueta: -%s, käytä OLE-versiota."
 
 #, c-format
 msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
@@ -4727,23 +4698,21 @@ msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: FileChangedShell-autocommand poisti puskurin"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E247: No registered server named \"%s\""
-msgstr "E247: palvelinta %s ei ole rekisteröitynä"
+msgstr "E247: Palvelinta %s ei ole rekisteröitynä"
 
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: Komennon lähetys kohdeohjelmalle ei onnistu"
 
-# TODO: Capitalise first word of message?
 msgid "E249: Window layout changed unexpectedly"
-msgstr "E249: ikkunan asettelu vaihtui odottamatta"
+msgstr "E249: Ikkunan asettelu vaihtui odottamatta"
 
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: Seuraavien merkistöjoukkojen fontit puuttuvat fontsetistä %s:"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIMin instanssin rekisteriarvo on virheellinen, poistettiin."
+msgstr "E251: VIMin instanssin rekisteriarvo on virheellinen.  Poistettiin."
 
 #, c-format
 msgid "E252: Fontset name: %s - Font '%s' is not fixed-width"
@@ -4760,74 +4729,62 @@ msgstr "E254: Väriä %s ei voi määritellä"
 msgid "E255: Couldn't read in sign data"
 msgstr "E255: Merkkidatan luku ei onnistu"
 
-# TODO: Capitalise first word of message?
 msgid "E257: cstag: Tag not found"
-msgstr "E257: cstag: tägia ei löydy"
+msgstr "E257: cstag: Tägia ei löydy"
 
 msgid "E258: Unable to send to client"
 msgstr "E258: Asiakkaalle lähetys ei onnistunut"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E259: No matches found for cscope query %s of %s"
-msgstr "E259: ei täsmäyksiä cscope-hakuun %s/%s"
+msgstr "E259: Ei täsmäyksiä cscope-hakuun %s/%s"
 
 msgid "E260: Missing name after ->"
 msgstr "E260: Nimi puuttuu perästä ->"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E261: Cscope connection %s not found"
-msgstr "E261: cscope-yhteys %s puuttuu"
+msgstr "E261: Cscope-yhteys %s puuttuu"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E262: Error reading cscope connection %d"
-msgstr "E262: virhe luettaessa cscope-yhteyttä %d"
+msgstr "E262: Virhe luettaessa cscope-yhteyttä %d"
 
 msgid ""
-"E263: Sorry, this command is disabled, the Python library could not be "
-"loaded."
-msgstr "E263: komento ei toimi, Python-kirjaston lataaminen ei onnistunut."
+"E263: Sorry, this command is disabled, the Python library could not be loaded."
+msgstr "E263: Komento ei toimi, Python-kirjaston lataaminen ei onnistunut."
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: Virhe IO-olioiden alustuksessa"
 
 msgid "E265: $_ must be an instance of String"
-msgstr "E265: muuttujan $_ pitää olla Stringin instanssi"
+msgstr "E265: Muuttujan $_ pitää olla Stringin instanssi"
 
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: komento ei toimi, Ruby-kirjastoa ei voitu ladata."
+msgstr "E266: Komento ei toimi, Ruby-kirjastoa ei voitu ladata."
 
-# TODO: Capitalise first word of message?
 msgid "E267: Unexpected return"
-msgstr "E267: odotuksenvastainen return"
+msgstr "E267: Odotuksenvastainen return"
 
-# TODO: Capitalise first word of message?
 msgid "E268: Unexpected next"
 msgstr "E268: Odotuksenvastainen next"
 
-# TODO: Capitalise first word of message?
 msgid "E269: Unexpected break"
 msgstr "E269: Odotuksenvastainen break"
 
-# TODO: Capitalise first word of message?
 msgid "E270: Unexpected redo"
-msgstr "E270: odotuksenvastainen redo"
+msgstr "E270: Odotuksenvastainen redo"
 
-# TODO: Capitalise first word of message?
 msgid "E271: Retry outside of rescue clause"
-msgstr "E271: retry rescuen ulkopuolella"
+msgstr "E271: Retry rescuen ulkopuolella"
 
-# TODO: Capitalise first word of message?
 msgid "E272: Unhandled exception"
-msgstr "E272: käsittelemätön poikkeus"
+msgstr "E272: Käsittelemätön poikkeus"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E273: Unknown longjmp status %d"
-msgstr "E273: tuntematon longjmp-tila %d"
+msgstr "E273: Tuntematon longjmp-tila %d"
 
 msgid "E274: No white space allowed before parenthesis"
 msgstr "E274: Tyhjeet ei sallittu sulkeissa"
@@ -4846,11 +4803,10 @@ msgid "E279: Sorry, ++shell is not supported on this system"
 msgstr "E279: ++shell ei toimi tällä järjestelmällä"
 
 msgid ""
-"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
-"org"
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim.org"
 msgstr ""
-"E280: kriittinen TCL-virhe: reflist hajalla? Ilmoita asiasta "
-"postituslistalle vim-dev@vim.org"
+"E280: Kriittinen TCL-virhe: reflist hajalla? Ilmoita asiasta postituslistalle "
+"vim-dev@vim.org"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
@@ -4870,16 +4826,13 @@ msgid "E286: Failed to open input method"
 msgstr "E286: Syötemetodin avaus ei onnistu"
 
 msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr ""
-"E287: Varoitus: Ei voitu asettaa destroy-kutsua syötemetodipalvelimelle"
+msgstr "E287: Varoitus: Ei voitu asettaa destroy-kutsua syötemetodipalvelimelle"
 
-# TODO: Capitalise first word of message?
 msgid "E288: Input method doesn't support any style"
-msgstr "E288: syötemetodi ei tue tyylejä"
+msgstr "E288: Syötemetodi ei tue tyylejä"
 
-# TODO: Capitalise first word of message?
 msgid "E289: Input method doesn't support my preedit type"
-msgstr "E289: syötemetodi ei tue tätä preedit-tyyppiä"
+msgstr "E289: Syötemetodi ei tue tätä preedit-tyyppiä"
 
 msgid "E290: List or number required"
 msgstr "E290: Lista tai luku tarvitaan"
@@ -4888,9 +4841,8 @@ msgstr "E290: Lista tai luku tarvitaan"
 msgid "E292: Invalid count for del_bytes(): %ld"
 msgstr "E292: Virheellinen lukumäärä funktiolle del_bytes(): %ld"
 
-# TODO: Capitalise first word of message?
 msgid "E293: Block was not locked"
-msgstr "E293: lohkoa ei ole lukittu"
+msgstr "E293: Lohkoa ei ole lukittu"
 
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Hakuvirhe swap-tiedostoa luettaessa"
@@ -4920,7 +4872,7 @@ msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Hups, swap-tiedosto hävisi!"
 
 msgid "E302: Could not rename swap file"
-msgstr "E302: Swap-tiedoston uudellennimeys ei onnistu"
+msgstr "E302: Swap-tiedoston uudellennimeäminen ei onnistu"
 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
@@ -4955,8 +4907,7 @@ msgstr "E310: Lohon 1 tunniste väärä (%s ei ole .swp-tiedosto?)"
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Palautus keskeytetty"
 
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
+msgid "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr "E312: Palautuksessa oli virheitä, etsi rivejä, jotka alkavat ???"
 
 msgid "E313: Cannot preserve, there is no swap file"
@@ -4966,33 +4917,27 @@ msgid "E314: Preserve failed"
 msgstr "E314: Säilyttäminen epäonnistui"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E315: ml_get: Invalid lnum: %ld"
-msgstr "E315: ml_get: virheellinen lnum: %ld"
+msgstr "E315: ml_get: Virheellinen lnum: %ld"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-msgstr "E316: ml_get: riviä %ld ei löydy puskurist %d %s"
+msgstr "E316: ml_get: Riviä %ld ei löydy puskurista %d %s"
 
-# TODO: Capitalise first word of message?
 msgid "E317: Pointer block id wrong"
-msgstr "E317: osoitinlohkon tunnus väärä"
+msgstr "E317: Osoitinlohkon tunnus väärä"
 
-# TODO: Capitalise first word of message?
 msgid "E317: Pointer block id wrong 2"
-msgstr "E317: osoitinlohon tunnus väärä 2"
+msgstr "E317: Osoitinlohon tunnus väärä 2"
 
-# TODO: Capitalise first word of message?
 msgid "E317: Pointer block id wrong 3"
-msgstr "E317: osoitinlohkon tunnus väärä 3"
+msgstr "E317: Osoitinlohkon tunnus väärä 3"
 
-# TODO: Capitalise first word of message?
 msgid "E317: Pointer block id wrong 4"
-msgstr "E317: osoitinlohkon tunnus väärä 4"
+msgstr "E317: Osoitinlohkon tunnus väärä 4"
 
 msgid "E318: Updated too many blocks?"
-msgstr "E318: Päivitetty liikaa lohkoja"
+msgstr "E318: Päivitetty liikaa lohkoja?"
 
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Komento ei ole käytettävissä tässä versiossa"
@@ -5003,17 +4948,15 @@ msgstr "E320: Riviä %ld ei löydy"
 
 #, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: Ei voitu uudelleenavata %s"
+msgstr "E321: Ei voitu avata uudelleen %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E322: Line number out of range: %ld past the end"
-msgstr "E322: rivinumero arvoalueen ulkopuoleta: %ld on loppua suurempi"
+msgstr "E322: Rivinumero arvoalueen ulkopuolelta: %ld on loppua suurempi"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E323: Line count wrong in block %ld"
-msgstr "E323: rivimäärä väärin lohkossa %ld"
+msgstr "E323: Rivimäärä väärin lohkossa %ld"
 
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript-tulostetiedoston avaus ei onnistu"
@@ -5061,7 +5004,7 @@ msgid "E337: Menu not found - check menu names"
 msgstr "E337: Valikkoa ei löytynyt - tarkista valikkojen nimet"
 
 msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: tiedostonselain puuttuu konsolitilasta"
+msgstr "E338: Tiedostonselain puuttuu konsolitilasta"
 
 msgid "E339: Pattern too long"
 msgstr "E339: Liian pitkä kuvio"
@@ -5071,12 +5014,12 @@ msgstr "E341: Sisäinen virhe: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
-msgstr "E342: Muisti loppui! (varattaessa %lu tavua)"
+msgstr "E342: Muisti loppui. (varattaessa %lu tavua)"
 
 #, c-format
 msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
+"E343: Invalid path: '**[number]' must be at the end of the path or be followed "
+"by '%s'."
 msgstr ""
 "E343: Virheellinen polku: '**[numero]' kuuluu polun loppuun tai ennen kohtaa "
 "%s."
@@ -5133,7 +5076,7 @@ msgstr "E357: langmap: Merkkiin %s täsmäävä merkki puuttuu"
 
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: langmap: ylimääräisiä merkkejä puolipisteen jälkeen: %s"
+msgstr "E358: langmap: Ylimääräisiä merkkejä puolipisteen jälkeen: %s"
 
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Näyttötila-asetus ei tuettu"
@@ -5144,13 +5087,12 @@ msgstr "E360: Kuorta ei voi avata asetuksella -f"
 msgid "E362: Using a boolean value as a Float"
 msgstr "E362: Käytettiin totuusarvoa Floattina"
 
-# TODO: Capitalise first word of message?
 msgid "E363: Pattern uses more memory than 'maxmempattern'"
-msgstr "E363: kuvio käyttää enemmän muistia kuin maxmempattern on"
+msgstr "E363: Kuvio käyttää enemmän muistia kuin maxmempattern on"
 
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Kirjastukutsu %s() epäonnistui"
+msgstr "E364: Kirjastokutsu %s() epäonnistui"
 
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript-tiedoston tulostus epäonnistui"
@@ -5163,14 +5105,12 @@ msgid "E367: No such group: \"%s\""
 msgstr "E367: Ryhmää ei ole: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E368: Got SIG%s in libcall()"
-msgstr "E368: saatiin SIG%s kutsusta libcall()"
+msgstr "E368: Saatiin SIG%s kutsusta libcall()"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E369: Invalid item in %s%%[]"
-msgstr "E369: virheellinen olio kohdassa %s%%[]"
+msgstr "E369: Virheellinen olio kohdassa %s%%[]"
 
 #, c-format
 msgid "E370: Could not load library %s: %s"
@@ -5188,7 +5128,7 @@ msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: Odottamaton %%%c muotoilumerkkijonossa"
 
 msgid "E374: Missing ] in format string"
-msgstr "E374: ] puuttuu muotoilemerkkijonosta"
+msgstr "E374: ] puuttuu muotoilumerkkijonosta"
 
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
@@ -5222,12 +5162,10 @@ msgid "E383: Invalid search string: %s"
 msgstr "E383: Viallinen hakujono: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E384: Search hit TOP without match for: %s"
 msgstr "E384: Haku pääsi alkuun löytämättä jonoa: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E385: Search hit BOTTOM without match for: %s"
 msgstr "E385: Haku pääsi loppuun löytämättä jonoa: %s"
 
@@ -5241,7 +5179,7 @@ msgid "E388: Couldn't find definition"
 msgstr "E388: Määritelmä ei löydy"
 
 msgid "E389: Couldn't find pattern"
-msgstr "E389: kuvio ei löydy"
+msgstr "E389: Kuvio ei löydy"
 
 #, c-format
 msgid "E390: Illegal argument: %s"
@@ -5253,7 +5191,7 @@ msgstr "E391: Syntaksiklusteri puuttuu: %s"
 
 #, c-format
 msgid "E392: No such syntax cluster: %s"
-msgstr "E392: syntaksiklusteria ei ole: %s"
+msgstr "E392: Syntaksiklusteria ei ole: %s"
 
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]here ei sovi tähän"
@@ -5262,9 +5200,8 @@ msgstr "E393: group[t]here ei sovi tähän"
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Aluetta nimelle %s ei löydy"
 
-# TODO: Capitalise first word of message?
 msgid "E395: Contains argument not accepted here"
-msgstr "E395: contains ei sovi tähän"
+msgstr "E395: Contains ei sovi tähän"
 
 msgid "E397: Filename required"
 msgstr "E397: Tiedostonimi puuttuu"
@@ -5278,19 +5215,18 @@ msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Argumentteja puuttuu: syntaksialue %s"
 
 msgid "E400: No cluster specified"
-msgstr "E400: klusteri määrittelemättä"
+msgstr "E400: Klusteri määrittelemättä"
 
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: Kuvoin erotin puuttuu: %s"
+msgstr "E401: Kuvion erotin puuttuu: %s"
 
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Roskia kuvion jäljessä: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E403: syntax sync: Line continuations pattern specified twice"
-msgstr "E403: syntax sync: rivinjatkamiskuvio määritelty kahdesti"
+msgstr "E403: syntax sync: Rivinjatkamiskuvio määritelty kahdesti"
 
 #, c-format
 msgid "E404: Illegal arguments: %s"
@@ -5318,12 +5254,11 @@ msgstr "E409: Tuntematon ryhmän nimi: %s"
 
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: Virheelluinen :syntax-osakomento: %s"
+msgstr "E410: Virheellinen :syntax-osakomento: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E411: Highlight group not found: %s"
-msgstr "E411: korostusryhmää ei löytynyt: %s"
+msgstr "E411: Korostusryhmää ei löytynyt: %s"
 
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -5333,24 +5268,20 @@ msgstr "E412: Argumentteja puuttuu: :highlight link %s"
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Liikaa argumentteja: :highlight link %s"
 
-# TODO: Capitalise first word of message?
 msgid "E414: Group has settings, highlight link ignored"
-msgstr "E414: ryhmällä on asetuksia, highlight link -komento ohitetaan"
+msgstr "E414: Ryhmällä on asetuksia, highlight link -komento ohitetaan"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E415: Unexpected equal sign: %s"
-msgstr "E415: odotuksenvastainen =-merkki: %s"
+msgstr "E415: Odotuksenvastainen =-merkki: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E416: Missing equal sign: %s"
-msgstr "E416: puuttuva =-merkki: %s"
+msgstr "E416: Puuttuva =-merkki: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E417: Missing argument: %s"
-msgstr "E417: puuttuva argumentti: %s"
+msgstr "E417: Puuttuva argumentti: %s"
 
 #, c-format
 msgid "E418: Illegal value: %s"
@@ -5367,9 +5298,8 @@ msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Värin nimi tai numero tuntematon: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E422: Terminal code too long: %s"
-msgstr "E422: terminaalikoodi liian pitkä: %s"
+msgstr "E422: Terminaalikoodi liian pitkä: %s"
 
 #, c-format
 msgid "E423: Illegal argument: %s"
@@ -5382,9 +5312,8 @@ msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Ei voida mennä ensimmäistä täsmäävää tägiä alummaksi"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E426: Tag not found: %s"
-msgstr "E426: tägi puuttuu: %s"
+msgstr "E426: Tägi puuttuu: %s"
 
 msgid "E427: There is only one matching tag"
 msgstr "E427: Vain yksi tägi täsmää"
@@ -5402,7 +5331,7 @@ msgstr "E430: Tägitiedoston polku katkaistu kohdassa %s\n"
 
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Muotovirh tägitiedostossa %s"
+msgstr "E431: Muotovirhe tägitiedostossa %s"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5421,27 +5350,23 @@ msgstr "E435: Tägiä ei löydy, arvataan."
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: %s ei löytynyt termcapista"
 
-# TODO: Capitalise first word of message?
 msgid "E437: Terminal capability \"cm\" required"
-msgstr "E437: terminaalilla pitää olla cm kyvyissään"
+msgstr "E437: Terminaalilla pitää olla cm kyvyissään"
 
-# TODO: Capitalise first word of message?
 msgid "E438: u_undo: Line numbers wrong"
-msgstr "E438: u_undo: väärät rivinumerot"
+msgstr "E438: u_undo: Väärät rivinumerot"
 
-# TODO: Capitalise first word of message?
 msgid "E439: Undo list corrupt"
-msgstr "E439: kumouslista rikki"
+msgstr "E439: Kumouslista rikki"
 
-# TODO: Capitalise first word of message?
 msgid "E440: Undo line missing"
-msgstr "E440: kumousrivi puuttuu"
+msgstr "E440: Kumousrivi puuttuu"
 
 msgid "E441: There is no preview window"
 msgstr "E441: Ei esikatseluikkunaa"
 
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Ei voi jakaa vasenta ylänurkkaa ja oikeaa alanurkkaa yhtäaikaa"
+msgstr "E442: Ei voi jakaa vasenta ylänurkkaa ja oikeaa alanurkkaa yhtä aikaa"
 
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: Ei voi kiertää kun toinen ikkuna on jaettu"
@@ -5461,28 +5386,26 @@ msgstr "E447: Tiedosto %s ei löydy polulta"
 
 #, c-format
 msgid "E448: Could not load library function %s"
-msgstr "E448: Ei voitu ladta kirjastofunktiota %s"
+msgstr "E448: Ei voitu ladata kirjastofunktiota %s"
 
 msgid "E449: Invalid expression received"
 msgstr "E449: Virheellinen ilmaus saatu"
 
-# TODO: Capitalise first word of message?
 msgid "E450: Buffer number, text or a list required"
-msgstr "E450: puskurinumero, teksti tai lista vaaditaan"
+msgstr "E450: Puskurinumero, teksti tai lista vaaditaan"
 
 #, c-format
 msgid "E451: Expected }: %s"
-msgstr "E451: )-merkki puuttuu: %s"
+msgstr "E451: }-merkki puuttuu: %s"
 
 msgid "E452: Double ; in list of variables"
-msgstr "E452: Kaksi ;:ttä muuttujalistassa"
+msgstr "E452: Kaksi ;:ä muuttujalistassa"
 
 msgid "E453: UL color unknown"
 msgstr "E453: UL-väri tuntematon"
 
-# TODO: Capitalise first word of message?
 msgid "E454: Function list was modified"
-msgstr "E454: funktioluettelo on muuttunut"
+msgstr "E454: Funktioluettelo on muuttunut"
 
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Virhe kirjoitettaessa PostScriptiä tiedostoon"
@@ -5493,7 +5416,7 @@ msgstr "E456: Tiedoston %s avaus ei onnistu"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Postscript-resurssitiedosta %s.ps ei löydy"
+msgstr "E456: PostScript-resurssitiedosta %s.ps ei löydy"
 
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
@@ -5505,7 +5428,6 @@ msgstr "E458: Ei voi varata värikartan alkiota, värit voivat mennä väärin"
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Ei voi siirtyä edelliseen hakemistoon"
 
-# TODO: Capitalise first word of message?
 msgid "E460: Entries missing in mapset() dict argument"
 msgstr "E460: mapset()-kutsun dict-argumentista puuttuu kenttiä"
 
@@ -5536,9 +5458,8 @@ msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Täydennysargumentti sopii vain itse määriteltyyn täydennykseen"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E469: Invalid cscopequickfix flag %c for %c"
-msgstr "E469: virheellinen cscopequickfix-asetus %c kohteelle %c"
+msgstr "E469: Virheellinen cscopequickfix-asetus %c kohteelle %c"
 
 msgid "E470: Command aborted"
 msgstr "E470: Komento peruttu"
@@ -5585,7 +5506,7 @@ msgstr "E479: Ei täsmää"
 
 #, c-format
 msgid "E480: No match: %s"
-msgstr "E480: Ei tsämää: %s"
+msgstr "E480: Ei täsmää: %s"
 
 msgid "E481: No range allowed"
 msgstr "E481: Arvoalue ei sallittu"
@@ -5595,7 +5516,7 @@ msgid "E482: Can't create file %s"
 msgstr "E482: Tiedostoa %s ei voi luoda"
 
 msgid "E483: Can't get temp file name"
-msgstr "E483: väliaikaistiedoston nimeä ei saada selville"
+msgstr "E483: Väliaikaistiedoston nimeä ei saada selville"
 
 #, c-format
 msgid "E484: Can't open file %s"
@@ -5622,17 +5543,15 @@ msgstr "E488: Ylimääräisiä merkkejä perässä"
 msgid "E488: Trailing characters: %s"
 msgstr "E488: Ylimääräisiä merkkejä perässä: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E489: No call stack to substitute for \"<stack>\""
-msgstr "E489: ei kutsupinokorvausta kohteessa <stack>"
+msgstr "E489: Ei kutsupinokorvausta kohteessa <stack>"
 
 msgid "E490: No fold found"
-msgstr "E490: taitos puuttuu"
+msgstr "E490: Taitos puuttuu"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E491: JSON decode error at '%s'"
-msgstr "E491: json-dekoodaus-virhe kohteessa %s"
+msgstr "E491: JSON-dekoodaus-virhe kohteessa %s"
 
 msgid "E492: Not an editor command"
 msgstr "E492: Ei ole editorikomento"
@@ -5641,23 +5560,19 @@ msgid "E493: Backwards range given"
 msgstr "E493: Takaperoinen arvoalue annettu"
 
 msgid "E494: Use w or w>>"
-msgstr "E494: Käytä w:tä tai w>>:aa"
+msgstr "E494: Käytä w:tä tai w>>:ä"
 
-# TODO: Capitalise first word of message?
 msgid "E495: No autocommand file name to substitute for \"<afile>\""
-msgstr "E495: ei autocommand-tiedostoa kohteelle <afile>"
+msgstr "E495: Ei autocommand-tiedostoa kohteelle <afile>"
 
-# TODO: Capitalise first word of message?
 msgid "E496: No autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: ei autocommand-puskurinumeroa kohteelle <abuf>"
+msgstr "E496: Ei autocommand-puskurinumeroa kohteelle <abuf>"
 
-# TODO: Capitalise first word of message?
 msgid "E497: No autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ei autocommand-täsmäysnimeä kohteella <amatch>"
+msgstr "E497: Ei autocommand-täsmäysnimeä kohteella <amatch>"
 
-# TODO: Capitalise first word of message?
 msgid "E498: No :source file name to substitute for \"<sfile>\""
-msgstr "E498: ei :source-tiedostonimeä kohteelle <sfile>"
+msgstr "E498: Ei :source-tiedostonimeä kohteelle <sfile>"
 
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
@@ -5688,8 +5603,7 @@ msgstr "E505: %s on kirjoitussuojattu (lisää komentoon ! ohittaaksesi)"
 
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr ""
-"E506: Ei voi kirjoittaa varmuuskopiotiedostoon (lisää komentoon ! "
-"ohittaaksesi)"
+"E506: Ei voi kirjoittaa varmuuskopiotiedostoon (lisää komentoon ! ohittaaksesi)"
 
 msgid "E507: Close error for backup file (add ! to write anyway)"
 msgstr ""
@@ -5708,28 +5622,24 @@ msgid "E510: Can't make backup file (add ! to write anyway)"
 msgstr ""
 "E510: Ei voi tehdä varmuuskopiotiedostoa (lisää komentoon ! ohittaaksesi)"
 
-# TODO: Capitalise first word of message?
 msgid "E511: NetBeans already connected"
-msgstr "E511: netbeans on yhdistetty jo"
+msgstr "E511: NetBeans on jo yhdistetty"
 
 msgid "E512: Close failed"
 msgstr "E512: Sulkeminen ei onnistunut"
 
-# TODO: Capitalise first word of message?
 msgid "E513: Write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: kirjoitusvirhe, muunnos epäonnistui (tyhjää fenc ohittaaksesi)"
+msgstr "E513: Kirjoitusvirhe, muunnos epäonnistui (tyhjää fenc ohittaaksesi)"
 
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: kirjoitusvirhe, muunnos epäonnistui rivillä %ld(tyhjää fenc "
-"ohittaaksesi)"
+"E513: Kirjoitusvirhe, muunnos epäonnistui rivillä %ld(tyhjää fenc ohittaaksesi)"
 
-# TODO: Capitalise first word of message?
 msgid "E514: Write error (file system full?)"
-msgstr "E514: kirjoitusvirhe (tiedostojärjestelmä täysi)"
+msgstr "E514: Kirjoitusvirhe (tiedostojärjestelmä täysi?)"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Puskureita ei vapautettu"
@@ -5747,7 +5657,7 @@ msgid "E519: Option not supported"
 msgstr "E519: Asetusta ei tueta"
 
 msgid "E520: Not allowed in a modeline"
-msgstr "E520: Ei sallitu modeline-rivillä"
+msgstr "E520: Ei sallittu modeline-rivillä"
 
 msgid "E521: Number required after ="
 msgstr "E521: =:n jälkeen tarvitaan luku"
@@ -5787,11 +5697,9 @@ msgstr "E530: Ei voi vaihtaa termiä GUIssa"
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: Käytä komentoa :gui GUIn käynnistämiseen"
 
-# TODO: Capitalise first word of message?
 msgid "E532: Highlighting color name too long in defineAnnoType"
-msgstr "E532: korostusvärin nimi on liian pitkä defineAnnoTypessä"
+msgstr "E532: Korostusvärin nimi on liian pitkä defineAnnoTypessä"
 
-# TODO: Capitalise first word of message?
 msgid "E533: Can't select wide font"
 msgstr "E533: Leveän fontin valinta ei onnistu"
 
@@ -5802,9 +5710,8 @@ msgstr "E534: Viallinen leveä fontti"
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Virheellinen merkki merkin <%c> jälkeen"
 
-# TODO: Capitalise first word of message?
 msgid "E536: Comma required"
-msgstr "E536: pilkku puuttuu"
+msgstr "E536: Pilkku puuttuu"
 
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
@@ -5817,9 +5724,8 @@ msgstr "E539: Virheellinen merkki <%s>"
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Sulkematon lausekesarja"
 
-# TODO: Capitalise first word of message?
 msgid "E542: Unbalanced groups"
-msgstr "E542: epätasapainoisia ryhmiä"
+msgstr "E542: Epätasapainoisia ryhmiä"
 
 msgid "E543: Not a valid codepage"
 msgstr "E543: Koodisivu ei ole käypä"
@@ -5836,22 +5742,20 @@ msgstr "E546: Virheellinen tila"
 msgid "E547: Illegal mouseshape"
 msgstr "E547: Virheellinen hiiren muoto"
 
-# TODO: Capitalise first word of message?
 msgid "E548: Digit expected"
-msgstr "E548: pitää olla numero"
+msgstr "E548: Pitää olla numero"
 
 msgid "E549: Illegal percentage"
 msgstr "E549: Virheellinen prosenttiluku"
 
 msgid "E550: Missing colon"
-msgstr "E550: kaksoispiste puuttuu"
+msgstr "E550: Kaksoispiste puuttuu"
 
 msgid "E551: Illegal component"
 msgstr "E551: Virheellinen komponentti"
 
-# TODO: Capitalise first word of message?
 msgid "E552: Digit expected"
-msgstr "E552: pitäisi olla numero"
+msgstr "E552: Pitää olla numero"
 
 msgid "E553: No more items"
 msgstr "E553: Ei enää kohteita"
@@ -5860,13 +5764,11 @@ msgstr "E553: Ei enää kohteita"
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Syntaksivirhe ilmauksessa %s{...}"
 
-# TODO: Capitalise first word of message?
 msgid "E555: At bottom of tag stack"
-msgstr "E555: tägipinon pohja"
+msgstr "E555: Tägipinon pohja"
 
-# TODO: Capitalise first word of message?
 msgid "E556: At top of tag stack"
-msgstr "E556: tägipinon huippu"
+msgstr "E556: Tägipinon huippu"
 
 msgid "E557: Cannot open termcap file"
 msgstr "E557: Ei voi avata termcap-tiedostoa"
@@ -5881,9 +5783,8 @@ msgstr "E559: Terminaalia ei löytynyt termcapista"
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Käyttö: cs[cope] %s"
 
-# TODO: Capitalise first word of message?
 msgid "E561: Unknown cscope search type"
-msgstr "E561: tuntematon cscope-hakutyyppi"
+msgstr "E561: Tuntematon cscope-hakutyyppi"
 
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: Käyttö: cstag <ident>"
@@ -5897,31 +5798,27 @@ msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ei ole hakemisto eikä cscope-tietokanta"
 
 msgid "E565: Not allowed to change text or change window"
-msgstr "E565: ei voi vaihtaa tekstiä tai ikkunaa"
+msgstr "E565: Ei voi vaihtaa tekstiä tai ikkunaa"
 
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Ei voitu luoda cscope-putkia"
 
-# TODO: Capitalise first word of message?
 msgid "E567: No cscope connections"
-msgstr "E567: ei cscope-yhteyksiä"
+msgstr "E567: Ei cscope-yhteyksiä"
 
-# TODO: Capitalise first word of message?
 msgid "E568: Duplicate cscope database not added"
-msgstr "E568: kaksoiskappaletta cscope-tietokannasta ei lisätty"
+msgstr "E568: Kaksoiskappaletta cscope-tietokannasta ei lisätty"
 
-# TODO: Capitalise first word of message?
 msgid "E570: Fatal error in cs_manage_matches"
-msgstr "E570: kriittinen virhe cs_manage_matches-funktiossa"
+msgstr "E570: Kriittinen virhe cs_manage_matches-funktiossa"
 
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "E571: komento ei toimi, Tcl-kirjastoa ei voitu ladata."
+msgstr "E571: Komento ei toimi, Tcl-kirjastoa ei voitu ladata."
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E572: Exit code %d"
-msgstr "E572: palautusarvo %d"
+msgstr "E572: Palautusarvo %d"
 
 #, c-format
 msgid "E573: Invalid server id used: %s"
@@ -5943,13 +5840,11 @@ msgstr "Virheellinen rekisterin nimi"
 msgid "E578: Not allowed to change text here"
 msgstr "E578: Ei voi vaihtaa tekstiä täällä"
 
-# TODO: Capitalise first word of message?
 msgid "E579: :if nesting too deep"
-msgstr "E579: liian monta kerrosta :if-komennossa"
+msgstr "E579: Liian monta kerrosta :if-komennossa"
 
-# TODO: Capitalise first word of message?
 msgid "E579: Block nesting too deep"
-msgstr "E579: liian monta kerrosta"
+msgstr "E579: Liian monta kerrosta"
 
 msgid "E580: :endif without :if"
 msgstr "E580: :endif ilman komentoa :if"
@@ -5960,7 +5855,6 @@ msgstr "E581: :else ilman komentoa :if"
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif ilman komentoa :if"
 
-# TODO: Capitalise first word of message?
 msgid "E583: Multiple :else"
 msgstr "E583: :else monta kertaa"
 
@@ -5968,7 +5862,7 @@ msgid "E584: :elseif after :else"
 msgstr "E584: :elseif komennon :else jälkeen"
 
 msgid "E585: :while/:for nesting too deep"
-msgstr "E585: liian monta tasoa :while- tai :for-komennoissa"
+msgstr "E585: Liian monta tasoa :while- tai :for-komennoissa"
 
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :continue ilman komentoa :while tai :for"
@@ -6008,7 +5902,6 @@ msgstr "E595: showbreak sisältää tulostumattomia tai leveitä merkkejä"
 msgid "E596: Invalid font(s)"
 msgstr "E596: Viallisia fontteja"
 
-# TODO: Capitalise first word of message?
 msgid "E597: Can't select fontset"
 msgstr "E597: Fontsetin valinta ei onnistu"
 
@@ -6040,7 +5933,6 @@ msgstr "E605: Kiinniottamaton poikkeus: %s"
 msgid "E606: :finally without :try"
 msgstr "E606: :finally ilman komentoa :try"
 
-# TODO: Capitalise first word of message?
 msgid "E607: Multiple :finally"
 msgstr "E607: :finally monta kertaa"
 
@@ -6052,7 +5944,7 @@ msgid "E609: Cscope error: %s"
 msgstr "E609: Cscope-virhe: %s"
 
 msgid "E610: No argument to delete"
-msgstr "E610: ei poistettavia argumenttejä"
+msgstr "E610: Ei poistettavia argumenttejä"
 
 msgid "E611: Using a Special as a Number"
 msgstr "E611: Special ei käy Numberista"
@@ -6078,14 +5970,12 @@ msgid "E617: Cannot be changed in the GTK GUI"
 msgstr "E617: Ei voi muuttaa GTK-GUIssa"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E618: File \"%s\" is not a PostScript resource file"
-msgstr "E618: tiedosto %s ei ole PostScript-resurssitiedosto"
+msgstr "E618: Tiedosto %s ei ole PostScript-resurssitiedosto"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E619: File \"%s\" is not a supported PostScript resource file"
-msgstr "E619: tiedosto %s ei ole tuettu PostScript-resurssitiedosto"
+msgstr "E619: Tiedosto %s ei ole tuettu PostScript-resurssitiedosto"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
@@ -6106,28 +5996,23 @@ msgid "E624: Can't open file \"%s\""
 msgstr "E624: Ei voi avata tiedostoa %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E625: Cannot open cscope database: %s"
-msgstr "E625: ei voi avata cscope-tietokantaa: %s"
+msgstr "E625: Ei voi avata cscope-tietokantaa: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E626: Cannot get cscope database information"
-msgstr "E626: ei voi hakea cscope-tietokannan tietoja"
+msgstr "E626: Ei voi hakea cscope-tietokannan tietoja"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E630: %s(): Write while not connected"
-msgstr "E630: %s(): ei voi kirjoittaa ilman yhteyttä"
+msgstr "E630: %s(): Ei voi kirjoittaa ilman yhteyttä"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E631: %s(): Write failed"
-msgstr "E631: %s(): kirjoitus epäonnistui"
+msgstr "E631: %s(): Kirjoitus epäonnistui"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E654: Missing delimiter after search pattern: %s"
-msgstr "E654: erotin puuttuu hakuilmauksen perästä: %s"
+msgstr "E654: Erotin puuttuu hakuilmauksen perästä: %s"
 
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Liikaa symbolisia linkkejä (mahdollinen sykli)"
@@ -6147,7 +6032,7 @@ msgstr "E659: Pythonia ei voi kutsua rekursiivisesti"
 
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ei löydy %s-ohjetta kohteelle %s"
+msgstr "E661: Ei löydy %s-ohjetta kohteelle %s"
 
 msgid "E662: At start of changelist"
 msgstr "E662: Muutoslistan alussa"
@@ -6155,17 +6040,15 @@ msgstr "E662: Muutoslistan alussa"
 msgid "E663: At end of changelist"
 msgstr "E663: Muutoslistan lopussa"
 
-# TODO: Capitalise first word of message?
 msgid "E664: Changelist is empty"
-msgstr "E664: muutoslista on tyhjä"
+msgstr "E664: Muutoslista on tyhjä"
 
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: Ei voi avata GUIta, sopivaa fonttia ei löydy"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E666: Compiler not supported: %s"
-msgstr "E666: kääntäjää ei tueta: %s"
+msgstr "E666: Kääntäjää ei tueta: %s"
 
 msgid "E667: Fsync failed"
 msgstr "E667: Fsync ei onnistunut"
@@ -6190,13 +6073,13 @@ msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Ikkunaa ei voitu avata MDI-sovellukseen"
 
 msgid "E673: Incompatible multi-byte encoding and character set"
-msgstr "E673: Tukematon monitvauinen merkistökoodaus ja merkistö"
+msgstr "E673: Tukematon monitavuinen merkistökoodaus ja merkistö"
 
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr "E674: printmbcharset ei voi olla tyhjä monitavuiselle koodaukselle."
 
 msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: Ei oletusfonttia monitavuiseen tulostukseen"
+msgstr "E675: Ei oletusfonttia monitavuiseen tulostukseen."
 
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Ei autocommand-komentoa acwrite-puskurille"
@@ -6208,9 +6091,8 @@ msgstr "E677: Väliaikaistiedostoon kirjoittaminen ei onnistunut"
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Virheellinen merkki merkinnän %s%%[dxouU] jäljessä"
 
-# TODO: Capitalise first word of message?
 msgid "E679: Recursive loop loading syncolor.vim"
-msgstr "E679: rekursiivinen silmukka syncolor.vimissä"
+msgstr "E679: Rekursiivinen silmukka syncolor.vimissä"
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number"
@@ -6226,7 +6108,6 @@ msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Tiedostonimi puuttuu tai kuvio on viallinen"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E684: List index out of range: %ld"
 msgstr "E684: Indeksi %ld luettelon rajojen ulkopuolella"
 
@@ -6270,9 +6151,8 @@ msgstr "E696: Listasta puuttuu pilkku: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Listan lopusta puuttuu ]: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E698: Variable nested too deep for making a copy"
-msgstr "E698: muuttuja on upotettu liian syvälle kopioitavaksi"
+msgstr "E698: Muuttuja on upotettu liian syvälle kopioitavaksi"
 
 msgid "E699: Too many arguments"
 msgstr "E699: Liikaa argumentteja"
@@ -6357,9 +6237,8 @@ msgstr "E722: Sanakirjasta puuttuu pilkku: %s"
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Sanakirjan lopusta puuttuu }: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E724: Variable nested too deep for displaying"
-msgstr "E724: muuttuja on upotettu liian syvälle näytettäväksi"
+msgstr "E724: Muuttuja on upotettu liian syvälle näytettäväksi"
 
 #, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
@@ -6409,7 +6288,7 @@ msgstr "E738: Kohteen %s muuttujia ei voi listata"
 
 #, c-format
 msgid "E739: Cannot create directory: %s"
-msgstr "E739: hakemistoa ei voi luoda: %s"
+msgstr "E739: Hakemistoa ei voi luoda: %s"
 
 #, c-format
 msgid "E740: Too many arguments for function %s"
@@ -6429,9 +6308,8 @@ msgstr "E742: Ei voi muuttaa"
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Ei voi muuttaa muuttujan %s arvoa"
 
-# TODO: Capitalise first word of message?
 msgid "E743: Variable nested too deep for (un)lock"
-msgstr "E743: muuttujassa liian monta tasoa lukituksen käsittelyyn"
+msgstr "E743: Muuttujassa liian monta tasoa lukituksen käsittelyyn"
 
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans ei tue muutoksia kirjoitussuojattuihin tiedostoihin"
@@ -6451,9 +6329,8 @@ msgstr ""
 msgid "E748: No previously used register"
 msgstr "E748: Ei aiemmin käytettyjä rekisterejä"
 
-# TODO: Capitalise first word of message?
 msgid "E749: Empty buffer"
-msgstr "E749: tyhjä puskuri"
+msgstr "E749: Tyhjä puskuri"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Aloita käskyllä :profile start {fname}"
@@ -6493,7 +6370,7 @@ msgid "E760: No word count in %s"
 msgstr "E760: Ei sanalaskuria kohteessa %s"
 
 msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: Affiksitiedoston FOL-, LOW- tai UPP-muotovirhe "
+msgstr "E761: Affiksitiedoston FOL-, LOW- tai UPP-muotovirhe"
 
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: Merkki FOL:ssä, LOW:ssä tai UPP:ssä ei kuulu arvoalueeseen"
@@ -6565,13 +6442,11 @@ msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: .sug-tiedosto ei täsmää .spl-tiedostoon: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E782: Error while reading .sug file: %s"
-msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+msgstr "E782: Virhe luettaessa .sug-tiedostoa: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E783: Duplicate char in MAP entry"
-msgstr "E783: kaksoiskappale merkistä MAP-kohdassa"
+msgstr "E783: Kaksoiskappale merkistä MAP-kohdassa"
 
 msgid "E784: Cannot close last tab page"
 msgstr "E784: Viimeistä välilehteä ei voi sulkea"
@@ -6599,7 +6474,7 @@ msgid "E791: Empty keymap entry"
 msgstr "E791: Tyhjä keymap-kenttä"
 
 msgid "E792: Empty menu name"
-msgstr "E792: tyhjä valikkonimi"
+msgstr "E792: Tyhjä valikkonimi"
 
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: Yksikään muu diff-tilan puskurit ei ole muokattavissa"
@@ -6641,7 +6516,7 @@ msgstr "E801: ID jo käytössä: %d"
 
 #, c-format
 msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: Käyttöklvoton ID: %d (pitää olla vähintään 1)"
+msgstr "E802: Käyttökelvoton ID: %d (pitää olla vähintään 1)"
 
 #, c-format
 msgid "E803: ID not found: %d"
@@ -6654,7 +6529,6 @@ msgstr "E804: Ei voi käyttää '%':a Floatin kanssa"
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Float ei käy Numberista"
 
-# TODO: Capitalise first word of message?
 msgid "E806: Using a Float as a String"
 msgstr "E806: Float ei käy merkkijonosta"
 
@@ -6677,7 +6551,7 @@ msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Autocommands muutti puskurin tai sen nimen"
 
 msgid "E813: Cannot close autocmd or popup window"
-msgstr "E813: Ei voi sulkea autocmd- tai ponnahsdusikkunaa"
+msgstr "E813: Ei voi sulkea autocmd- tai ponnahdusikkunaa"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: Ei voi sulkea viimeistä ikkunaa, joka ei ole autocmd-ikkuna"
@@ -6694,7 +6568,7 @@ msgid "E817: Blowfish big/little endian use wrong"
 msgstr "E817: Blowfishin tavujärjestys väärä"
 
 msgid "E818: sha256 test failed"
-msgstr "E818: sha256-testi epäonnistui failed"
+msgstr "E818: sha256-testi epäonnistui"
 
 msgid "E819: Blowfish test failed"
 msgstr "E819: Blowfish-testi epäonnistui"
@@ -6719,7 +6593,7 @@ msgstr "E824: Epäyhteensopiva kumoustiedosto: %s"
 
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: Pilaanntunut kumoustiedosto (%s): %s"
+msgstr "E825: Pilaantunut kumoustiedosto (%s): %s"
 
 #, c-format
 msgid "E826: Undo file decryption failed: %s"
@@ -6734,7 +6608,6 @@ msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Kumoustiedoston avaus kirjoittamista varten ei onnistu: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E829: Write error in undo file: %s"
 msgstr "E829: Kirjoitusvirhe kumoustiedostossa: %s"
 
@@ -6750,8 +6623,7 @@ msgid "E832: Non-encrypted file has encrypted undo file: %s"
 msgstr "E832: Salaamattomalla tiedostolla on salattu kumoustiedosto: %s"
 
 #, c-format
-msgid ""
-"E833: %s is encrypted and this version of Vim does not support encryption"
+msgid "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr "E833: %s on salattu eikä tämä Vim tue salausta"
 
 msgid "E834: Conflicts with value of 'listchars'"
@@ -6766,9 +6638,8 @@ msgstr "E836: Python: Ei voi käyttää komentoja :py ja :py3 samassa istunnossa
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Python: Ei voi käyttää komentoja :py ja :py3 samassa istunnossa"
 
-# TODO: Capitalise first word of message?
 msgid "E838: NetBeans is not supported with this GUI"
-msgstr "E838: netbeans ei toimi tässä käyttöliittymässä"
+msgstr "E838: NetBeans ei toimi tässä käyttöliittymässä"
 
 msgid "E840: Completion function deleted text"
 msgstr "E840: Täydennys poisti tekstiä"
@@ -6776,14 +6647,12 @@ msgstr "E840: Täydennys poisti tekstiä"
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: Varattua nimeä ei voi käyttää käyttäjän määrittelemänä komentona"
 
-# TODO: Capitalise first word of message?
 msgid "E842: No line number to use for \"<slnum>\""
-msgstr "E842: ei rivinumeroa kohteelle <slnum>"
+msgstr "E842: Ei rivinumeroa kohteelle <slnum>"
 
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843: Virhe päivitettäessä swapin kryptausta"
 
-# TODO: Capitalise first word of message?
 msgid "E844: Invalid cchar value"
 msgstr "E844: Virheellinen cchar-arvo"
 
@@ -6815,9 +6684,8 @@ msgstr "E852: Lapsiprosesi ei voinut käynnistää käyttöliittymää"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Kaksoiskappale argumentin nimestä: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E854: Path too long for completion"
-msgstr "E854: polku on liian pitkä täydennykseen"
+msgstr "E854: Polku on liian pitkä täydennykseen"
 
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: Autocommands lopetti komennon"
@@ -6837,10 +6705,10 @@ msgid "E858: Eval did not return a valid python object"
 msgstr "E858: Eval ei palauttanut python-oliota"
 
 msgid "E859: Failed to convert returned python object to a Vim value"
-msgstr "E859: Ei voitu konvertoida python-oliota vim-arvoksi"
+msgstr "E859: Ei voitu muuntaa python-oliota vim-arvoksi"
 
 msgid "E860: Need 'id' and 'type' with 'both'"
-msgstr "E860: tarvitaan id ja type parametrillä both"
+msgstr "E860: Tarvitaan id ja type parametrilla both"
 
 msgid "E861: Cannot open a second popup with a terminal"
 msgstr "E861: Ei voi avata toista ponnahdusta terminaaliin"
@@ -6856,8 +6724,8 @@ msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used"
 msgstr ""
-"E864: \\%#=-merkkien perään voi tulla vain 0, 1 tai 2. Käytetään "
-"automaattista masiinaa"
+"E864: \\%#=-merkkien perään voi tulla vain 0, 1 tai 2. Käytetään automaattista "
+"masiinaa"
 
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Säännöllisen ilmauksen ennenaikainen loppu"
@@ -6875,7 +6743,7 @@ msgid "E867: (NFA regexp) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA-regexp) Tuntematon operaattori '\\%%%c'"
 
 msgid "E868: Error building NFA with equivalence class!"
-msgstr "E868: Virhe NFA:n ekvivalenssiluokkia tekemisessä"
+msgstr "E868: Virhe NFA:n ekvivalenssiluokkia tekemisessä."
 
 #, c-format
 msgid "E869: (NFA regexp) Unknown operator '\\@%c'"
@@ -6891,17 +6759,17 @@ msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA regexp) Liian monta suljetta '('"
 
 msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (NFA regexp) oikea lopetusvirhe"
+msgstr "E873: (NFA regexp) Oikea lopetusvirhe"
 
 msgid "E874: (NFA regexp) Could not pop the stack!"
-msgstr "E874: (NFA-regexp) Ei voida poistaa pinosta"
+msgstr "E874: (NFA-regexp) Ei voida poistaa pinosta."
 
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
 msgstr ""
-"E875: (NFA regexp) (Muunnettaessa postfixistä NFA:ksi), liikaa tiloja "
-"jäljellä pinossa"
+"E875: (NFA regexp) (Muunnettaessa postfixistä NFA:ksi), liikaa tiloja jäljellä "
+"pinossa"
 
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA"
 msgstr "E876: (NFA regexp) Tila ei riitä NFA:n tallentamiseen"
@@ -6911,7 +6779,7 @@ msgid "E877: (NFA regexp) Invalid character class: %d"
 msgstr "E877: (NFA regexp) Virheellinen merkkiluokka: %d"
 
 msgid "E878: (NFA regexp) Could not allocate memory for branch traversal!"
-msgstr "E878: (NFA-regexp) Ei voitu allokoida muistia polkujen läpikäyntiin"
+msgstr "E878: (NFA-regexp) Ei voitu allokoida muistia polkujen läpikäyntiin."
 
 msgid "E879: (NFA regexp) Too many \\z("
 msgstr "E879: (NFA regexp) Liikaa merkkejä \\z("
@@ -6926,11 +6794,9 @@ msgid "E882: Uniq compare function failed"
 msgstr "E882: Uniqin vertausfunktio ei onnistunut"
 
 msgid ""
-"E883: search pattern and expression register may not contain two or more "
-"lines"
+"E883: search pattern and expression register may not contain two or more lines"
 msgstr ""
-"E883: hakulauseke- ja -ilmausrekisteri ei voi sisältää kahta tai useampaa "
-"riviä"
+"E883: hakulauseke- ja -ilmausrekisteri ei voi sisältää kahta tai useampaa riviä"
 
 #, c-format
 msgid "E884: Function name cannot contain a colon: %s"
@@ -6942,7 +6808,7 @@ msgstr "E885: Ei voida muuttaa merkkiä %s"
 
 #, c-format
 msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: Viminfo-tiedostoa ei voit uudelleennimetä nimelle %s"
+msgstr "E886: Viminfo-tiedostoa ei voi nimetä uudelleen nimelle %s."
 
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
@@ -6958,7 +6824,6 @@ msgid "E889: Number required"
 msgstr "E889: Number vaaditaan"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E890: Trailing char after ']': %s]%s"
 msgstr "E890: Ylimääräisiä merkkejä merkin ] perässä: %s]%s"
 
@@ -6975,8 +6840,8 @@ msgid "E894: Using a Dictionary as a Float"
 msgstr "E894: Sanakirja ei käy Floatista"
 
 msgid ""
-"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
-"could not be loaded."
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module could "
+"not be loaded."
 msgstr "E895: Komento ei toimi, MzScheme-moduulia racket/base ei voitu ladata."
 
 # datarakenteita
@@ -7007,37 +6872,31 @@ msgstr "E901: gethostbyname() funktiossa channel_open()"
 msgid "E902: Cannot connect to port"
 msgstr "E902: Ei voi yhdistää porttiin"
 
-# TODO: Capitalise first word of message?
 msgid "E903: Received command with non-string argument"
-msgstr "E903: komennolla ei-merkkijonoargumentti"
+msgstr "E903: Komennolla ei-merkkijonoargumentti"
 
-# TODO: Capitalise first word of message?
 msgid "E904: Last argument for expr/call must be a number"
-msgstr "E904: viimeisen expr/call-argumentin pitää olla numero"
+msgstr "E904: Viimeisen expr/call-argumentin pitää olla numero"
 
-# TODO: Capitalise first word of message?
 msgid "E904: Third argument for call must be a list"
-msgstr "E904: kolmannen argumentin pitää olla lista"
+msgstr "E904: Kolmannen argumentin pitää olla lista"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E905: Received unknown command: %s"
-msgstr "E905: tuntematon komento: %s"
+msgstr "E905: Tuntematon komento: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E906: Not an open channel"
-msgstr "E906: ei ole avoin kanava"
+msgstr "E906: Ei ole avoin kanava"
 
 msgid "E907: Using a special value as a Float"
 msgstr "E907: Käytettiin erikoisarvoa Floattina"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E908: Using an invalid value as a String: %s"
-msgstr "E908: huono arvo merkkijonolle: %s"
+msgstr "E908: Huono arvo merkkijonolle: %s"
 
 msgid "E909: Cannot index a special variable"
-msgstr "E909: erikoismuuttujaa ei voi indeksoida"
+msgstr "E909: Erikoismuuttujaa ei voi indeksoida"
 
 msgid "E910: Using a Job as a Number"
 msgstr "E910: Job ei käy Numberista"
@@ -7045,10 +6904,9 @@ msgstr "E910: Job ei käy Numberista"
 msgid "E911: Using a Job as a Float"
 msgstr "E911: Job ei käy Floatista"
 
-# TODO: Capitalise first word of message?
 msgid "E912: Cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
 msgstr ""
-"E912: ei voida käyttää funktioita ch_evalexpr(), ch_sendexpr() raa'an tai nl-"
+"E912: Ei voida käyttää funktioita ch_evalexpr(), ch_sendexpr() raa'an tai nl-"
 "kanavan kanssa"
 
 msgid "E913: Using a Channel as a Number"
@@ -7060,18 +6918,16 @@ msgstr "E914: Käytettiin Channelia Floattina"
 msgid "E915: in_io buffer requires in_buf or in_name to be set"
 msgstr "E915: in_io-puskurilla pitää olla in_buf tai in_name asetettu"
 
-# TODO: Capitalise first word of message?
 msgid "E916: Not a valid job"
-msgstr "E916: ei ole job"
+msgstr "E916: Ei ole job"
 
 #, c-format
 msgid "E917: Cannot use a callback with %s()"
 msgstr "E917: Ei voitu käyttää callbackia %s()"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E918: Buffer must be loaded: %s"
-msgstr "E918: puskuria ei voi ladata: %s"
+msgstr "E918: Puskuria ei voi ladata: %s"
 
 #, c-format
 msgid "E919: Directory not found in '%s': \"%s\""
@@ -7083,13 +6939,12 @@ msgstr "E920: _io-tiedostolla pitää olla _name asetettu"
 msgid "E921: Invalid callback argument"
 msgstr "E921: Virheellinen callback-argumentti"
 
-# TODO: Capitalise first word of message?
 msgid "E922: Expected a dict"
-msgstr "E922: odotettiin dictiä"
+msgstr "E922: Odotettiin dictiä"
 
 # datarakenteita
 msgid "E923: Second argument of function() must be a list or a dict"
-msgstr "E923: toisen function()-argumentin pitää olla lista tai sanakirja"
+msgstr "E923: Toisen function()-argumentin pitää olla lista tai sanakirja"
 
 msgid "E924: Current window was closed"
 msgstr "E924: Nykyinen ikkuna on suljettu"
@@ -7109,7 +6964,7 @@ msgstr "E928: Merkkijono puuttuu"
 
 #, c-format
 msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: liikaa viminfo-väliaikaistiedostoja, kuten %s."
+msgstr "E929: Liikaa viminfo-väliaikaistiedostoja, kuten %s."
 
 msgid "E930: Cannot use :redir inside execute()"
 msgstr "E930: Komentoa :redir ei voi käyttää funktion execute() sisällä"
@@ -7129,7 +6984,6 @@ msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: Ei voida hypätä puskuriin jolla ei ole nimeä"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E935: Invalid submatch number: %d"
 msgstr "E935: Virheellinen alitäsmäyksen numero: %d"
 
@@ -7151,9 +7005,8 @@ msgstr "E939: Positiivinen luku tarvitaan"
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: Muuttujaa %s ei voi lukita tai avata"
 
-# TODO: Capitalise first word of message?
 msgid "E941: Already started a server"
-msgstr "E941: palvelin on jo käynnissä"
+msgstr "E941: Palvelin on jo käynnissä"
 
 msgid "E942: +clientserver feature not available"
 msgstr "E942: +clientserver-toiminto ei ole saatavilla"
@@ -7162,14 +7015,13 @@ msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr "E943: Komentotaulukko pitää päivittää komennolla 'make cmdidxs'"
 
 msgid "E944: Reverse range in character class"
-msgstr "E944: Merkiluokan arvoalua on takaperin"
+msgstr "E944: Merkkiluokan arvoalue on takaperin"
 
 msgid "E945: Range too large in character class"
 msgstr "E945: Liian laaja valikoima merkkiluokassa"
 
 msgid "E946: Cannot make a terminal with running job modifiable"
-msgstr ""
-"E946: Terminaalia jossa suoritetaan komentoa ei voi tehdä muokattavaksi"
+msgstr "E946: Terminaalia jossa suoritetaan komentoa ei voi tehdä muokattavaksi"
 
 #, c-format
 msgid "E947: Job still running in buffer \"%s\""
@@ -7203,7 +7055,7 @@ msgid "E954: 24-bit colors are not supported on this environment"
 msgstr "E954: 24-bittiset värit eivät toimi tässä järjestelmässä"
 
 msgid "E955: Not a terminal buffer"
-msgstr "E955: ei ole terminaalipuskuri"
+msgstr "E955: Ei ole terminaalipuskuri"
 
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: Ilmaus ei toimi rekursiivisesti"
@@ -7220,34 +7072,30 @@ msgstr "E959: Viallinen diff-formaatti."
 msgid "E960: Problem creating the internal diff"
 msgstr "E960: Ongelma sisäisen diffin teossa"
 
-# TODO: Capitalise first word of message?
 msgid "E961: No line number to use for \"<sflnum>\""
-msgstr "E961: ei rivinumeroa kohteelle <sflnum>"
+msgstr "E961: Ei rivinumeroa kohteelle <sflnum>"
 
 #, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: Viallinen toiminto: %s"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E963: Setting %s to value with wrong type"
-msgstr "E963: väärä tyyppi asetuksen %s arvoksi"
+msgstr "E963: Väärä tyyppi asetuksen %s arvoksi"
 
 #, c-format
 msgid "E964: Invalid column number: %ld"
 msgstr "E964: Virheellinen sarakenumero: %ld"
 
-# TODO: Capitalise first word of message?
 msgid "E965: Missing property type name"
 msgstr "E965: Puuttuva ominaisuustyyppinimi"
 
 #, c-format
 msgid "E966: Invalid line number: %ld"
-msgstr "E966: virheellinen rivinumero: %ld"
+msgstr "E966: Virheellinen rivinumero: %ld"
 
-# TODO: Capitalise first word of message?
 msgid "E967: Text property info corrupted"
-msgstr "E967: tekstiarvo info korruptoitunut"
+msgstr "E967: Tekstiarvo info korruptoitunut"
 
 msgid "E968: Need at least one of 'id' or 'type'"
 msgstr "E968: Tarvitaan ainakin id tai type"
@@ -7289,12 +7137,11 @@ msgstr "E978: Virheellinen toiminto Blobille"
 msgid "E979: Blob index out of range: %ld"
 msgstr "E979: Blobin indeksi %ld rajojen ulkopuolella"
 
-# TODO: Capitalise first word of message?
 msgid "E980: Lowlevel input not supported"
-msgstr "E980: matalan tason syötettä ei tueta"
+msgstr "E980: Matalan tason syötettä ei tueta"
 
 msgid "E981: Command not allowed in rvim"
-msgstr "E981: komennot eivät toimi rvimissä"
+msgstr "E981: Komennot eivät toimi rvimissä"
 
 msgid "E982: ConPTY is not available"
 msgstr "E982: ConPTY ei ole saatavilla"
@@ -7309,13 +7156,11 @@ msgstr "E984: :scriptversion ladatun tiedoston ulkopuolella"
 msgid "E985: .= is not supported with script version >= 2"
 msgstr "E985: .= ei tuettu skriptiversiössa >=2"
 
-# TODO: Capitalise first word of message?
 msgid "E986: Cannot modify the tag stack within tagfunc"
-msgstr "E986: tagipinoa ei voi muokata tagfuncissa"
+msgstr "E986: Tägipinoa ei voi muokata tagfuncissa"
 
-# TODO: Capitalise first word of message?
 msgid "E987: Invalid return value from tagfunc"
-msgstr "E987: väärä palautusarvo tagfuncissa"
+msgstr "E987: Väärä palautusarvo tagfuncissa"
 
 msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
 msgstr "E988: GUIta ei voi käyttää eli gvim.exe ei toimi."
@@ -7327,7 +7172,6 @@ msgstr "E989: Oletusarvoton argumentti oletusarvollisen jälkeen"
 msgid "E990: Missing end marker '%s'"
 msgstr "E990: Lopetusmerkki %s puuttuu"
 
-# TODO: Capitalise first word of message?
 msgid "E991: Cannot use =<< here"
 msgstr "E991: =<< ei toimi täällä"
 
@@ -7335,15 +7179,14 @@ msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
 msgstr "E992: Ei sallitu modeline-rivillä kun modelineexpr on pois päältä"
 
 #, c-format
-# TODO: Capitalise first word of message?
 msgid "E993: Window %d is not a popup window"
-msgstr "E993: ikkuna %d ei ole popup"
+msgstr "E993: Ikkuna %d ei ole popup"
 
 msgid "E994: Not allowed in a popup window"
 msgstr "E994: Ei sallittu ponnahdusikkunassa"
 
 msgid "E995: Cannot modify existing variable"
-msgstr "E995: Olemassaolevaa muuttujaa ei voi muuttaa"
+msgstr "E995: Olemassa olevaa muuttujaa ei voi muuttaa"
 
 msgid "E996: Cannot lock a range"
 msgstr "E996: Arvoaluetta ei voi lukita"
@@ -7370,7 +7213,7 @@ msgstr "E998: Vähennys tyhjästä %s ilman aloitusarvoa"
 
 #, c-format
 msgid "E999: scriptversion not supported: %d"
-msgstr "E999: skriptiversiota ei tueta: %d"
+msgstr "E999: Skriptiversiota ei tueta: %d"
 
 #, c-format
 msgid "E1001: Variable not found: %s"
@@ -7385,8 +7228,8 @@ msgstr "E1003: Palautusarvo puuttuu"
 
 #, c-format
 msgid "E1004: White space required before and after '%s' at \"%s\""
-msgstr "E1004: Välilyöntejä pitää olle ennen ja jälkeen kohteen "
-"’%s’ kohteessa ”%s”"
+msgstr ""
+"E1004: Välilyöntejä pitää olla ennen ja jälkeen kohteen ’%s’ kohteessa ”%s”"
 
 msgid "E1005: Too many argument types"
 msgstr "E1005: Liikaa argumenttityyppejä"
@@ -7414,7 +7257,7 @@ msgstr "E1011: Liian pitkä nimi: %s"
 
 #, c-format
 msgid "E1012: Type mismatch; expected %s but got %s"
-msgstr "E1012: Tyyppivirhe; odotettiin tyyppiä %s saatiin %s"
+msgstr "E1012: Tyyppivirhe: odotettiin tyyppiä %s saatiin %s"
 
 #, c-format
 msgid "E1012: Type mismatch; expected %s but got %s in %s"
@@ -7426,8 +7269,9 @@ msgstr "E1013: Argumentti %d: tyyppivirhe, odotettiin tyyppiä %s saatiin %s"
 
 #, c-format
 msgid "E1013: Argument %d: type mismatch, expected %s but got %s in %s"
-msgstr "E1013: argumentti %d: tyyppivirhe, odotettiin tyyppiä %s saatiin %s "
-"kohteessa %s"
+msgstr ""
+"E1013: Argumentti %d: tyyppivirhe, odotettiin tyyppiä %s saatiin %s kohteessa "
+"%s"
 
 #, c-format
 msgid "E1014: Invalid key: %s"
@@ -7529,7 +7373,7 @@ msgstr "E1040: :scriptversion ei toimi :vim9scriptin jälkeen"
 
 #, c-format
 msgid "E1041: Redefining script item %s"
-msgstr "E1041: Uudelleenmärittely skriptin kohteelle %s"
+msgstr "E1041: Skriptin kohde %s määritelty uudelleen"
 
 msgid "E1042: Export can only be used in vim9script"
 msgstr "E1042: Export toimii vain vim9scriptissä"
@@ -7645,14 +7489,14 @@ msgstr "E1076: Tähän Vimiin ei ole käännetty liukulukutoimintoja mukaan"
 
 #, c-format
 msgid "E1077: Missing argument type for %s"
-msgstr "E1077: puuttuva argumenttityyppi: %s"
+msgstr "E1077: Puuttuva argumenttityyppi: %s"
 
 #, c-format
 msgid "E1081: Cannot unlet %s"
 msgstr "E1081: Ei voi suorittaa komentoa unlet %s"
 
 msgid "E1083: Missing backtick"
-msgstr "E1083: takapilkku puuttuu"
+msgstr "E1083: Takapilkku puuttuu"
 
 #, c-format
 msgid "E1084: Cannot delete Vim9 script function %s"
@@ -7660,13 +7504,13 @@ msgstr "E1084: Vim9-skriptiunktiota %s ei voi poistaa"
 
 #, c-format
 msgid "E1085: Not a callable type: %s"
-msgstr "E1085: ei ole kutsutyyppiä: %s"
+msgstr "E1085: Ei ole kutsutyyppiä: %s"
 
 msgid "E1086: Function reference invalid"
 msgstr "E1086: Funktioviite on viallinen"
 
 msgid "E1087: Cannot use an index when declaring a variable"
-msgstr "E1087: Ei voi käyttää indeksia muuttujan julistuksessa"
+msgstr "E1087: Ei voi käyttää indeksiä muuttujan julistuksessa"
 
 #, c-format
 msgid "E1089: Unknown variable: %s"
@@ -7705,7 +7549,7 @@ msgstr "E1099: Tuntematon virhe suoritettaessa koodia %s"
 
 #, c-format
 msgid "E1100: Command not supported in Vim9 script (missing :var?): %s"
-msgstr "E1100: Komentoa ei tueta Vim0-skriptissä (puuttuuko :var?): %s"
+msgstr "E1100: Komentoa ei tueta Vim9-skriptissä (puuttuuko :var?): %s"
 
 #, c-format
 msgid "E1101: Cannot declare a script variable in a function: %s"
@@ -7723,7 +7567,7 @@ msgstr "E1104: > puuttuu"
 
 #, c-format
 msgid "E1105: Cannot convert %s to string"
-msgstr "E1105: Ei voida konvertoida juttua %s merkkijonoksi"
+msgstr "E1105: Ei voida muuntaa juttua %s merkkijonoksi"
 
 msgid "E1106: One argument too many"
 msgstr "E1106: Yksi argumentti on liikaa"
@@ -7766,8 +7610,8 @@ msgid "E1115: \"assert_fails()\" fourth argument must be a number"
 msgstr "E1115: assert_fails()-funktion neljännen argumentin tulee olla numero"
 
 msgid "E1116: \"assert_fails()\" fifth argument must be a string"
-msgstr "E1116: ”assert_fails()”-funktion viidennen argumentin on oltava "
-"merkkijono"
+msgstr ""
+"E1116: ”assert_fails()”-funktion viidennen argumentin on oltava merkkijono"
 
 msgid "E1117: Cannot use ! with nested :def"
 msgstr "E1117: ! ei toimi sisäkkäistetyissä :def-määrittelyissä"
@@ -7874,8 +7718,9 @@ msgstr "E1148: Kohdetta %s ei voi indeksoida"
 
 #, c-format
 msgid "E1149: Script variable is invalid after reload in function %s"
-msgstr "E1149: Skriptimuuttuja on käyttökelvoton uudelleenlatauksen jälkeen "
-"funktiossa %s"
+msgstr ""
+"E1149: Skriptimuuttuja on käyttökelvoton uudelleenlatauksen jälkeen funktiossa "
+"%s"
 
 msgid "E1150: Script variable type changed"
 msgstr "E1150: Skriptimuuttujan tyyppi muuttui"
@@ -7921,12 +7766,13 @@ msgstr "E1162: Rekisterin nimen on oltava yksimerkkinen: %s"
 
 #, c-format
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s"
-msgstr "E1163: Muuttuja %d: tyyppivirhe, odottettiin tyyppiä %s saatiin %s"
+msgstr "E1163: Muuttuja %d: tyyppivirhe, odotettiin tyyppiä %s saatiin %s"
 
 #, c-format
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s in %s"
-msgstr "E1163: Muuttuja %d: tyyppivirhe, odotettiin tyyppiä %s mutta saatiin %s"
-" kohteessa %s"
+msgstr ""
+"E1163: Muuttuja %d: tyyppivirhe, odotettiin tyyppiä %s mutta saatiin %s "
+"kohteessa %s"
 
 msgid "E1164: vim9cmd must be followed by a command"
 msgstr "E1164: vim9cmd:tä pitää seurata komento"
@@ -7940,14 +7786,14 @@ msgstr "E1166: Arvoaluetta ei voi käyttää sanakirjassa"
 
 #, c-format
 msgid "E1167: Argument name shadows existing variable: %s"
-msgstr "E1167: Argumentin nimi varjostaa olemassaolevaa muuttujaa: %s"
+msgstr "E1167: Argumentin nimi varjostaa olemassa olevaa muuttujaa: %s"
 
 #, c-format
 msgid "E1168: Argument already declared in the script: %s"
 msgstr "E1168: Argumentti on jo määritelty tässä skriptissä: %s"
 
 msgid "E1169: 'import * as {name}' not supported here"
-msgstr "E1169: import * as {name] ei toimi täällä"
+msgstr "E1169: import * as {name} ei toimi täällä"
 
 msgid "E1170: Cannot use #{ to start a comment"
 msgstr "E1170: #( ei ole sallittu kommentin alussa"
@@ -7982,8 +7828,8 @@ msgstr "E1178: Ei voi lukita tai avata paikallista muuttujaa"
 
 #, c-format
 msgid ""
-"E1179: Failed to extract PWD from %s, check your shell's config related to "
-"OSC 7"
+"E1179: Failed to extract PWD from %s, check your shell's config related to OSC "
+"7"
 msgstr ""
 "E1179: Ei saatu PWD:tä kohteesta %s, koeta tarkistaa komentoriviasetukset "
 "liittyen OSC 7:ään"
@@ -8043,7 +7889,7 @@ msgid "E1193: cryptmethod xchacha20 not built into this Vim"
 msgstr "E1193: cryptmethod-asetus xchacha20 ei ole mukana tässä Vimissä"
 
 msgid "E1194: Cannot encrypt header, not enough space"
-msgstr "E1194: Ei voida salata otsakkete koska tila ei riitä"
+msgstr "E1194: Ei voida salata otsaketta koska tila ei riitä"
 
 msgid "E1195: Cannot encrypt buffer, not enough space"
 msgstr "E1195: Ei voida salata puskuria, koska tila ei riitä"
@@ -8061,14 +7907,14 @@ msgid "E1199: Cannot decrypt buffer, not enough space"
 msgstr "E1199: Ei voitu purkaa puskuria, koska tila loppui kesken"
 
 msgid "E1200: Decryption failed!"
-msgstr "E1200: Purku epäonnistui"
+msgstr "E1200: Purku epäonnistui."
 
 msgid "E1201: Decryption failed: pre-mature end of file!"
 msgstr "E1201: Purku epäonnistui: tiedosto loppui kesken."
 
 #, c-format
 msgid "E1202: No white space allowed after '%s': %s"
-msgstr "E1202: Välilyöntjeä ei saa olla kohteen %s jälkeen: %s"
+msgstr "E1202: Välilyöntejä ei saa olla kohteen %s jälkeen: %s"
 
 #, c-format
 msgid "E1203: Dot can only be used on a dictionary: %s"
@@ -8090,7 +7936,7 @@ msgid "E1207: Expression without an effect: %s"
 msgstr "E1207: Ilmauksella ei ole vaikutusta: %s"
 
 msgid "E1208: -complete used without allowing arguments"
-msgstr "E1208: -complete ilman argumenttejä"
+msgstr "E1208: -complete ilman argumentteja"
 
 #, c-format
 msgid "E1209: Invalid value for a line number: \"%s\""
@@ -8120,8 +7966,7 @@ msgstr "E1214: Digraafin on oltava tasan kaksi merkkiä: %s"
 msgid "E1215: Digraph must be one character: %s"
 msgstr "E1215: Digraafin pitää olla yksi merkki: %s"
 
-msgid ""
-"E1216: digraph_setlist() argument must be a list of lists with two items"
+msgid "E1216: digraph_setlist() argument must be a list of lists with two items"
 msgstr ""
 "E1216: digraph_setlist()-funktion argumentin pitää olla lista kaksikohtaisia "
 "listoja"
@@ -8144,7 +7989,7 @@ msgstr "E1220: Merkkijono tai numero tarvitaan argumentiksi %d"
 
 #, c-format
 msgid "E1221: String or Blob required for argument %d"
-msgstr "E1221: Merkkijono tai Blob vaaditaan arugmentiksi %d"
+msgstr "E1221: Merkkijono tai Blob vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1222: String or List required for argument %d"
@@ -8152,7 +7997,7 @@ msgstr "E1222: Merkkijono tai lista vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1223: String or Dictionary required for argument %d"
-msgstr "E1223: Merkkijono tai dict vaaditaan argumentiksi %d"
+msgstr "E1223: Merkkijono tai sanakirja vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1224: String, Number or List required for argument %d"
@@ -8160,7 +8005,7 @@ msgstr "E1224: Merkkijono, numero tai lista vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1225: String, List or Dictionary required for argument %d"
-msgstr "E1225: Merkkijono, lista tai dict vaaditaan argumentiksi %d"
+msgstr "E1225: Merkkijono, lista tai sanakirja vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1226: List or Blob required for argument %d"
@@ -8172,11 +8017,11 @@ msgstr "E1227: Lista tai sanakirja vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1228: List, Dictionary or Blob required for argument %d"
-msgstr "E1228: Lista, dict tai blob vaaditaan argumentiksi %d"
+msgstr "E1228: Lista, sanakirja tai blob vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1229: Expected dictionary for using key \"%s\", but got %s"
-msgstr "E1229: Odotettu dict jossa on avain %s mutta tässä on %s"
+msgstr "E1229: Odotettu sanakirja jossa on avain %s mutta tässä on %s"
 
 msgid "E1230: Encryption: sodium_mlock() failed"
 msgstr "E1230: Salaus: sodium_mlock() ei toiminut"
@@ -8204,7 +8049,7 @@ msgstr "E1236: Kohdetta %s ei voi käyttää itseensä, joten se importoidaan"
 
 #, c-format
 msgid "E1237: No such user-defined command in current buffer: %s"
-msgstr "E1237: Käyttähän määrittelemää komentoa ei löydy tästä puskurista: %s"
+msgstr "E1237: Käyttäjän määrittelemää komentoa ei löydy tästä puskurista: %s"
 
 #, c-format
 msgid "E1238: Blob required for argument %d"
@@ -8255,7 +8100,7 @@ msgstr "E1250: Argumentin %s on oltava lista, merkkijono sanakirja tai blob"
 
 #, c-format
 msgid "E1251: List, Dictionary, Blob or String required for argument %d"
-msgstr "E1251: Lista, dict, blob tai merkkijono vaaditaan argumentiksi %d"
+msgstr "E1251: Lista, sanakirja, blob tai merkkijono vaaditaan argumentiksi %d"
 
 #, c-format
 msgid "E1252: String, List or Blob required for argument %d"
@@ -8277,8 +8122,9 @@ msgstr "E1256: Merkkijono tai funktio tarvitaan argumentiksi %d"
 
 #, c-format
 msgid "E1257: Imported script must use \"as\" or end in .vim: %s"
-msgstr "E1257: Tuodun skriptin pitää käyttää komentoa as tai loppua "
-"merkkijonoon .vim: %s"
+msgstr ""
+"E1257: Tuodun skriptin pitää käyttää komentoa as tai loppua merkkijonoon .vim: "
+"%s"
 
 #, c-format
 msgid "E1258: No '.' after imported name: %s"
@@ -8299,14 +8145,13 @@ msgstr "E1261: Ei voida tuoda .vim-tiedostoa ilman komentoa as"
 msgid "E1262: Cannot import the same script twice: %s"
 msgstr "E1262: Ei voida tuoda samaa skriptiä kahdesti: %s"
 
-# TODO: Capitalise first word of message?
 msgid "E1263: Using autoload in a script not under an autoload directory"
 msgstr "E1263: Käytetään autoloadia skriptissä joka ei ole autoload-hakemistossa"
 
 #, c-format
 msgid "E1264: Autoload import cannot use absolute or relative path: %s"
-msgstr "E1264: Autoload-tuonti ei voi käyttää absoluuttista tai "
-"suhteellista polkua: %s"
+msgstr ""
+"E1264: Autoload-tuonti ei voi käyttää absoluuttista tai suhteellista polkua: %s"
 
 msgid "E1265: Cannot use a partial here"
 msgstr "E1265: Partial ei toimi tässä"
@@ -8325,13 +8170,13 @@ msgstr " rivi "
 
 #, c-format
 msgid "Need encryption key for \"%s\""
-msgstr "Tarvitaan salausavain kohteelle %s "
+msgstr "Tarvitaan salausavain kohteelle \"%s\""
 
 msgid "empty keys are not allowed"
 msgstr "tyhjiä avaimia ei voi käyttää"
 
 msgid "dictionary is locked"
-msgstr "dictionary on lukittu"
+msgstr "sanakirja on lukittu"
 
 msgid "list is locked"
 msgstr "luettelo on lukittu"
@@ -8346,7 +8191,7 @@ msgstr "indeksin pitää olla int tai slice, ei %s"
 
 #, c-format
 msgid "expected str() or unicode() instance, but got %s"
-msgstr "odottettiin insanssia tyypeistä str() tai unicode(), ei %s"
+msgstr "odotettiin instanssia tyypeistä str() tai unicode(), ei %s"
 
 #, c-format
 msgid "expected bytes() or str() instance, but got %s"
@@ -8356,8 +8201,8 @@ msgstr "odotettiin instanssia tyypeistä bytes() tai str(), ei %s"
 msgid ""
 "expected int(), long() or something supporting coercing to long(), but got %s"
 msgstr ""
-"odotettiin instanssia tyypeistä int(), long() tai mitä tahansa joka "
-"muuntuisi tyyppiin long(), ei %s"
+"odotettiin instanssia tyypeistä int(), long() tai mitä tahansa joka muuntuisi "
+"tyyppiin long(), ei %s"
 
 #, c-format
 msgid "expected int() or something supporting coercing to int(), but got %s"
@@ -8392,7 +8237,7 @@ msgstr "odotettiin 3-tuplea tuloksena imp.find_module()-kutsulle, ei %s"
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
 msgstr ""
-"odotettiin 3-tuple tuloksnea imp.find_module()-kutsulle, mutta tuplen koko "
+"odotettiin 3-tuple tuloksena imp.find_module()-kutsulle, mutta tuplen koko "
 "onkin %d"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
@@ -8444,8 +8289,7 @@ msgstr "sisäinen virhe: ei voitu lisätä kohtaa listaan"
 
 #, c-format
 msgid "attempt to assign sequence of size %d to extended slice of size %d"
-msgstr ""
-"yritettiin asettaa sekvenssiä jonka koko on %d sliceen jonka koko on %d"
+msgstr "yritettiin asettaa sekvenssiä jonka koko on %d sliceen jonka koko on %d"
 
 msgid "failed to add item to list"
 msgstr "ei voitu lisätä kohtaa listaan"
@@ -8454,7 +8298,7 @@ msgid "cannot delete vim.List attributes"
 msgstr "ei voi poistaa vim.List-attribuutteja"
 
 msgid "cannot modify fixed list"
-msgstr "ei voida muokata kiinitettyä listaa"
+msgstr "ei voida muokata kiinnitettyä listaa"
 
 #, c-format
 msgid "unnamed function %s does not exist"
@@ -8507,7 +8351,7 @@ msgid "attempt to refer to deleted buffer"
 msgstr "yritettiin viitata poistettuun puskuriin"
 
 msgid "failed to rename buffer"
-msgstr "ei voity uudelleennimetä puskuria"
+msgstr "ei voitu nimetä puskuria uudelleen"
 
 msgid "mark name must be a single character"
 msgstr "merkin nimen pitää olla yksi merkki"
@@ -8542,15 +8386,15 @@ msgstr "ei voitu suorittaa koodia"
 
 #, c-format
 msgid "unable to convert %s to a Vim dictionary"
-msgstr "ei voitu konvertoida oliota %s vim-sanakirjaksi"
+msgstr "ei voitu muuntaa oliota %s vim-sanakirjaksi"
 
 #, c-format
 msgid "unable to convert %s to a Vim list"
-msgstr "ei voitu konvertoida tyypistä %s vim-listaksi"
+msgstr "ei voitu muuntaa tyypistä %s vim-listaksi"
 
 #, c-format
 msgid "unable to convert %s to a Vim structure"
-msgstr "ei voi konvertoida oliota %s vim-tietorakenteeksi"
+msgstr "ei voitu muuntaa oliota %s vim-tietorakenteeksi"
 
 msgid "internal error: NULL reference passed"
 msgstr "sisäinen virhe: NULL-viite annettu"
@@ -8644,26 +8488,23 @@ msgstr "(paikallinen puskurille)"
 msgid "(global or local to buffer)"
 msgstr "(globaali tai paikallinen puskuri"
 
-msgid ""
-"\" Each \"set\" line shows the current value of an option (on the left)."
-msgstr ""
-"\" jokainen \"set\"-rivi näyttää asetuksen arvon (vasemmalla)."
+msgid "\" Each \"set\" line shows the current value of an option (on the left)."
+msgstr "\" jokainen \"set\"-rivi näyttää asetuksen arvon (vasemmalla)."
 
 msgid "\" Hit <Enter> on a \"set\" line to execute it."
-msgstr "\" Paina <Enter> \"set\"-rivillä niin se suoritettaan"
+msgstr "\" Paina <Enter> \"set\"-rivillä niin se suoritettaan."
 
 msgid "\"            A boolean option will be toggled."
 msgstr "\"            totuusarvoa muutetaan."
 
 msgid ""
-"\"            For other options you can edit the value before hitting "
-"<Enter>."
+"\"            For other options you can edit the value before hitting <Enter>."
 msgstr ""
 "\"            Muita asetuksia voi muokata ennen <Enter>-napin painamista."
 
 msgid "\" Hit <Enter> on a help line to open a help window on this option."
-msgstr "\" Painamalla <Enter>-näppäintä ohjerivillä avataan ohjeikkuna "
-"asetukselle."
+msgstr ""
+"\" Painamalla <Enter>-näppäintä ohjerivillä avataan ohjeikkuna asetukselle."
 
 msgid "\" Hit <Enter> on an index line to jump there."
 msgstr "\" Painamalla <Enter>-näppäintä siirrytään kohteeseen."
@@ -8684,13 +8525,13 @@ msgid "use Insert mode as the default mode"
 msgstr "käytä syöttötilaa oletuksena"
 
 msgid "paste mode, insert typed text literally"
-msgstr "liittämistila, lisää kirjoitetunt tekstin sellaisenaan"
+msgstr "liittämistila, lisää kirjoitetun tekstin sellaisenaan"
 
 msgid "key sequence to toggle paste mode"
 msgstr "näppäinyhdistelmä jolla siirrytään liittämistilaan ja pois"
 
 msgid "list of directories used for runtime files and plugins"
-msgstr "hakemistot joita käytetään ajonaikaisiin tiesotoihin ja liitännäisiin"
+msgstr "hakemistot joita käytetään ajonaikaisiin tieostoihin ja liitännäisiin"
 
 msgid "list of directories used for plugin packages"
 msgstr "hakemistot joita käytetään liitännäispaketeille"
@@ -8781,14 +8622,14 @@ msgid ""
 "how to handle case when searching in tags files:\n"
 "\"followic\" to follow 'ignorecase', \"ignore\" or \"match\""
 msgstr ""
-"miten merkkitasot käsitellän tägitiedostoissa:\n"
+"miten merkkitasot käsitellään tägitiedostoissa:\n"
 "followic (toimii kuin ignorecase), ignore tai match"
 
 msgid "file names in a tags file are relative to the tags file"
 msgstr "tiedostonimet tägitiedostossa ovat suhteellisia tiedostoon"
 
 msgid "a :tag command will use the tagstack"
-msgstr ":tag-koento käyttää tägipinoa"
+msgstr ":tag-komento käyttää tägipinoa"
 
 msgid "when completing tags in Insert mode show more info"
 msgstr "kun tägejä täydennetään lisäystilassa näytä lisää tietoja"
@@ -8803,7 +8644,7 @@ msgid "use cscope for tag commands"
 msgstr "käytä cscope-tägikomentoja"
 
 msgid "0 or 1; the order in which \":cstag\" performs a search"
-msgstr "0 tai 1, missä järjestyksess :cstag tekee haun"
+msgstr "0 tai 1, missä järjestyksessä :cstag tekee haun"
 
 msgid "give messages when adding a cscope database"
 msgstr "anna viestejä kun lisätään cscope-tietokantaan"
@@ -8812,7 +8653,7 @@ msgid "how many components of the path to show"
 msgstr "montako komponenttia polusta näytetään"
 
 msgid "when to open a quickfix window for cscope"
-msgstr "milloin avatan quickfix-ikkuna cscopelle"
+msgstr "milloin avataan quickfix-ikkuna cscopelle"
 
 msgid "file names in a cscope file are relative to that file"
 msgstr "tiedostonimet cscope-tiedostossa ovat suhteellisia"
@@ -8876,8 +8717,8 @@ msgid "don't redraw while executing macros"
 msgstr "ei uudelleenpiirtoa makroja suoritettaessa"
 
 msgid "timeout for 'hlsearch' and :match highlighting in msec"
-msgstr "aikakatkaisu komennoille hlsearch ja :match korostettaessa "
-"millisekunneissa"
+msgstr ""
+"aikakatkaisu komennoille hlsearch ja :match korostettaessa millisekunneissa"
 
 msgid ""
 "delay in msec for each char written to the display\n"
@@ -9018,8 +8859,7 @@ msgstr "älä poista puskuria muistista vaikka se ei näy enää ikkunassa"
 msgid ""
 "\"useopen\" and/or \"split\"; which window to use when jumping\n"
 "to a buffer"
-msgstr ""
-"useopen ja tai split, mihin ikkunaan siirrytään puskurin siirrossa"
+msgstr "useopen ja tai split, mihin ikkunaan siirrytään puskurin siirrossa"
 
 msgid "a new window is put below the current one"
 msgstr "uusi ikkuna pannaan nykyisen alle"
@@ -9034,8 +8874,8 @@ msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
 msgstr "ver, hor ja tai jump, arvot asetukselle scrollbind"
 
 msgid "this window's cursor moves together with other bound windows"
-msgstr "tämän ikkunan kursori liikkuu yhdessä muiden liitettyjen ikkunoiden "
-"kanssa"
+msgstr ""
+"tämän ikkunan kursori liikkuu yhdessä muiden liitettyjen ikkunoiden kanssa"
 
 msgid "size of a terminal window"
 msgstr "terminaali-ikkunan koko"
@@ -9059,16 +8899,16 @@ msgid "0, 1 or 2; when to use a tab pages line"
 msgstr "0, 1 tai 2, milloin tabit näytetään rivillä"
 
 msgid "maximum number of tab pages to open for -p and \"tab all\""
-msgstr "enimmäimäärä tabisivuja avattaessa -p ja tab all"
+msgstr "enimmäismäärä tabisivuja avattaessa -p ja tab all"
 
 msgid "custom tab pages line"
 msgstr "mukautettu välilehtirivi"
 
 msgid "custom tab page label for the GUI"
-msgstr "mukautetta tabisivun nimi GUIlle"
+msgstr "mukautettu tabisivun nimi GUIlle"
 
 msgid "custom tab page tooltip for the GUI"
-msgstr "mukautette tabisivun ponnahdusohje GUIlle"
+msgstr "mukautettu tabisivun ponnahdusohje GUIlle"
 
 msgid "terminal"
 msgstr "terminaali"
@@ -9089,7 +8929,7 @@ msgid "request terminal key codes when an xterm is detected"
 msgstr "kutsu terminaalikoodit kun xterm on havaittu"
 
 msgid "terminal that requires extra redrawing"
-msgstr "terminaali joka tarviaa enemmän uudelleenpiirtämistä"
+msgstr "terminaali joka tarvitsee enemmän uudelleenpiirtämistä"
 
 msgid "recognize keys that start with <Esc> in Insert mode"
 msgstr "tunnista näppäimet jotka alkavat merkillä <Esc> syöttötilassa"
@@ -9162,7 +9002,7 @@ msgid "list of font names to be used in the GUI"
 msgstr "fonttinimet joita käytetään GUIssa"
 
 msgid "pair of fonts to be used, for multibyte editing"
-msgstr "Fonttipari monitavuiselle muokkaukselle"
+msgstr "fonttipari monitavuiselle muokkaukselle"
 
 msgid "list of font names to be used for double-wide characters"
 msgstr "fonttinimet joita käytetään kaksoisleveille merkeille"
@@ -9192,10 +9032,8 @@ msgid "use a pseudo-tty for I/O to external commands"
 msgstr "käytä pseudo-tty:tä ulkoisten komentojen syötteeseen ja tulosteeseen"
 
 msgid ""
-"\"last\", \"buffer\" or \"current\": which directory used for the file "
-"browser"
-msgstr ""
-"last, buffer tai current, mitä hakemistoa käytetään tiedostoselaimessa"
+"\"last\", \"buffer\" or \"current\": which directory used for the file browser"
+msgstr "last, buffer tai current, mitä hakemistoa käytetään tiedostoselaimessa"
 
 msgid "language to be used for the menus"
 msgstr "valikkojen kieli"
@@ -9225,7 +9063,7 @@ msgid "printing"
 msgstr "tulostus"
 
 msgid "list of items that control the format of :hardcopy output"
-msgstr "asetukset jotka määrittävät :hardcopu-tulostusta"
+msgstr "asetukset jotka määrittävät :hardcopy-tulostusta"
 
 msgid "name of the printer to be used for :hardcopy"
 msgstr "tulostin jota asetetaan :hardcopy-komennolle"
@@ -9240,10 +9078,10 @@ msgid "format of the header used for :hardcopy"
 msgstr "otsakkeen muoto :hardcopy-komennolle"
 
 msgid "encoding used to print the PostScript file for :hardcopy"
-msgstr "koodaus jota käytetään kommenon :hardcopy postscript-tiedostossa"
+msgstr "koodaus jota käytetään komimenon :hardcopy postscript-tiedostossa"
 
 msgid "the CJK character set to be used for CJK output from :hardcopy"
-msgstr "CJK-merkisttö CJK-tulosteelle :hardcopy-komennossa"
+msgstr "CJK-merkistö CJK-tulosteelle :hardcopy-komennossa"
 
 msgid "list of font names to be used for CJK output from :hardcopy"
 msgstr "fontit joita käytetään CJK-tulosteelle :hardcopy-komennossa"
@@ -9267,7 +9105,7 @@ msgid "show cursor position below each window"
 msgstr "näytä kursori jokaisen ikkunan alla"
 
 msgid "alternate format to be used for the ruler"
-msgstr "vaihtele viivottimeen muotoa"
+msgstr "vaihtoehtoinen viivoittimen muotoa"
 
 msgid "threshold for reporting number of changed lines"
 msgstr "kynnys muuttuneiden rivien ilmoittamiselle"
@@ -9300,7 +9138,7 @@ msgid "selecting text"
 msgstr "tekstin valinta"
 
 msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
-msgstr "old inclusive tai exclusive, miten tekstin valinta toimii"
+msgstr "old, inclusive tai exclusive, miten tekstin valinta toimii"
 
 msgid ""
 "\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
@@ -9326,13 +9164,14 @@ msgid "maximum number of changes that can be undone"
 msgstr "enimmäismäärä muutoksia jotka voidaan perua"
 
 msgid "automatically save and restore undo history"
-msgstr "automaattisest tallenna ja palauta perumishistoria"
+msgstr "tallenna ja palauta perumishistoria automaattisesti"
 
 msgid "list of directories for undo files"
 msgstr "hakemistot perumistiedostoille"
 
 msgid "maximum number lines to save for undo on a buffer reload"
-msgstr "enimmäismäärä rivejä jotka tallenetaan perumista varten puskurin "
+msgstr ""
+"enimmäismäärä rivejä jotka tallennetaan perumista varten puskurin "
 "uudelleenavaukselle"
 
 msgid "changes have been made and not written to a file"
@@ -9354,20 +9193,20 @@ msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
 msgstr "määrittää mitä <BS>, CTRL-W jne. voi tehdä syöttötilassa"
 
 msgid "definition of what comment lines look like"
-msgstr "määrittää miltä kommentirivit näyttävät"
+msgstr "määrittää miltä kommenttirivit näyttävät"
 
 msgid "list of flags that tell how automatic formatting works"
-msgstr "asetukset joiden mukaan automaattinen formatointi toimii"
+msgstr "asetukset joiden mukaan automaattinen muotoilu toimii"
 
 msgid "pattern to recognize a numbered list"
 msgstr "kuvio jolla numeroidut rivit tunnistetaan"
 
 msgid "expression used for \"gq\" to format lines"
-msgstr "ilmaus jolla gq formatoi rivejä"
+msgstr "ilmaus jolla gq muotoilee rivejä"
 
 msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
-msgstr "määrittää miten syöttötilantäydennys toimii näppäiyille "
-"CTRL-N ja CTRL-P"
+msgstr ""
+"määrittää miten syöttötilantäydennys toimii näppäilyille CTRL-N ja CTRL-P"
 
 msgid "whether to use a popup menu for Insert mode completion"
 msgstr "käytetäänkö ponnahdusvalikkoa syöttötilantäydennyksessä"
@@ -9400,10 +9239,10 @@ msgid "adjust case of a keyword completion match"
 msgstr "vaihda merkkitasoa avainsanatäydennystäsmäykselle"
 
 msgid "enable entering digraphs with c1 <BS> c2"
-msgstr "mahdollista digraafit  näppäilemällä c1 <BS> c2"
+msgstr "mahdollista digraafit näppäilemällä c1 <BS> c2"
 
 msgid "the \"~\" command behaves like an operator"
-msgstr "komento ~ toimii kuin operaattor"
+msgstr "komento ~ toimii kuin operaattori"
 
 msgid "function called for the \"g@\" operator"
 msgstr "funktio jota g@-operaattori kutsuu"
@@ -9467,7 +9306,7 @@ msgid "options for C-indenting"
 msgstr "C-sisennysasetukset"
 
 msgid "keys that trigger C-indenting in Insert mode"
-msgstr "näppäimet joiden mukaan C-sisenns toimii syöttötilassa"
+msgstr "näppäimet joiden mukaan C-sisennys toimii syöttötilassa"
 
 msgid "list of words that cause more C-indent"
 msgstr "sanat jotka aiheuttavat C-sisennyksen"
@@ -9476,8 +9315,8 @@ msgid "expression used to obtain the indent of a line"
 msgstr "ilmaus jolla selvitetään rivin sisennys"
 
 msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
-msgstr "näppäimet jotka käynnistävät siennyksen indentexpr-asetuksen "
-"syöttötilassa"
+msgstr ""
+"näppäimet jotka käynnistävät sisennyksen indentexpr-asetuksen syöttötilassa"
 
 msgid "copy whitespace for indenting from previous line"
 msgstr "kopioi tyhjeet sisennystä varten edelliseltä riviltä"
@@ -9628,7 +9467,7 @@ msgid "whether to make the backup as a copy or rename the existing file"
 msgstr "tehdäänkö varmuuskopio kopioimalla tai uudelleennimeämällä"
 
 msgid "list of directories to put backup files in"
-msgstr "hakemistot joiin varmuuskopiot lisätään"
+msgstr "hakemistot joihin varmuuskopiot lisätään"
 
 msgid "file name extension for the backup file"
 msgstr "tiedostonimenlopuke varmuuskopiolle"
@@ -9664,7 +9503,7 @@ msgid "list of directories for the swap file"
 msgstr "hakemistot swap-tiedostolle"
 
 msgid "use a swap file for this buffer"
-msgstr "kätä swap-tiedostoa tälle puskurille"
+msgstr "käytä swap-tiedostoa tälle puskurille"
 
 msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
 msgstr "sync, fsync tai tyhjä, miten heittovaihtotiedosto siirretään levylle"
@@ -9700,7 +9539,7 @@ msgid "empty or \"tagfile\" to list file name of matching tags"
 msgstr "tyhjä tai tagfile, tiedostonimi tägejä varten"
 
 msgid "list of file name extensions that have a lower priority"
-msgstr "tiedostnimipäätteet joilla on matalampi prioriteetti"
+msgstr "tiedostonimipäätteet joilla on matalampi prioriteetti"
 
 msgid "list of file name extensions added when searching for a file"
 msgstr "tiedostonimipäätteet joista etsitään tiedostoja"
@@ -9739,7 +9578,7 @@ msgid "like 'shellquote' but include the redirection"
 msgstr "kuten shellquote mutta uudelleenohjaus sisältyy"
 
 msgid "characters to escape when 'shellxquote' is ("
-msgstr "merkit jotka lainaataan kun shellxquote on ("
+msgstr "merkit jotka lainataan kun shellxquote on ("
 
 msgid "argument for 'shell' to execute a command"
 msgstr "argumentti komennolle shell komennon suorittamiseen"
@@ -9754,7 +9593,7 @@ msgid "program used for \"=\" command"
 msgstr "komento komennolle ="
 
 msgid "program used to format lines with \"gq\" command"
-msgstr "ohjelma jolla formatoidaan gq-rivit"
+msgstr "ohjelma jolla muotoillaan gq-rivit"
 
 msgid "program used for the \"K\" command"
 msgstr "ohjelma komennolle K"
@@ -9796,10 +9635,10 @@ msgid "system specific"
 msgstr "järjestelmäspesifit"
 
 msgid "use forward slashes in file names; for Unix-like shells"
-msgstr "käytä vinoviivoja teidostonimissä, unix-tyyppisille komentoriveille"
+msgstr "käytä vinoviivoja tiedostonimissä, unix-tyyppisille komentoriveille"
 
 msgid "specifies slash/backslash used for completion"
-msgstr "määrit vinoviiva/takakenoviiv täydennykselle"
+msgstr "määritä vinoviiva/takakenoviiva täydennykselle"
 
 msgid "language specific"
 msgstr "kielispesifi"
@@ -9814,7 +9653,7 @@ msgid "specifies the characters in a keyword"
 msgstr "määritä avainsanan merkit"
 
 msgid "specifies printable characters"
-msgstr "määrittää tulostettavat merkti"
+msgstr "määrittää tulostettavat merkit"
 
 msgid "specifies escape characters in a string"
 msgstr "määritä lainausmerkit merkkijonossa"
@@ -9856,7 +9695,7 @@ msgid "list of characters that are translated in Normal mode"
 msgstr "merkit jotka käännetään normaalitilassa"
 
 msgid "apply 'langmap' to mapped characters"
-msgstr "suorita langmap kuvatuile merkeille"
+msgstr "suorita langmap kuvatuille merkeille"
 
 msgid "when set never use IM; overrules following IM options"
 msgstr "kun IM on pois käytöstä, ohittaa IM-asetukset"
@@ -9933,7 +9772,7 @@ msgid "load plugin scripts when starting up"
 msgstr "lataa liitännäisskriptit alussa"
 
 msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
-msgstr "lue .vimrc/.exrc/.gvimrc nykyisestä hakemistostsa"
+msgstr "lue .vimrc/.exrc/.gvimrc nykyisestä hakemistosta"
 
 msgid "safer working with script files in the current directory"
 msgstr "turvallisempi tila skripteille nykyisessä hakemistossa"
@@ -10002,7 +9841,7 @@ msgid "name of the Python 3 dynamic library"
 msgstr "Python 3:n dynaamisen kirjaston nimi"
 
 msgid "name of the Python 3 home directory"
-msgstr "Python 3:n kotihakemist"
+msgstr "Python 3:n kotihakemisto"
 
 msgid "name of the Ruby dynamic library"
 msgstr "Rubyn dynaamisen kirjaston nimi"
diff --git a/src/po/sr.po b/src/po/sr.po
index aeed5d04d..1a6a33307 100644
--- a/src/po/sr.po
+++ b/src/po/sr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Serbian)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-02 10:20+0400\n"
-"PO-Revision-Date: 2023-02-02 10:54+0400\n"
+"POT-Creation-Date: 2023-05-02 14:10+0400\n"
+"PO-Revision-Date: 2023-05-02 14:54+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: Serbian\n"
 "Language: sr\n"
@@ -132,7 +132,7 @@ msgstr "[само за читање]"
 msgid "%ld line --%d%%--"
 msgid_plural "%ld lines --%d%%--"
 msgstr[0] "%ld линија --%d%%--"
-msgstr[1] "%ld линијe --%d%%--"
+msgstr[1] "%ld линије --%d%%--"
 msgstr[2] "%ld линија --%d%%--"
 
 #, c-format
@@ -160,6 +160,10 @@ msgstr "Дно"
 msgid "Top"
 msgstr "Врх"
 
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
 msgid "[Prompt]"
 msgstr "[Одзив]"
 
@@ -271,6 +275,30 @@ msgstr "Кључеви нису исти!"
 msgid "[crypted]"
 msgstr "[шифровано]"
 
+#, c-format
+msgid "xchacha20v2: using custom opslimit \"%llu\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи произвољни opslimit „%llu”."
+
+#, c-format
+msgid "xchacha20v2: using default opslimit \"%llu\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи подразумевани opslimit „%llu”."
+
+#, c-format
+msgid "xchacha20v2: using custom memlimit \"%lu\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи произвољни memlimit „%lu”."
+
+#, c-format
+msgid "xchacha20v2: using default memlimit \"%lu\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи подразумевани memlimit „%lu”."
+
+#, c-format
+msgid "xchacha20v2: using custom algorithm \"%d\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи произвољни алгоритам „%d”."
+
+#, c-format
+msgid "xchacha20v2: using default algorithm \"%d\" for Key derivation."
+msgstr "xchacha20v2: за извођење кључа се користи подразумевани алгоритам „%d”."
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Улазак у Debug режим.  Откуцајте „cont” за наставак."
 
@@ -449,7 +477,7 @@ msgstr "> %d, Хекс %08x, Октално %o"
 msgid "%ld line moved"
 msgid_plural "%ld lines moved"
 msgstr[0] "%ld линија премештена"
-msgstr[1] "%ld линијe премештено"
+msgstr[1] "%ld линије премештено"
 msgstr[2] "%ld линија премештена"
 
 #, c-format
@@ -751,7 +779,7 @@ msgstr "[unix формат]"
 msgid "%ld line, "
 msgid_plural "%ld lines, "
 msgstr[0] "%ld линија, "
-msgstr[1] "%ld линијe, "
+msgstr[1] "%ld линије, "
 msgstr[2] "%ld линија, "
 
 #, c-format
@@ -828,14 +856,14 @@ msgstr "нема подударања"
 msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld линија подвијена"
-msgstr[1] "+--%3ld линијe подвијене"
+msgstr[1] "+--%3ld линије подвијене"
 msgstr[2] "+--%3ld линија подвијено"
 
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
 msgstr[0] "+-%s%3ld линија: "
-msgstr[1] "+-%s%3ld линијe: "
+msgstr[1] "+-%s%3ld линије: "
 msgstr[2] "+-%s%3ld линија: "
 
 msgid "No match at cursor, finding next"
@@ -1568,7 +1596,7 @@ msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tDiff режим (као „vimdiff”)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tЈедноставни режим (као „evim”, безрежимни)"
+msgstr "-y\t\t\tЈедноставни режим (као „evim”, безрежимски)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tСамо-за-читање режим (као „view”)"
@@ -1971,6 +1999,9 @@ msgstr "??? одавде па до ???КРАЈ линије су можда за
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? одавде па до ???КРАЈ линије су можда уметане/брисане"
 
+msgid "??? lines may be missing"
+msgstr "??? можда недостају линије"
+
 msgid "???END"
 msgstr "???КРАЈ"
 
@@ -2640,7 +2671,7 @@ msgid "Switching to backtracking RE engine for pattern: "
 msgstr "Пребацивање на РИ механизам са погледом уназад за шаблон: "
 
 msgid "External submatches:\n"
-msgstr "Спољна подподударања:\n"
+msgstr "Спољна потподударања:\n"
 
 msgid "Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
@@ -2767,13 +2798,13 @@ msgid "continuing in %s"
 msgstr "наставља се у %s"
 
 msgid "modeline"
-msgstr "режимске линијe (modeline)"
+msgstr "режимске линије (modeline)"
 
 msgid "--cmd argument"
-msgstr "--cmd аргументa"
+msgstr "--cmd аргумент"
 
 msgid "-c argument"
-msgstr "-c аргументa"
+msgstr "-c аргумент"
 
 msgid "environment variable"
 msgstr "променљиве окружења"
@@ -4923,16 +4954,16 @@ msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
 msgstr "E316: ml_get: Линија %ld у баферу %d не може да се пронађе %s"
 
 msgid "E317: Pointer block id wrong"
-msgstr "E317: Ид показивача блока је погрешан"
+msgstr "E317: Ид блока показивача је погрешан"
 
 msgid "E317: Pointer block id wrong 2"
-msgstr "E317: Ид показивача блока је погрешан 2"
+msgstr "E317: Ид блока показивача је погрешан 2"
 
 msgid "E317: Pointer block id wrong 3"
-msgstr "E317: Ид показивача блока је погрешан 3"
+msgstr "E317: Ид блока показивача је погрешан 3"
 
 msgid "E317: Pointer block id wrong 4"
-msgstr "E317: Ид показивача блока је погрешан 4"
+msgstr "E317: Ид блока показивача је погрешан 4"
 
 msgid "E318: Updated too many blocks?"
 msgstr "E318: Освежено превише блокова?"
@@ -5020,7 +5051,7 @@ msgid ""
 "followed by '%s'."
 msgstr ""
 "E343: Неисправна путања: ’**[број]’ мора бити на крају путање или да иза "
-"њега следи '%s'."
+"њега следи ’%s’."
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -5474,7 +5505,7 @@ msgid "E472: Command failed"
 msgstr "E472: Команда није успела"
 
 msgid "E473: Internal error in regexp"
-msgstr "E473: Интерна грешкау регуларном изразу"
+msgstr "E473: Интерна грешка у регуларном изразу"
 
 msgid "E474: Invalid argument"
 msgstr "E474: Неважећи аргумент"
@@ -5498,6 +5529,10 @@ msgstr "E476: Неважећа команда"
 msgid "E476: Invalid command: %s"
 msgstr "E476: Неважећа команда: %s"
 
+#, c-format
+msgid "E476: Invalid command: %s, expected %s"
+msgstr "E476: Неважећа команда: %s, очекује се %s"
+
 msgid "E477: No ! allowed"
 msgstr "E477: ! није дозвољен"
 
@@ -6471,7 +6506,7 @@ msgid "E789: Missing ']': %s"
 msgstr "E789: Недостаје ’]’: %s"
 
 msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undojoin ије дозвољен након undo"
+msgstr "E790: undojoin није дозвољен након undo"
 
 msgid "E791: Empty keymap entry"
 msgstr "E791: Празна keymap ставка"
@@ -6777,8 +6812,8 @@ msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
 msgstr ""
-"E875: (НКА регуларни израз) (Док је вршена конверзија из постфикног облика у "
-"НКА), превише стања је остало на стеку"
+"E875: (НКА регуларни израз) (Док је вршена конверзија из постфиксног облика "
+"у НКА), превише стања је остало на стеку"
 
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA"
 msgstr ""
@@ -6956,9 +6991,6 @@ msgstr "E920: _io фајл захтева да _name буде постављен
 msgid "E921: Invalid callback argument"
 msgstr "E921: Неисправан callback аргумент"
 
-msgid "E922: Expected a dict"
-msgstr "E922: Очекивао се dict"
-
 msgid "E923: Second argument of function() must be a list or a dict"
 msgstr "E923: Други аргумент function() мора бити list или dict"
 
@@ -7467,7 +7499,7 @@ msgid "E1063: Type mismatch for v: variable"
 msgstr "E1063: Неодговарајући тип за v: променљиву"
 
 msgid "E1064: Yank register changed while using it"
-msgstr "E1064: Регистар тргања је изменен док се користио"
+msgstr "E1064: Регистар тргања је измењен док се користио"
 
 #, c-format
 msgid "E1065: Command cannot be shortened: %s"
@@ -7616,10 +7648,6 @@ msgid "E1107: String, List, Dict or Blob required"
 msgstr "E1107: Потребан је Стринг Листа, Речн или Блоб"
 
 #, c-format
-msgid "E1108: Item not found: %s"
-msgstr "E1108: Ставка није пронађена: %s"
-
-#, c-format
 msgid "E1109: List item %d is not a List"
 msgstr "E1109: Ставка листе %d није Листа"
 
@@ -7758,7 +7786,7 @@ msgstr "E1148: %s не може да се индексира"
 #, c-format
 msgid "E1149: Script variable is invalid after reload in function %s"
 msgstr ""
-"E1149: Скрипт променљива више важи након поновног учитавања у функцији %s"
+"E1149: Скрипт променљива више не важи након поновног учитавања у функцији %s"
 
 msgid "E1150: Script variable type changed"
 msgstr "E1150: Тип скрипт променљиве се променио"
@@ -7927,7 +7955,7 @@ msgid "E1192: Empty function name"
 msgstr "E1192: Празно име функције"
 
 msgid "E1193: cryptmethod xchacha20 not built into this Vim"
-msgstr "E1193: метода шифрирања xchacha20 није уграђена у овај Vim"
+msgstr "E1193: xchacha20 метода шифровања није уграђена у овај Vim"
 
 msgid "E1194: Cannot encrypt header, not enough space"
 msgstr "E1194: Заглавље не може да се шифрира, нема довољно простора"
@@ -8143,10 +8171,6 @@ msgstr "E1251: За аргумент %d се захтева Листа, Речн
 msgid "E1252: String, List or Blob required for argument %d"
 msgstr "E1252: За аргумент %d се захтева Стринг, Листа или Блоб"
 
-#, c-format
-msgid "E1253: String expected for argument %d"
-msgstr "E1253: За аргумент %d се очекује Стринг"
-
 msgid "E1254: Cannot use script variable in for loop"
 msgstr "E1254: У for петљи не може да се користи скрипт променљива"
 
@@ -8155,7 +8179,7 @@ msgstr "E1255: <Cmd> мапирање мора да се заврши са <CR>"
 
 #, c-format
 msgid "E1256: String or function required for argument %d"
-msgstr "E1256: За аргумент %d је потребан Стринг или фунцкија"
+msgstr "E1256: За аргумент %d је потребан Стринг или функција"
 
 #, c-format
 msgid "E1257: Imported script must use \"as\" or end in .vim: %s"
@@ -8272,7 +8296,7 @@ msgstr "E1285: Тајмаут није могао да се обрише: %s"
 
 #, c-format
 msgid "E1286: Could not set timeout: %s"
-msgstr "E1286: Тајм аут није могао да се постави: %s"
+msgstr "E1286: Тајмаут није могао да се постави: %s"
 
 #, c-format
 msgid "E1287: Could not set handler for timeout: %s"
@@ -8436,7 +8460,7 @@ msgstr "E1331: Након Public мора да следи „this” или „s
 
 #, c-format
 msgid "E1332: Public member name cannot start with underscore: %s"
-msgstr "E1332: Име Public члана не може почити доњом цртом: %s"
+msgstr "E1332: Име Public члана не може почети доњом цртом: %s"
 
 #, c-format
 msgid "E1333: Cannot access private member: %s"
@@ -8459,14 +8483,14 @@ msgstr "E1337: Није пронађен члан класе: %s"
 
 #, c-format
 msgid "E1338: Member not found on class \"%s\": %s"
-msgstr "E1338: Није шронаћен члан над класом „%s”: %s"
+msgstr "E1338: Није пронађен члан класе „%s”: %s"
 
 msgid ""
 "E1339: Cannot add a textprop with text after using a textprop with a "
 "negative id"
 msgstr ""
-"E1339: Текст особина са текстом не може да се додан након употребе "
-"текст особине са негативним id"
+"E1339: Текст особина са текстом не може да се дода након употребе текст "
+"особине са негативним id"
 
 #, c-format
 msgid "E1340: Argument already declared in the class: %s"
@@ -8540,9 +8564,20 @@ msgstr "E1358: „super” се не користи у изведеној кла
 msgid "E1359: Cannot define a \"new\" function in an abstract class"
 msgstr "E1359: Функција „new” не може да се дефинише у апстрактној класи"
 
-#, c-format
-msgid "E476: Invalid command: %s, expected %s"
-msgstr "E476: Неважећа команда: %s, очекује се %s"
+msgid "E1360: Using a null object"
+msgstr "E1360: Користи се null објекат"
+
+msgid "E1361: Cannot use color \"none\", did you mean \"NONE\"?"
+msgstr "E1361: Не може да се користи боја „none”, да ли сте мислили на „NONE”?"
+
+msgid "E1362: Cannot use a non-null object"
+msgstr "E1362: Не може да се користи објекат који није null"
+
+msgid "E1363: Incomplete type"
+msgstr "E1363: Тип није комплетан"
+
+msgid "E1364: Warning: Pointer block corrupted"
+msgstr "E1364: Упозорење: Блок показивача је покварен"
 
 msgid "--No lines in buffer--"
 msgstr "--У баферу нема линија--"
@@ -9540,10 +9575,12 @@ msgid "list of flags to make messages shorter"
 msgstr "листа заставица за скраћивање порука"
 
 msgid "show (partial) command keys in location given by 'showcmdloc'"
-msgstr "приказује (делимичне) тастере команде на месту наведеном у 'showcmdloc'"
+msgstr ""
+"приказује (делимичне) тастере команде на месту наведеном у 'showcmdloc'"
 
 msgid "location where to show the (partial) command keys for 'showcmd'"
-msgstr "место на којем треба да се прикажу (делимични) тастери команде за 'showcmd'"
+msgstr ""
+"место на којем треба да се прикажу (делимични) тастери команде за 'showcmd'"
 
 msgid "display the current mode in the status line"
 msgstr "у статусној линији се приказује текући режим"
@@ -10239,7 +10276,7 @@ msgid "width of ambiguous width characters"
 msgstr "ширина карактера двосмислене ширине"
 
 msgid "emoji characters are full width"
-msgstr "имоџи карактери су пуне ширине"
+msgstr "емођи карактери су пуне ширине"
 
 msgid "various"
 msgstr "разно"
diff --git a/src/po/tr.po b/src/po/tr.po
index 4df99ecfe..5a0547360 100644
--- a/src/po/tr.po
+++ b/src/po/tr.po
@@ -1,15 +1,15 @@
 # Turkish translations for Vim
 # Vim Türkçe çevirileri
-# Copyright (C) 2019-2022 Emir SARI <emir_sari@icloud.com>
+# Copyright (C) 2019-2023 Emir SARI <emir_sari@icloud.com>
 # This file is distributed under the same license as the Vim package.
-# Emir SARI <emir_sari@icloud.com>, 2019-2022
+# Emir SARI <emir_sari@icloud.com>, 2019-2023
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-09 13:10+0300\n"
-"PO-Revision-Date: 2022-06-09 13:15+0300\n"
+"POT-Creation-Date: 2023-04-29 20:31+0300\n"
+"PO-Revision-Date: 2023-04-29 21:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <https://github.com/bitigchi/vim>\n"
 "Language: tr\n"
@@ -125,12 +125,12 @@ msgstr "[saltokunur]"
 #, c-format
 msgid "%ld line --%d%%--"
 msgid_plural "%ld lines --%d%%--"
-msgstr[0] "%ld. satır --%d%%"
-msgstr[1] "%ld. satır --%d%%"
+msgstr[0] "%ld. satır --%%%d"
+msgstr[1] "%ld. satır --%%%d"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
-msgstr "satır %ld/%ld --%d%%-- sütun "
+msgstr "satır %ld/%ld --%%%d-- sütun "
 
 msgid "[No Name]"
 msgstr "[Adsız]"
@@ -153,6 +153,10 @@ msgstr "Son"
 msgid "Top"
 msgstr "Baş"
 
+#, c-format
+msgid "%d%%"
+msgstr "%%%d"
+
 msgid "[Prompt]"
 msgstr "[İstem]"
 
@@ -267,6 +271,35 @@ msgstr "Anahtarlar eşleşmiyor!"
 msgid "[crypted]"
 msgstr "[şifreli]"
 
+#, c-format
+msgid "xchacha20v2: using custom opslimit \"%llu\" for Key derivation."
+msgstr "xchacha20v2: Anahtar türetimi için özel işlem sınırı \"%llu\" "
+"kullanılıyor"
+
+#, c-format
+msgid "xchacha20v2: using default opslimit \"%llu\" for Key derivation."
+msgstr "xchacha20v2: Anahtar türetimi için öntanımlı işlem sınırı \"%llu\" "
+"kullanılıyor"
+
+#, c-format
+msgid "xchacha20v2: using custom memlimit \"%lu\" for Key derivation."
+msgstr "xchacha20v2: Anahtar türetimi için özel bellek sınırı \"%lu\" "
+"kullanılıyor"
+
+#, c-format
+msgid "xchacha20v2: using default memlimit \"%lu\" for Key derivation."
+msgstr ""
+"xchacha20v2: Anahtar türetimi için öntanımlı memlimit \"%lu\" kullanılıyor"
+
+#, c-format
+msgid "xchacha20v2: using custom algorithm \"%d\" for Key derivation."
+msgstr "xchacha20v2: Anahtar türetimi için özel algoritma \"%d\" kullanılıyor"
+
+#, c-format
+msgid "xchacha20v2: using default algorithm \"%d\" for Key derivation."
+msgstr "xchacha20v2: Anahtar türetimi için öntanımlı algoritma \"%d\" "
+"kullanılıyor"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Hata ayıklama kipine giriliyor. Sürdürmek için \"cont\" yazın."
 
@@ -1310,9 +1343,6 @@ msgstr " Yazım önerisi (s^N^P)"
 msgid " Keyword Local completion (^N^P)"
 msgstr " Dahili anahtar sözcük tamamlaması (^N^P)"
 
-msgid "Hit end of paragraph"
-msgstr "Paragrafın sonuna varıldı"
-
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' seçeneği boş"
 
@@ -1345,6 +1375,12 @@ msgstr " Ekleniyor"
 msgid "-- Searching..."
 msgstr "-- Aranıyor..."
 
+msgid "Hit end of paragraph"
+msgstr "Paragrafın sonuna varıldı"
+
+msgid "Pattern not found"
+msgstr "Dizgi bulunamadı"
+
 msgid "Back at original"
 msgstr "Başlangıca geri dönüldü"
 
@@ -1599,6 +1635,9 @@ msgstr "-T <uçbirim>\t\tUçbirim türünü <uçbirim>'e ayarla"
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr "--not-a-term\t\tGirdi-çıktının bir uçbirime olmadığı uyarısını atla"
 
+msgid "--gui-dialog-file {fname}  For testing: write dialog text"
+msgstr "--gui-dialog-file {fname}  Sınama amaçlı: İletişim kutusuna metin yaz"
+
 msgid "--ttyfail\t\tExit if input or output is not a terminal"
 msgstr "--ttyfail\t\tGirdi veya çıktı bir uçbirime değilse çık"
 
@@ -1742,7 +1781,7 @@ msgstr "-borderwidth <gnşlk>\t<gnşlk> kenar genişliği kullan (kısa: -bw)"
 
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
-"-scrollbarwidth <gnşlk>  Kaydırma çubuğu için <gnşlk> genişlik (kısa: -sw)"
+"-scrollbarwidth <gnşlk>  Sarma çubuğu için <gnşlk> genişlik (kısa: -sw)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tTersine dönmüş video kullan (kısa: -rv)"
@@ -1778,6 +1817,32 @@ msgstr "-P <üst başlık>\tVim'i üst uygulama içinde aç"
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
 msgstr "--windowid <HWND>\tVim'i başka bir win32 parçacığı içinde aç"
 
+msgid "Seen modifyOtherKeys: true\n"
+msgstr "modifyOtherKeys görüldü: true\n"
+
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+msgid "Off"
+msgstr "Kapalı"
+
+msgid "On"
+msgstr "Açık"
+
+msgid "Disabled"
+msgstr "Devre dışı"
+
+msgid "Cleared"
+msgstr "Temizlendi"
+
+#, c-format
+msgid "modifyOtherKeys detected: %s\n"
+msgstr "modifyOtherKeys algılandı: %s\n"
+
+#, c-format
+msgid "Kitty keyboard protocol: %s\n"
+msgstr "Kitty klavye protokülü: %s\n"
+
 msgid "No abbreviation found"
 msgstr "Kısaltma bulunamadı"
 
@@ -1906,6 +1971,9 @@ msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr ""
 "??? konumundan ???SON konumuna kadar satırlar eklenmiş/silinmiş olabilir"
 
+msgid "??? lines may be missing"
+msgstr "??? satır eksik olabilir"
+
 msgid "???END"
 msgstr "???SON"
 
@@ -2178,9 +2246,6 @@ msgstr "Yarıda kes: "
 msgid "Press ENTER or type command to continue"
 msgstr "Sürdürmek için ENTER'a basın veya komut girin"
 
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
 #, c-format
 msgid "%s line %ld"
 msgstr "%s %ld. satır"
@@ -3447,13 +3512,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"Big version "
-msgstr ""
-"\n"
-"Büyük sürüm "
-
-msgid ""
-"\n"
 "Normal version "
 msgstr ""
 "\n"
@@ -3461,13 +3519,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"Small version "
-msgstr ""
-"\n"
-"Küçük sürüm "
-
-msgid ""
-"\n"
 "Tiny version "
 msgstr ""
 "\n"
@@ -3813,8 +3864,8 @@ msgstr "Yarıda kesildi"
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ sonrasında /, ? veya & gelmeli"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: Komut satırı penceresinde geçersiz; <CR> çalıştırır, CTRL-C çıkar"
+msgid "E11: Invalid in command-line window; :q<CR> closes the window"
+msgstr "E11: Komut satırı penceresinde geçersiz; :q<CR> pencereyi kapatır"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
@@ -3942,7 +3993,7 @@ msgid "E48: Not allowed in sandbox"
 msgstr "E48: Kum havuzunda izin verilmiyor"
 
 msgid "E49: Invalid scroll size"
-msgstr "E49: Geçersiz kaydırma boyutu"
+msgstr "E49: Geçersiz sarma boyutu"
 
 msgid "E50: Too many \\z("
 msgstr "E50: Çok fazla \\z("
@@ -5025,7 +5076,7 @@ msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: Kabuk -f seçeneği ile çalıştırılamıyor"
 
 msgid "E362: Using a boolean value as a Float"
-msgstr "E362: Bir Boole Değeri, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E362: Bir Boole, kayan noktalı değer olarak kullanılıyor"
 
 msgid "E363: Pattern uses more memory than 'maxmempattern'"
 msgstr "E363: Dizgi 'maxmempattern' ögesinden daha fazla bellek kullanıyor"
@@ -5439,6 +5490,10 @@ msgstr "E476: Geçersiz komut"
 msgid "E476: Invalid command: %s"
 msgstr "E476: Geçersiz komut: %s"
 
+#, c-format
+msgid "E476: Invalid command: %s, expected %s"
+msgstr "E476: Geçersiz komut: %s, %s bekleniyordu"
+
 msgid "E477: No ! allowed"
 msgstr "E477: ! imine izin verilmiyor"
 
@@ -5480,6 +5535,10 @@ msgstr "E486: Dizgi bulunamadı: %s"
 msgid "E487: Argument must be positive"
 msgstr "E487: Değişken pozitif olmalı"
 
+#, c-format
+msgid "E487: Argument must be positive: %s"
+msgstr "E487: Değişken pozitif olmalı: %s"
+
 msgid "E488: Trailing characters"
 msgstr "E488: Sonda fazladan karakterler"
 
@@ -5891,7 +5950,7 @@ msgid "E610: No argument to delete"
 msgstr "E610: Silinecek bir argüman yok"
 
 msgid "E611: Using a Special as a Number"
-msgstr "E611: Bir Özel, Sayı yerine kullanılıyor"
+msgstr "E611: Bir özel değer, bir sayı olarak kullanılıyor"
 
 msgid "E612: Too many signs defined"
 msgstr "E612: Çok fazla işaret tanımlanmış"
@@ -6015,8 +6074,9 @@ msgstr "E674: printmbcharset çoklu bayt kodlamada boş olamaz"
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Çoklu bayt yazdırma için öntanımlı yazıtipi ayarlanmamış"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwrite arabelleği için eşleşen bir otokomut yok"
+#, c-format
+msgid "E676: No matching autocommands for buftype=%s buffer"
+msgstr "E676: buftype=%s arabelleği için eşleşen bir otokomut yok"
 
 msgid "E677: Error writing temp file"
 msgstr "E677: Geçici dosya yazılırken hata"
@@ -6103,7 +6163,7 @@ msgid "E702: Sort compare function failed"
 msgstr "E702: Sıralayıp karşılaştırma işlevi başarısız oldu"
 
 msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Bir Funcref, Sayı yerine kullanılıyor"
+msgstr "E703: Bir Funcref, sayı olarak kullanılıyor"
 
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
@@ -6185,16 +6245,16 @@ msgid "E727: Start past end"
 msgstr "E727: Başlangıç bitişten sonra"
 
 msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Bir Sözlük, Sayı yerine kullanılıyor"
+msgstr "E728: Bir sözlük, sayı olarak kullanılıyor"
 
 msgid "E729: Using a Funcref as a String"
-msgstr "E729: Funcref bir Dizi yerine kullanılıyor"
+msgstr "E729: Bir Funcref, bir dizi olarak kullanılıyor"
 
 msgid "E730: Using a List as a String"
-msgstr "E730: Liste bir Dizi yerine kullanılıyor"
+msgstr "E730: Bir liste, bir dizi olarak kullanılıyor"
 
 msgid "E731: Using a Dictionary as a String"
-msgstr "E731: Sözlük bir Dizi yerine kullanılıyor"
+msgstr "E731: Bir sözlük, bir dizi olarak kullanılıyor"
 
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor, :while ile kullanılıyor"
@@ -6249,7 +6309,7 @@ msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans saltokunur dosyalarda değişikliklere izin vermiyor"
 
 msgid "E745: Using a List as a Number"
-msgstr "E745: Bir Liste, Sayı yerine kullanılıyor"
+msgstr "E745: Bir liste, sayı olarak kullanılıyor"
 
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
@@ -6462,10 +6522,10 @@ msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Bir kayan noktalı değer ile '%' kullanılamaz"
 
 msgid "E805: Using a Float as a Number"
-msgstr "E805: Bir Kayan Noktalı Değer, Sayı yerine kullanılıyor"
+msgstr "E805: Bir kayan noktalı değer, sayı olarak kullanılıyor"
 
 msgid "E806: Using a Float as a String"
-msgstr "E806: Kayan Noktalı Değer, bir Dizi yerine kullanılıyor"
+msgstr "E806: Bir kayan noktalı değer, bir dizi olarak kullanılıyor"
 
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() için kayan noktalı değer türünde argüman bekleniyordu"
@@ -6644,8 +6704,8 @@ msgstr "E858: Eval geçerli bir python nesnesi döndürmedi"
 msgid "E859: Failed to convert returned python object to a Vim value"
 msgstr "E859: Döndürülen python nesnesi vim değerine dönüştürülemedi"
 
-msgid "E860: Need 'id' and 'type' with 'both'"
-msgstr "E860: 'both' ile 'id' ve 'type' gerekli"
+msgid "E860: Need 'id' and 'type' or 'types' with 'both'"
+msgstr "E860: 'both' ile 'id' ve 'type' veya 'types' gerekli"
 
 msgid "E861: Cannot open a second popup with a terminal"
 msgstr "E861: Bir uçbirimle ikinci bir açılır pencere açılamıyor"
@@ -6767,16 +6827,16 @@ msgid "E890: Trailing char after ']': %s]%s"
 msgstr "E890: ']' sonrası fazladan karakter: %s]%s"
 
 msgid "E891: Using a Funcref as a Float"
-msgstr "E891: Bir Funcref, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E891: Bir Funcref, kayan noktalı değer olarak kullanılıyor"
 
 msgid "E892: Using a String as a Float"
-msgstr "E892: Bir Dizi, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E892: Bir dizi, kayan noktalı değer olarak kullanılıyor"
 
 msgid "E893: Using a List as a Float"
-msgstr "E893: Bir Liste, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E893: Bir liste, kayan noktalı değer olarak kullanılıyor"
 
 msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Bir Sözlük, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E894: Bir sözlük, kayan noktalı değer olarak kullanılıyor"
 
 msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
@@ -6829,29 +6889,29 @@ msgid "E906: Not an open channel"
 msgstr "E906: Açık bir kanal değil"
 
 msgid "E907: Using a special value as a Float"
-msgstr "E907: Bir Özel Değer, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E907: Bir özel değer, bir kayan noktalı değer olarak kullanılıyor"
 
 #, c-format
 msgid "E908: Using an invalid value as a String: %s"
-msgstr "E908: Geçersiz bir değer bir Dizi yerine kullanılıyor: %s"
+msgstr "E908: Geçersiz bir değer, bir dizi olarak kullanılıyor: %s"
 
 msgid "E909: Cannot index a special variable"
 msgstr "E909: Özel bir değişken dizinlenemiyor"
 
 msgid "E910: Using a Job as a Number"
-msgstr "E910: Bir İş, Sayı yerine kullanılıyor"
+msgstr "E910: Bir iş, bir sayı olarak kullanılıyor"
 
 msgid "E911: Using a Job as a Float"
-msgstr "E911: Bir İş, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E911: Bir iş, bir kayan noktalı değer olarak kullanılıyor"
 
 msgid "E912: Cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
 msgstr "E912: ch_evalexpr()/ch_sendexpr() raw/nl kanalları ile kullanılamaz"
 
 msgid "E913: Using a Channel as a Number"
-msgstr "E913: Bir Kanal, Sayı yerine kullanılıyor"
+msgstr "E913: Bir kanal, bir sayı olarak kullanılıyor"
 
 msgid "E914: Using a Channel as a Float"
-msgstr "E914: Bir Kanal, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr "E914: Bir kanal, bir kayan noktalı değer olarak kullanılıyor"
 
 msgid "E915: in_io buffer requires in_buf or in_name to be set"
 msgstr "E915: in_io arabelleği in_buf veya in_name ayarlı olmasını gerektirir"
@@ -6877,9 +6937,6 @@ msgstr "E920: _io dosyası _name ayarlı olmasını gerektirir"
 msgid "E921: Invalid callback argument"
 msgstr "E921: Geçersiz geri çağırma argümanı"
 
-msgid "E922: Expected a dict"
-msgstr "E922: Bir sözlük bekleniyordu"
-
 msgid "E923: Second argument of function() must be a list or a dict"
 msgstr "E923: function() ikinci argümanı bir liste veya sözlük olmalıdır"
 
@@ -7058,13 +7115,14 @@ msgstr ""
 "E973: İkili geniş nesne hazır bilgisi çift onalt. karakterlere iye olmalıdır"
 
 msgid "E974: Using a Blob as a Number"
-msgstr "E974: Bir İkili Geniş Nesne, Sayı yerine kullanılıyor"
+msgstr "E974: Bir ikili geniş nesne, sayı olarak kullanılıyor"
 
 msgid "E975: Using a Blob as a Float"
-msgstr "E975: Bir İkili Geniş Nesne, Kayan Noktalı Değer yerine kullanılıyor"
+msgstr ""
+"E975: Bir ikili geniş nesne, bir kayan noktalı değer olarak kullanılıyor"
 
 msgid "E976: Using a Blob as a String"
-msgstr "E976: İkili Geniş Nesne bir Dizi yerine kullanılıyor"
+msgstr "E976: Bir ikili geniş nesne, bir dizi olarak kullanılıyor"
 
 msgid "E977: Can only compare Blob with Blob"
 msgstr ""
@@ -7181,11 +7239,13 @@ msgstr "E1006: %s, bir argüman olarak kullanılıyor"
 msgid "E1007: Mandatory argument after optional argument"
 msgstr "E1007: İsteğe bağlı argüman sonrası zorunlu argüman"
 
-msgid "E1008: Missing <type>"
-msgstr "E1008: <tür> eksik"
+#, c-format
+msgid "E1008: Missing <type> after %s"
+msgstr "E1008: %s sonrası <tür> eksik"
 
-msgid "E1009: Missing > after type"
-msgstr "E1009: Tür sonrasında > eksik"
+#, c-format
+msgid "E1009: Missing > after type: %s"
+msgstr "E1009: Tür sonrası > eksik: %s"
 
 #, c-format
 msgid "E1010: Type not recognized: %s"
@@ -7252,10 +7312,10 @@ msgstr "E1022: Tür veya ilklendirme gerekiyor"
 
 #, c-format
 msgid "E1023: Using a Number as a Bool: %lld"
-msgstr "E1023: Bir Sayı, bir Boole yerine kullanılıyor: %lld"
+msgstr "E1023: Bir sayı, bir Boole olarak kullanılıyor: %lld"
 
 msgid "E1024: Using a Number as a String"
-msgstr "E1024: Bir Sayı, bir Dizi yerine kullanılıyor"
+msgstr "E1024: Bir sayı, bir dizi olarak kullanılıyor"
 
 msgid "E1025: Using } outside of a block scope"
 msgstr "E1025: } bir blok kapsamı dışında kullanılıyor"
@@ -7275,7 +7335,7 @@ msgstr "E1029: %s bekleniyordu; ancak %s alındı"
 
 #, c-format
 msgid "E1030: Using a String as a Number: \"%s\""
-msgstr "E1030: Bir Dizi, bir Sayı yerine kullanılıyor: \"%s\""
+msgstr "E1030: Bir dizi, bir sayı olarak kullanılıyor: \"%s\""
 
 msgid "E1031: Cannot use void value"
 msgstr "E1031: Boş değer kullanılamaz"
@@ -7428,9 +7488,6 @@ msgstr "E1074: Nokta sonrası boşluğa izin verilmiyor"
 msgid "E1075: Namespace not supported: %s"
 msgstr "E1075: Ad alanı desteklenmiyor: %s"
 
-msgid "E1076: This Vim is not compiled with float support"
-msgstr "E1076: Bu Vim kayan noktalı değer desteği ile derlenmemiş"
-
 #, c-format
 msgid "E1077: Missing argument type for %s"
 msgstr "E1077: %s için argüman türü eksik"
@@ -7539,10 +7596,6 @@ msgid "E1107: String, List, Dict or Blob required"
 msgstr "E1107: Dizi, Liste, Sözlük veya İkili Nesne gerekiyor"
 
 #, c-format
-msgid "E1108: Item not found: %s"
-msgstr "E1108: Öge bulunamadı: %s"
-
-#, c-format
 msgid "E1109: List item %d is not a List"
 msgstr "E1109: Liste ögesi %d bir Liste değil"
 
@@ -7630,7 +7683,7 @@ msgstr "E1134: Bir null listesi genişletilemez"
 
 #, c-format
 msgid "E1135: Using a String as a Bool: \"%s\""
-msgstr "E1135: Bir Dizi, bir Boole yerine kullanılıyor: \"%s\""
+msgstr "E1135: Bir dizi, bir Boole olarak kullanılıyor: \"%s\""
 
 msgid "E1136: <Cmd> mapping must end with <CR> before second <Cmd>"
 msgstr "E1136: <Cmd> eşlemlemesi ikinci <Cmd>'den önce <CR> ile bitmelidir"
@@ -7640,7 +7693,7 @@ msgid "E1137: <Cmd> mapping must not include %s key"
 msgstr "E1137: <Cmd> eşlemlemesi %s anahtarını içermemelidir"
 
 msgid "E1138: Using a Bool as a Number"
-msgstr "E1138: Bir Boole, Sayı yerine kullanılıyor"
+msgstr "E1138: Bir Boole, bir sayı olarak kullanılıyor"
 
 msgid "E1139: Missing matching bracket after dict key"
 msgstr "E1139: Sözlük anahtarı sonrası eşleşen ayraç eksik"
@@ -8063,10 +8116,6 @@ msgstr ""
 msgid "E1252: String, List or Blob required for argument %d"
 msgstr "E1252: %d argümanı için dizi, liste veya ikili geniş nesne gerekiyor"
 
-#, c-format
-msgid "E1253: String expected for argument %d"
-msgstr "E1253: %d argümanı için dizi gerekiyor"
-
 msgid "E1254: Cannot use script variable in for loop"
 msgstr "E1254: for döngüsünde betik değişkeni kullanılamaz"
 
@@ -8202,6 +8251,276 @@ msgstr "E1288: Zaman aşımı için işleyici sıfırlanamadı: %s"
 msgid "E1289: Could not check for pending SIGALRM: %s"
 msgstr "E1289: Bekleyen SIGALRM için denetlenemedi: %s"
 
+msgid "E1290: substitute nesting too deep"
+msgstr "E1290: Yedek pek iç içe geçmiş"
+
+#, c-format
+msgid "E1291: Invalid argument: %ld"
+msgstr "E1291: Geçersiz argüman: %ld"
+
+msgid "E1292: Command-line window is already open"
+msgstr "E1292: Komut satırı penceresi halihazırda açık"
+
+msgid "E1293: Cannot use a negative id after adding a textprop with text"
+msgstr ""
+"E1293: Metin içeren bir textprop ekledikten sonra bir negatif kullanılamaz"
+
+msgid "E1294: Can only use text_align when column is zero"
+msgstr "E1294: Sütun sıfırken yalnızca text_align kullanılabilir"
+
+msgid "E1295: Cannot specify both 'type' and 'types'"
+msgstr "E1295: Hem 'type' hem 'types' belirtilemez"
+
+msgid "E1296: Can only use left padding when column is zero"
+msgstr "E1296: Sütun sıfırken yalnızca sol dolgu kullanılabilir"
+
+#, c-format
+msgid "E1297: Non-NULL Dictionary required for argument %d"
+msgstr "E1297: %d argümanı için NULL olmayan sözlük gerekiyor"
+
+#, c-format
+msgid "E1298: Non-NULL List required for argument %d"
+msgstr "E1298: %d argümanı için NULL olmayan liste gerekiyor"
+
+msgid "E1299: Window unexpectedly closed while searching for tags"
+msgstr "E1299: Etiketleri ararken pencere beklenmedik bir biçimde kapatıldı"
+
+msgid "E1300: Cannot use a partial with dictionary for :defer"
+msgstr "E1300: :defer için bir kısımsal sözlük kullanılamıyor"
+
+#, c-format
+msgid "E1301: String, Number, List or Blob required for argument %d"
+msgstr ""
+"E1301: %d argümanı için dizi, sayı, liste veya ikili geniş nesne gerekiyor"
+
+msgid "E1302: Script variable was deleted"
+msgstr "E1302: Betik değişkeni silinmiş"
+
+#, c-format
+msgid "E1303: Custom list completion function does not return a List but a %s"
+msgstr "E1303: Özel liste tamamlama işlevi bir liste yerine %s döndürüyor"
+
+#, c-format
+msgid "E1304: Cannot use type with this variable: %s"
+msgstr "E1304: Tür, bu değişkenle kullanılamıyor: %s"
+
+msgid ""
+"E1305: Cannot use \"length\", \"end_col\" and \"end_lnum\" with \"text\""
+msgstr ""
+"E1305: \"text\" ile \"length\", \"end_col\" ve \"end_lnum\" kullanılamıyor"
+
+msgid "E1306: Loop nesting too deep"
+msgstr "E1306: Döngü pek iç içe geçmiş"
+
+#, c-format
+msgid "E1307: Argument %d: Trying to modify a const %s"
+msgstr "E1307: %d argümanı: Bir %s sabiti değiştirilmeye çalışılıyor"
+
+msgid "E1308: Cannot resize a window in another tab page"
+msgstr ""
+"E1308: Başka bir sekme sayfasındayken bir pencere yeniden boyutlandırılamıyor"
+
+msgid "E1309: Cannot change mappings while listing"
+msgstr "E1309: Listelerken eşlemlemeler değiştirilemıyor"
+
+msgid "E1310: Cannot change menus while listing"
+msgstr "E1310: Listelerken menüler değiştirilemiyor"
+
+msgid "E1311: Cannot change user commands while listing"
+msgstr "E1311: Listelerken kullanıcı komutları değiştirilemiyor"
+
+msgid "E1312: Not allowed to change the window layout in this autocmd"
+msgstr ""
+"E1312: Bu otomatik komutta pencere yerleşimini değiştirmeye izin verilmiyor"
+
+#, c-format
+msgid "E1313: Not allowed to add or remove entries (%s)"
+msgstr "E1313: Girdiler eklemeye veya kaldırmaya izin verilmiyor (%s)"
+
+#, c-format
+msgid "E1314: Class name must start with an uppercase letter: %s"
+msgstr "E1314: Sınıf adı bir BÜYÜK harfle başlamalıdır: %s"
+
+#, c-format
+msgid "E1315: White space required after name: %s"
+msgstr "E1315: Ad sonrası boşluk gerekiyor: %s"
+
+msgid "E1316: Class can only be defined in Vim9 script"
+msgstr "E1316: Sınıf, yalnızca Vim9 betiğinde kullanılabilir"
+
+#, c-format
+msgid "E1317: Invalid object member declaration: %s"
+msgstr "E1317: Geçersiz nesne üyesi beyanı: %s"
+
+#, c-format
+msgid "E1318: Not a valid command in a class: %s"
+msgstr "E1318: Bir sınıfta geçerli olmayan bir komut: %s"
+
+msgid "E1319: Using a class as a Number"
+msgstr "E1319: Bir sınıf, sayı olarak kullanılıyor"
+
+msgid "E1320: Using an object as a Number"
+msgstr "E1320: Bir nesne, sayı olarak kullanılıyor"
+
+msgid "E1321: Using a class as a Float"
+msgstr "E1321: Bir sınıf, kayan noktalı değer olarak kullanılıyor"
+
+msgid "E1322: Using an object as a Float"
+msgstr "E1322: Bir nesne, kayan noktalı değer olarak kullanılıyor"
+
+msgid "E1323: Using a class as a String"
+msgstr "E1323: Bir sınıf, dizi olarak kullanılıyor"
+
+msgid "E1324: Using an object as a String"
+msgstr "E1324: Bir nesne, dizi olarak kullanılıyor"
+
+#, c-format
+msgid "E1325: Method not found on class \"%s\": %s"
+msgstr "E1325: Yöntem, \"%s\" sınıfında bulunamadı: %s"
+
+#, c-format
+msgid "E1326: Member not found on object \"%s\": %s"
+msgstr "E1326: Üye, \"%s\" nesnesinde bulunamadı: %s"
+
+#, c-format
+msgid "E1327: Object required, found %s"
+msgstr "E1327: Nesne gerekiyordu, %s bulundu"
+
+#, c-format
+msgid "E1328: Constructor default value must be v:none: %s"
+msgstr "E1328: Yapıcı öntanımlı değeri v:none olmalı: %s"
+
+#, c-format
+msgid "E1329: Cannot get object member type from initializer: %s"
+msgstr "E1329: İlklendiriciden nesne üye türü alınamıyor: %s"
+
+#, c-format
+msgid "E1330: Invalid type for object member: %s"
+msgstr "E1330: Nesne üyesi için geçersiz tür: %s"
+
+msgid "E1331: Public must be followed by \"this\" or \"static\""
+msgstr "E1331: Public sonrası \"this\" veya \"static\" gelmelidir"
+
+#, c-format
+msgid "E1332: Public member name cannot start with underscore: %s"
+msgstr "E1332: Genel üye adı bir alt çizgiyle başlayamaz: %s"
+
+#, c-format
+msgid "E1333: Cannot access private member: %s"
+msgstr "E1333: Özel üyeye erişilemiyor: %s"
+
+#, c-format
+msgid "E1334: Object member not found: %s"
+msgstr "E1334: Nesne üyesi bulunamadı: %s"
+
+#, c-format
+msgid "E1335: Member is not writable: %s"
+msgstr "E1335: Üye yazılabilir değil: %s"
+
+msgid "E1336: Internal error: shortmess too long"
+msgstr "E1336: İçsel hata: Kısalık pek uzun"
+
+#, c-format
+msgid "E1337: Class member not found: %s"
+msgstr "E1337: Sınıf üyesi bulunamadı: %s"
+
+#, c-format
+msgid "E1338: Member not found on class \"%s\": %s"
+msgstr "E1338: \"%s\" sınıfında üye bulunamadı: %s"
+
+msgid ""
+"E1339: Cannot add a textprop with text after using a textprop with a "
+"negative id"
+msgstr ""
+"E1339: Negatif kimlikli bir textprop kullandıktan sonra metin içeren bir textprop eklenemiyor"
+
+#, c-format
+msgid "E1340: Argument already declared in the class: %s"
+msgstr "E1340: Sınıfta argüman halihazırda beyan edilmiş: %s"
+
+#, c-format
+msgid "E1341: Variable already declared in the class: %s"
+msgstr "E1341: Sınıfta değişken halihazırda beyan edilmiş: %s"
+
+msgid "E1342: Interface can only be defined in Vim9 script"
+msgstr "E1342: Arayüz yalnızca Vim9 betiğinde tanımlanabilir"
+
+#, c-format
+msgid "E1343: Interface name must start with an uppercase letter: %s"
+msgstr "E1343: Arayüz adı bir BÜYÜK harfle başlamalıdır: %s"
+
+msgid "E1344: Cannot initialize a member in an interface"
+msgstr "E1344: Bir arayüzde bir üye ilklendirilemiyor"
+
+#, c-format
+msgid "E1345: Not a valid command in an interface: %s"
+msgstr "E1345: Bir arayüzde geçerli bir komut değil: %s"
+
+#, c-format
+msgid "E1346: Interface name not found: %s"
+msgstr "E1346: Arayüz adı bulunamadı: %s"
+
+#, c-format
+msgid "E1347: Not a valid interface: %s"
+msgstr "E1347: Geçerli bir arayüz değil: %s"
+
+#, c-format
+msgid "E1348: Member \"%s\" of interface \"%s\" not implemented"
+msgstr "E1348: Şu arayüzün \"%s\" üyesi ilklendirilemiyor: \"%s\""
+
+#, c-format
+msgid "E1349: Function \"%s\" of interface \"%s\" not implemented"
+msgstr "E1349: Şu arayüzün \"%s\" işlevi gerçeklenmemiş: \"%s\""
+
+msgid "E1350: Duplicate \"implements\""
+msgstr "E1350: Yinelenen \"implements\""
+
+#, c-format
+msgid "E1351: Duplicate interface after \"implements\": %s"
+msgstr "E1351: \"implements\" sonrası yinelenen arayüz: %s"
+
+msgid "E1352: Duplicate \"extends\""
+msgstr "E1352: Yinelenen \"extends\""
+
+#, c-format
+msgid "E1353: Class name not found: %s"
+msgstr "E1353: Sınıf adı bulunamadı: %s"
+
+#, c-format
+msgid "E1354: Cannot extend %s"
+msgstr "E1354: %s genişletilemiyor"
+
+#, c-format
+msgid "E1355: Duplicate function: %s"
+msgstr "E1355: Yinelenen işlev: %s"
+
+msgid "E1356: \"super\" must be followed by a dot"
+msgstr "E1356: \"super\" sonrası bir nokta gelmelidir "
+
+msgid "E1357: Using \"super\" not in a class function"
+msgstr "E1357: \"super\" bir sınıf işlevi dışında kullanılıyor"
+
+msgid "E1358: Using \"super\" not in a child class"
+msgstr "E1358: \"super\", bir alt sınıfta kullanılmıyor"
+
+msgid "E1359: Cannot define a \"new\" function in an abstract class"
+msgstr "E1359: Soyut bir sınıfta bir \"new\" işlevi tanımlanamıyor"
+
+msgid "E1360: Using a null object"
+msgstr "E1360: Bir null nesne kullanılıyor"
+
+msgid "E1361: Cannot use color \"none\", did you mean \"NONE\"?"
+msgstr "E1361: \"none\" rengi kullanılamıyor, \"NONE\" mı demek istediniz?"
+
+msgid "E1362: Cannot use a non-null object"
+msgstr "E1362: Null olmayan bir nesne kullanılamıyor"
+
+msgid "E1363: Incomplete type"
+msgstr "E1363: Tam olmayan tür"
+
+msgid "E1364: Warning: Pointer block corrupted"
+msgstr "E1364: Uyarı: İşaretçi bloku hasar görmüş"
+
 msgid "--No lines in buffer--"
 msgstr "--Arabellek içinde satır yok--"
 
@@ -8715,7 +9034,10 @@ msgid "displaying text"
 msgstr "metin görüntüleme"
 
 msgid "number of lines to scroll for CTRL-U and CTRL-D"
-msgstr "CTRL-U ve CTRL-D için kaydırılacak satır sayısı"
+msgstr "CTRL-U ve CTRL-D için sarılacak satır sayısı"
+
+msgid "scroll by screen line"
+msgstr "ekran satırına göre sar"
 
 msgid "number of screen lines to show around the cursor"
 msgstr "imleç etrafında gösterilecek ekran satırları sayısı"
@@ -8739,7 +9061,7 @@ msgid "string to put before wrapped screen lines"
 msgstr "kaydırılmış ekran satırlarından önce konumlanacak dizi"
 
 msgid "minimal number of columns to scroll horizontally"
-msgstr "en az yatay kaydırma sütunu sayısı"
+msgstr "en az yatay sarma sütunu sayısı"
 
 msgid "minimal number of columns to keep left and right of the cursor"
 msgstr "imlecin sağında ve solunda bırakılacak en az sütun sayısı"
@@ -8765,7 +9087,7 @@ msgid "number of lines in the display"
 msgstr "ekrandaki satırların sayısı"
 
 msgid "number of lines to scroll for CTRL-F and CTRL-B"
-msgstr "CTRL-F ve CTRL-B için kaydırılacak satır sayısı"
+msgstr "CTRL-F ve CTRL-B için sarılacak satır sayısı"
 
 msgid "don't redraw while executing macros"
 msgstr "makroları çalıştırırken yenileme yapma"
@@ -8921,11 +9243,14 @@ msgstr ""
 msgid "a new window is put below the current one"
 msgstr "geçerli pencerenin altına yeni bir pencere koyulur"
 
+msgid "determines scroll behavior for split windows"
+msgstr "bölünmüş pencereler için sarma davranışını belirler"
+
 msgid "a new window is put right of the current one"
 msgstr "yeni bir pencere geçerli pencerenin sağına koyulur"
 
 msgid "this window scrolls together with other bound windows"
-msgstr "bu pencere, bağlı diğer pencerelerle birlikte kayar"
+msgstr "bu pencere, bağlı diğer pencerelerle birlikte sarılır"
 
 msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
 msgstr ""
@@ -8942,7 +9267,7 @@ msgstr "bir uçbirim penceresinde Vim komutlarından önce gelen düğme"
 
 msgid "max number of lines to keep for scrollback in a terminal window"
 msgstr ""
-"bir uçbirim penceresinde geri kaydırma için kullanılacak\n"
+"bir uçbirim penceresinde geri sarma için kullanılacak\n"
 "en çok satır sayısı"
 
 msgid "type of pty to use for a terminal window"
@@ -8990,14 +9315,17 @@ msgstr "bir xterm algılandığında uçbirim düğme kodlarını iste"
 msgid "terminal that requires extra redrawing"
 msgstr "ek yenileme gerektiren uçbirim"
 
+msgid "what keyboard protocol to use for which terminal"
+msgstr "hangi uçbirim için hangi klavye protokolünün kullanılacağı"
+
 msgid "recognize keys that start with <Esc> in Insert mode"
 msgstr "Ekleme kipinde <Esc> ile başlayan düğmeleri tanı"
 
 msgid "minimal number of lines to scroll at a time"
-msgstr "herhangi bir zamanda kaydırılacak en az satır sayısı"
+msgstr "herhangi bir zamanda sarılacak en az satır sayısı"
 
 msgid "maximum number of lines to use scrolling instead of redrawing"
-msgstr "yenileme yerine kaydırma kullanacak en çok satır sayısı"
+msgstr "yenileme yerine sarma kullanacak en çok satır sayısı"
 
 msgid "specifies what the cursor looks like in different modes"
 msgstr "imlecin farklı kiplerde nice göründüğünü belirler"
@@ -9033,7 +9361,7 @@ msgid "the window with the mouse pointer becomes the current one"
 msgstr "fare imlecinin olduğu pencere geçerli pencere olur"
 
 msgid "the window with the mouse pointer scrolls with the mouse wheel"
-msgstr "fare imlecinin olduğu pencere fare tekerleği ile kaydırılabilir"
+msgstr "fare imlecinin olduğu pencere fare tekerleği ile sarılabilir"
 
 msgid "hide the mouse pointer while typing"
 msgstr "yazı yazarken fare imlecini gizle"
@@ -9160,8 +9488,12 @@ msgstr "'shortness'daki 's' bayrağını ekle (arama iletisini gösterme)"
 msgid "list of flags to make messages shorter"
 msgstr "iletileri kısalaştırmak için kullanılan bayraklar listesi"
 
-msgid "show (partial) command keys in the status line"
-msgstr "durum satırında (kısmi) komut düğmelerini göster"
+msgid "show (partial) command keys in location given by 'showcmdloc'"
+msgstr ""
+"'showdcmdloc' tarafından verilen konumda (kısmi) komut düğmelerini göster"
+
+msgid "location where to show the (partial) command keys for 'showcmd'"
+msgstr "'showcmd' için (kısmi) komut düğmelerinin gösterileceği konum"
 
 msgid "display the current mode in the status line"
 msgstr "durum satırında geçerli kipi görüntüle"
@@ -9402,6 +9734,9 @@ msgstr "lisp kipini etkinleştir"
 msgid "words that change how lisp indenting works"
 msgstr "lisp girintilemesinin nice çalıştığını değiştiren sözcükler"
 
+msgid "options for Lisp indenting"
+msgstr "Lisp girintilemesi için seçenekler"
+
 msgid "folding"
 msgstr "kıvırma"
 
@@ -9507,6 +9842,9 @@ msgstr "ikili dosya düzenleme"
 msgid "last line in the file has an end-of-line"
 msgstr "dosyanın son satırında bir satırsonu var"
 
+msgid "last line in the file followed by CTRL-Z"
+msgstr "dosyanın son satırından sonra CTRL-Z var"
+
 msgid "fixes missing end-of-line at end of text file"
 msgstr "bir metin dosyasının sonundaki eksik satırsonlarını onarır"