Merge remote-tracking branch 'upstream/master' into mix_20240309

32 files changed, 117 insertions, 119 deletions

diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 6c2008926a..348ba2881c 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -54,13 +54,15 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
   add_custom_command(
     OUTPUT ${NVIM_POT}
     COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-      -S ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim ${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
+      -c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim"
+      ${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
     COMMAND ${XGETTEXT_PRG} -o ${NVIM_POT} --default-domain=nvim
       --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2
       -D ${CMAKE_CURRENT_SOURCE_DIR} -D ${CMAKE_CURRENT_BINARY_DIR}
       ${NVIM_RELATIVE_SOURCES} optwin.js
     COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-      -S ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim ${NVIM_POT} ../../../runtime/optwin.vim
+      -c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim"
+      ${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
     VERBATIM
     DEPENDS ${NVIM_SOURCES} nvim_bin nvim_runtime_deps)
 
diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po
index 92a1a6ca3c..64acd93f57 100644
--- a/src/nvim/po/af.po
+++ b/src/nvim/po/af.po
@@ -315,7 +315,7 @@ msgstr " Bevelre�lvoltooiing (^V^N^P)"
 #~ msgstr " Etiketvoltooiing (^]^N^P)"
 
 #, fuzzy
-#~ msgid " Spelling suggestion (s^N^P)"
+#~ msgid " Spelling suggestion (^S^N^P)"
 #~ msgstr " Hele-re�l voltooiing (^L^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
@@ -3608,8 +3608,8 @@ msgstr ""
 #~ "\n"
 #~ "(2) 'n Bewerkingsessie van hierdie l�er het ineengestort.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Indien wel, gebruik \":recover\" of \"vim -r"
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Indien wel, gebruik \":recover\" of \"nvim -r"
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/ca.po b/src/nvim/po/ca.po
index 964fcc9325..44975d9161 100644
--- a/src/nvim/po/ca.po
+++ b/src/nvim/po/ca.po
@@ -393,8 +393,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni-compleci� (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr "Suggeriment ortogr�fic (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr "Suggeriment ortogr�fic (^S^N^P)"
 
 # buscar un nom, en lloc del verb �completar�.  eac
 #: ../edit.c:97
@@ -4015,8 +4015,8 @@ msgstr ""
 "(2) El Vim s'ha estrellat mentre s'editava aquest fitxer.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    En aquest cas, useu \":recover\" o b� \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    En aquest cas, useu \":recover\" o b� \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
index b939139fb5..43b6c82960 100644
--- a/src/nvim/po/cs.cp1250.po
+++ b/src/nvim/po/cs.cp1250.po
@@ -404,7 +404,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Dopl�ov�n� tag� (^I/^N/^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr ""
 
 #: ../edit.c:97
@@ -4077,8 +4077,8 @@ msgstr ""
 "(2) Editace tohoto souboru byla p�eru�ena ne�ekan�m ukon�en�m programu.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Je-li tomu tak, pak pou�ijte \":recover\" �i \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Je-li tomu tak, pak pou�ijte \":recover\" �i \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/cs.po b/src/nvim/po/cs.po
index f98dc2828e..7df69e061f 100644
--- a/src/nvim/po/cs.po
+++ b/src/nvim/po/cs.po
@@ -404,7 +404,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Dopl�ov�n� tag� (^I/^N/^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr ""
 
 #: ../edit.c:97
@@ -4077,8 +4077,8 @@ msgstr ""
 "(2) Editace tohoto souboru byla p�eru�ena ne�ekan�m ukon�en�m programu.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Je-li tomu tak, pak pou�ijte \":recover\" �i \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Je-li tomu tak, pak pou�ijte \":recover\" �i \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/da.po b/src/nvim/po/da.po
index ba0301589c..c65477bf13 100644
--- a/src/nvim/po/da.po
+++ b/src/nvim/po/da.po
@@ -403,8 +403,8 @@ msgstr " Fuldførelse af brugerdefineret (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Fuldførelse af omni (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Staveforslag (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Staveforslag (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Fuldførelse af nøgleord local (^N^P)"
@@ -3663,8 +3663,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) En redigeringssession for filen holdt op med at virke.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Hvis det er tilfældet, så brug \":recover\" eller \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Hvis det er tilfældet, så brug \":recover\" eller \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po
index efd52d3efe..0d1195eecf 100644
--- a/src/nvim/po/de.po
+++ b/src/nvim/po/de.po
@@ -397,8 +397,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni-Erg�nzung (^O^N^P)"
 
 #: ../edit.c:97
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Vorschlag der Rechtschreibpr�fung (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Vorschlag der Rechtschreibpr�fung (^S^N^P)"
 
 #: ../edit.c:98
 msgid " Keyword Local completion (^N^P)"
@@ -3436,9 +3436,9 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Eine Sitzung f�r diese Datei ist abgest�rzt.\n"
 
 #: ../memline.c:3204
-msgid "    If this is the case, use \":recover\" or \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
 msgstr ""
-"    Wenn dies der Fall ist, so verwenden Sie \":recover\" oder \"vim -r "
+"    Wenn dies der Fall ist, so verwenden Sie \":recover\" oder \"nvim -r "
 
 #: ../memline.c:3206
 msgid ""
diff --git a/src/nvim/po/en_GB.po b/src/nvim/po/en_GB.po
index 1c03b305f9..7b849d4e68 100644
--- a/src/nvim/po/en_GB.po
+++ b/src/nvim/po/en_GB.po
@@ -386,7 +386,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr ""
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr ""
 
 #: ../edit.c:97
@@ -3847,7 +3847,7 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr ""
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
 msgstr ""
 
 #: ../memline.c:3249
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index f619c4c408..5cd18ad24b 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -410,8 +410,8 @@ msgstr " Kompletigo difinita de uzanto (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Kompletigo Omni (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Sugesto de literumo (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Sugesto de literumo (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Kompletigo loka de ŝlosilvorto (^N/^P)"
@@ -3531,8 +3531,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Redakta seanco de tiu dosiero kolapsis.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Se veras, uzu \":recover\" aŭ \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Se veras, uzu \":recover\" aŭ \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/es.po b/src/nvim/po/es.po
index 120a29af15..292ca15264 100644
--- a/src/nvim/po/es.po
+++ b/src/nvim/po/es.po
@@ -387,8 +387,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Completar con método Omni (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Sugerencia de ortografía (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Sugerencia de ortografía (^S^N^P)"
 
 # Scroll has it's own msgs, in it's place there is the msg for local
 # * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
@@ -4078,8 +4078,8 @@ msgstr ""
 "(2) Falló una sesión de edición de este archivo.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Si es así, use \":recover\" o \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Si es así, use \":recover\" o \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index ab6acf685f..c9cad6cc69 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -526,8 +526,8 @@ msgstr " Käyttäjän määrittelemä täydennys (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Omnitäydennys (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Oikaisulukuehdotus (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Oikaisulukuehdotus (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Avainsanan paikallinen täydennys (^N^P)"
@@ -3660,8 +3660,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Tiedostonmuokkausistunto on kaatunut.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Jos näin on, käytä komentoa :recover tai vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Jos näin on, käytä komentoa :recover tai nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index fae6fe2297..92d2ad215f 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -3241,8 +3241,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Une session d'�dition de ce fichier a plant�.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Si c'est le cas, utilisez \":recover\" ou \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Si c'est le cas, utilisez \":recover\" ou \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index 5107aed75f..7a5893b5f2 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -389,8 +389,8 @@ msgstr " Comhl�n� saincheaptha (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Comhl�n� Omni (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Moladh litrithe (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Moladh litrithe (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Comhl�n� log�nta lorgfhocal (^N^P)"
@@ -3696,8 +3696,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Thuairte�il seisi�n eagarth�ireachta.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    M�s amhlaidh, bain �s�id as \":recover\" n� \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    M�s amhlaidh, bain �s�id as \":recover\" n� \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po
index 2191876724..d02052ec39 100644
--- a/src/nvim/po/it.po
+++ b/src/nvim/po/it.po
@@ -383,8 +383,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Completamento globale (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Suggerimento ortografico (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Suggerimento ortografico (^S^N^P)"
 
 #: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
@@ -4037,8 +4037,8 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Una sessione di edit per questo file � finita male.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Se � cos�, usa \":recover\" oppure \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Se � cos�, usa \":recover\" oppure \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index 87b4fc5ccd..78f927c21d 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -409,8 +409,8 @@ msgstr " �桼��������䴰 (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " ������䴰 (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " �֤꽤������ (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " �֤꽤������ (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " �ɽꥭ������䴰 (^N^P)"
@@ -3466,8 +3466,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ���Υե�������Խ����å���󤬥���å��夷��.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���ξ��ˤ� \":recover\" �� \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    ���ξ��ˤ� \":recover\" �� \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index 315c860307..1a493c0336 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -4247,8 +4247,8 @@ msgstr " ユーザー定義補完 (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " オムニ補完 (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " 綴り修正候補 (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " 綴り修正候補 (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " 局所キーワード補完 (^N^P)"
@@ -5092,8 +5092,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    この場合には \":recover\" か \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    この場合には \":recover\" か \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index 8a6b228b18..03dff518f3 100644
--- a/src/nvim/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
@@ -381,8 +381,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni 완성 (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " 단어 제안 (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " 단어 제안 (^S^N^P)"
 
 #: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
@@ -3957,8 +3957,8 @@ msgstr ""
 "(2) 파일을 고치다가 죽었었습니다.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    만약 그렇다면 \":recover\" 혹은 \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    만약 그렇다면 \":recover\" 혹은 \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/nb.po b/src/nvim/po/nb.po
index 75f4eb28a3..d512789246 100644
--- a/src/nvim/po/nb.po
+++ b/src/nvim/po/nb.po
@@ -401,8 +401,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni-fullf�ring (^O^N^P)"
 
 #: ../edit.c:96
-#, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " Staveforslag (^S^N^P)"
 
 #: ../edit.c:97
@@ -3979,8 +3978,8 @@ msgstr ""
 "(2) En �kt for denne filen kr�sjet.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Hvis det er tilfelle, bruk \":recover\" eller \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Hvis det er tilfelle, bruk \":recover\" eller \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/nl.po b/src/nvim/po/nl.po
index d07c566e28..f6ce5ddc9f 100644
--- a/src/nvim/po/nl.po
+++ b/src/nvim/po/nl.po
@@ -384,8 +384,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " omni-voltooiing (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " spellingsuggestie (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " spellingsuggestie (^S^N^P)"
 
 #: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
@@ -3984,8 +3984,8 @@ msgstr ""
 "(2) Een sessie waarin dit bestand werd bewerkt is onverhoeds gestopt.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Als dit het geval is, gebruikt dan \":recover\" of \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Als dit het geval is, gebruikt dan \":recover\" of \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/no.po b/src/nvim/po/no.po
index 75f4eb28a3..d512789246 100644
--- a/src/nvim/po/no.po
+++ b/src/nvim/po/no.po
@@ -401,8 +401,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni-fullf�ring (^O^N^P)"
 
 #: ../edit.c:96
-#, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " Staveforslag (^S^N^P)"
 
 #: ../edit.c:97
@@ -3979,8 +3978,8 @@ msgstr ""
 "(2) En �kt for denne filen kr�sjet.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Hvis det er tilfelle, bruk \":recover\" eller \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Hvis det er tilfelle, bruk \":recover\" eller \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
index c00130ac8c..b7200a7ba8 100644
--- a/src/nvim/po/pl.UTF-8.po
+++ b/src/nvim/po/pl.UTF-8.po
@@ -380,8 +380,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni uzupełnianie (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr "Propozycja pisowni (^L^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr "Propozycja pisowni (^S^N^P)"
 
 #: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
@@ -3946,8 +3946,8 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Sesja edycji dla pliku załamała się.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Jeśli tak, to użyj \":recover\" lub \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Jeśli tak, to użyj \":recover\" lub \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/pt_BR.po b/src/nvim/po/pt_BR.po
index ca5a4508c7..3f2f87991c 100644
--- a/src/nvim/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
@@ -625,8 +625,8 @@ msgstr ""
 "(2) Ocorreu um travamento numa sess�o de edi��o desse arquivo.\n"
 
 #: ../memline.c:3206
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Se esse for o caso, use \":recover\" ou \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Se esse for o caso, use \":recover\" ou \"nvim -r "
 
 #: ../memline.c:3208
 msgid ""
@@ -5610,8 +5610,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Completa��o inteligente (^O^N^P)"
 
 #: ../edit.c:97
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Sugest�o de ortografia (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Sugest�o de ortografia (^S^N^P)"
 
 #: ../edit.c:98
 msgid " Keyword Local completion (^N^P)"
diff --git a/src/nvim/po/ru.po b/src/nvim/po/ru.po
index 160de6c67e..64c18f890c 100644
--- a/src/nvim/po/ru.po
+++ b/src/nvim/po/ru.po
@@ -382,8 +382,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omni-дополнение (^O^N^P)"
 
 #: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Предложение исправления правописания (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Предложение исправления правописания (^S^N^P)"
 
 #: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
@@ -3985,8 +3985,8 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Сеанс редактирования этого файла завершён аварийно.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    В этом случае, используйте команду \":recover\" или \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    В этом случае, используйте команду \":recover\" или \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
index f0fdc47a1e..9510a357f0 100644
--- a/src/nvim/po/sk.cp1250.po
+++ b/src/nvim/po/sk.cp1250.po
@@ -383,8 +383,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Dopl�ovanie tagov (^O^N^P)"
 
 #: ../edit.c:96
-#, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " Dopl�ovanie cel�ch riadkov (^S^N^P)"
 
 #: ../edit.c:97
@@ -3976,8 +3975,8 @@ msgstr ""
 "(2) �prava tohoto s�boru bola preru�en� neo�ak�van�m ukon�en�m programu.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Ak je tomu tak, potom pou�ite \":recover\" alebo \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Ak je tomu tak, potom pou�ite \":recover\" alebo \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/sk.po b/src/nvim/po/sk.po
index 2d6b4ed901..21791e0061 100644
--- a/src/nvim/po/sk.po
+++ b/src/nvim/po/sk.po
@@ -383,8 +383,7 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Dopl�ovanie tagov (^O^N^P)"
 
 #: ../edit.c:96
-#, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " Dopl�ovanie cel�ch riadkov (^S^N^P)"
 
 #: ../edit.c:97
@@ -3976,8 +3975,8 @@ msgstr ""
 "(2) �prava tohoto s�boru bola preru�en� neo�ak�van�m ukon�en�m programu.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Ak je tomu tak, potom pou�ite \":recover\" alebo \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Ak je tomu tak, potom pou�ite \":recover\" alebo \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po
index 4a9dcf4a5d..1cbb37eeb1 100644
--- a/src/nvim/po/sr.po
+++ b/src/nvim/po/sr.po
@@ -643,8 +643,8 @@ msgstr " Кориснички дефинисано довршавање (^U^N^P)
 msgid " Omni completion (^O^N^P)"
 msgstr " Omni довршавање (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Правописни предлог (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Правописни предлог (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Довршавање локалне кључне речи (^N^P)"
@@ -3002,8 +3002,8 @@ msgstr " Кориснички дефинисано довршавање (^U^N^P)
 msgid " Omni completion (^O^N^P)"
 msgstr " Omni довршавање (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Правописни предлог (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Правописни предлог (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Довршавање локалне кључне речи (^N^P)"
@@ -4048,8 +4048,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Сесија уређивања ове датотеке се срушила.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Ако је ово случај, користите \":recover\" или \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Ако је ово случај, користите \":recover\" или \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/sv.po b/src/nvim/po/sv.po
index e46579c067..89a7717746 100644
--- a/src/nvim/po/sv.po
+++ b/src/nvim/po/sv.po
@@ -4335,8 +4335,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " Omnikomplettering (^O^N^P)"
 
 #: ../edit.c:97
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Stavningsf�rslag (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Stavningsf�rslag (^S^N^P)"
 
 #: ../edit.c:98
 msgid " Keyword Local completion (^N^P)"
@@ -6171,8 +6171,8 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) En redigeringssession f�r den h�r filen kraschade.\n"
 
 #: ../memline.c:3200
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Om s� �r fallet, anv�nd \":recover\" eller \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Om s� �r fallet, anv�nd \":recover\" eller \"nvim -r "
 
 #: ../memline.c:3202
 msgid ""
diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po
index 08b97ec180..5b9a549cb2 100644
--- a/src/nvim/po/tr.po
+++ b/src/nvim/po/tr.po
@@ -3109,8 +3109,8 @@ msgstr " Kullanıcı tanımlı tamamlamalar (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Omni tamamlaması (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Yazım önerisi (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Yazım önerisi (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Dahili anahtar sözcük tamamlaması (^N^P)"
@@ -3947,8 +3947,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Bu dosya düzenleme oturumu çöktü.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Durum buysa \":recover\" veya \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Durum buysa \":recover\" veya \"nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index e62de86b09..6f2f90ad2c 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -4254,8 +4254,8 @@ msgstr " Користувацьке доповнення (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " Кмітливе доповнення (^O^N^P)"
 
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Орфографічна підказка (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Орфографічна підказка (^S^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " Доповнення місцевих ключових слів (^N^P)"
@@ -5108,8 +5108,8 @@ msgstr ""
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Сеанс редагування цього файлу зазнав краху.\n"
 
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Якщо це справді трапилося, спробуйте «:recover» або «vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    Якщо це справді трапилося, спробуйте «:recover» або «nvim -r "
 
 msgid ""
 "\"\n"
diff --git a/src/nvim/po/vi.po b/src/nvim/po/vi.po
index 44772c99ad..3e88ac446c 100644
--- a/src/nvim/po/vi.po
+++ b/src/nvim/po/vi.po
@@ -388,7 +388,7 @@ msgstr " Tự động kết thúc thẻ đánh dấu (^]^N^P)"
 
 #: ../edit.c:96
 #, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " Tự động kết thúc cho cả dòng (^L^N^P)"
 
 #: ../edit.c:97
@@ -4009,9 +4009,9 @@ msgstr ""
 "(2) Lần soạn thảo trước của tập tin này gặp sự cố.\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
 msgstr ""
-"    Trong trường hợp này, hãy sử dụng câu lệnh \":recover\" hoặc \"vim -r "
+"    Trong trường hợp này, hãy sử dụng câu lệnh \":recover\" hoặc \"nvim -r "
 
 #: ../memline.c:3249
 msgid ""
diff --git a/src/nvim/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
index af050823d3..e30fc47806 100644
--- a/src/nvim/po/zh_CN.UTF-8.po
+++ b/src/nvim/po/zh_CN.UTF-8.po
@@ -3716,8 +3716,8 @@ msgid " Omni completion (^O^N^P)"
 msgstr " 全能补全 (^O^N^P)"
 
 #: ../insexpand.c:113
-msgid " Spelling suggestion (s^N^P)"
-msgstr " 拼写建议 (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " 拼写建议 (^S^N^P)"
 
 #: ../insexpand.c:114
 msgid " Keyword Local completion (^N^P)"
@@ -4780,8 +4780,8 @@ msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) 上次编辑此文件时崩溃。\n"
 
 #: ../memline.c:3099
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    如果是这样，请用 \":recover\" 或 \"vim -r "
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    如果是这样，请用 \":recover\" 或 \"nvim -r "
 
 #: ../memline.c:3101
 msgid ""
diff --git a/src/nvim/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
index cba95e2af2..cbbc4ad6eb 100644
--- a/src/nvim/po/zh_TW.UTF-8.po
+++ b/src/nvim/po/zh_TW.UTF-8.po
@@ -421,7 +421,7 @@ msgstr " 標籤自動完成 (^]^N^P)"
 
 #: ../edit.c:96
 #, fuzzy
-msgid " Spelling suggestion (s^N^P)"
+msgid " Spelling suggestion (^S^N^P)"
 msgstr " 整行自動完成 (^L^N^P)"
 
 #: ../edit.c:97
@@ -4017,8 +4017,8 @@ msgstr ""
 "(2) 前次編輯此檔時當機\n"
 
 #: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    如果是這樣, 請用 \":recover\" 或 \"vim -r"
+msgid "    If this is the case, use \":recover\" or \"nvim -r "
+msgstr "    如果是這樣, 請用 \":recover\" 或 \"nvim -r"
 
 #: ../memline.c:3249
 msgid ""