diff --git a/po/ar.po b/po/ar.po
index 1846f3a1cc5..0d1d5ed7b48 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4669,7 +4669,7 @@ msgstr "متغير البيئة غير موجود.\n"
 msgid "No signal sent.\n"
 msgstr "الإشارة لم ترسل.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "اسم الملف طويل جدًا.\n"
 
diff --git a/po/ast.po b/po/ast.po
index 5da423e6ea9..c6cd174f628 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4541,7 +4541,7 @@ msgstr "Nun s'alcontró la variable d'entornu.\n"
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 79906d44c46..1935223e198 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4693,7 +4693,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index a06513cae05..b0ec55126ba 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4641,7 +4641,7 @@ msgstr "No es troba la variable d'entorn.\n"
 msgid "No signal sent.\n"
 msgstr "No s'ha enviat cap senyal.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "El nom de fitxer és massa llarg.\n"
 
diff --git a/po/cs.po b/po/cs.po
index f5de98a53f6..cc562b83911 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4610,7 +4610,7 @@ msgstr "Proměnná prostředí nebyla nalezena.\n"
 msgid "No signal sent.\n"
 msgstr "Nebyl zaslán žádný signál.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Název souboru je příliš dlouhý.\n"
 
diff --git a/po/da.po b/po/da.po
index 68e1c4aef62..ecdb7181692 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4710,7 +4710,7 @@ msgstr "Miljøvariabel ikke fundet.\n"
 msgid "No signal sent.\n"
 msgstr "Intet signal sendt.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Filnavnet er for langt.\n"
 
diff --git a/po/de.po b/po/de.po
index bcf84359f70..050990bc90e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4633,7 +4633,7 @@ msgstr "Umgebungsvariable nicht gefunden.\n"
 msgid "No signal sent.\n"
 msgstr "Kein Signal gesendet.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Dateiname zu lang.\n"
 
diff --git a/po/el.po b/po/el.po
index 10f0dde9508..d388799b9a7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4596,7 +4596,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 73240cc79db..2edcdb1fa3e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -4624,7 +4624,7 @@ msgstr "Environment variable not found.\n"
 msgid "No signal sent.\n"
 msgstr "No signal sent.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "File name is too long.\n"
 
diff --git a/po/en_US.po b/po/en_US.po
index 49a2b06f5e7..3cecf1e0dbd 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -4624,7 +4624,7 @@ msgstr "Environment variable not found.\n"
 msgid "No signal sent.\n"
 msgstr "No signal sent.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "File name is too long.\n"
 
diff --git a/po/eo.po b/po/eo.po
index a0cacb708d8..e6c5296fa84 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4580,7 +4580,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index c25e6af2ac3..8db7a9c23b1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4642,7 +4642,7 @@ msgstr "Variable de entorno no encontrada.\n"
 msgid "No signal sent.\n"
 msgstr "No se envió una señal.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "El nombre de archivo es demasiado largo.\n"
 
diff --git a/po/fa.po b/po/fa.po
index 2351d407c2b..93f086e18b6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -4612,7 +4612,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index dc8d41255c0..0dd2270ec53 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4617,7 +4617,7 @@ msgstr "Ympäristömuuttujaa ei löytynyt.\n"
 msgid "No signal sent.\n"
 msgstr "Signaalia ei lähetetty.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Tiedostonimi on liian pitkä.\n"
 
diff --git a/po/fr.po b/po/fr.po
index d6622d392ab..8e6de724092 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4646,7 +4646,7 @@ msgstr "Variable d'environnement non trouvée.\n"
 msgid "No signal sent.\n"
 msgstr "Aucun signal envoyé.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Nom de fichier trop long.\n"
 
diff --git a/po/he.po b/po/he.po
index b0823ec59cf..18d21d0843b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4727,7 +4727,7 @@ msgstr "Environment variable %s not defined.\n"
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 #, fuzzy
 msgid "File name is too long.\n"
 msgstr "The input line is too long.\n"
diff --git a/po/hi.po b/po/hi.po
index 11180419217..1c70eff890f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4537,7 +4537,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 75e4204e6fb..732acb781f9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4674,7 +4674,7 @@ msgstr "Varijabla okoline nije pronađena.\n"
 msgid "No signal sent.\n"
 msgstr "Nijedan signal poslan.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Naziv datoteke je predugačak.\n"
 
diff --git a/po/hu.po b/po/hu.po
index d61cbce031f..94faff6d11a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4728,7 +4728,7 @@ msgstr "Környezeti változó nem található.\n"
 msgid "No signal sent.\n"
 msgstr "Nincs szignál jel elküldve.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Fájlnév túl hosszú.\n"
 
diff --git a/po/it.po b/po/it.po
index d54fe28356f..2ba753c9fa5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4736,7 +4736,7 @@ msgstr "Variabile d'ambiente non trovata.\n"
 msgid "No signal sent.\n"
 msgstr "Nessun segnale mandato.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Nome del file troppo lungo.\n"
 
diff --git a/po/ja.po b/po/ja.po
index f2f7a431995..b9e108b4819 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4616,7 +4616,7 @@ msgstr "環境変数が見つかりません。\n"
 msgid "No signal sent.\n"
 msgstr "シグナルが送られていません。\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "ファイル名が長すぎます。\n"
 
diff --git a/po/ko.po b/po/ko.po
index d6c304bfa8d..b4babac1661 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4605,7 +4605,7 @@ msgstr "환경변수를 찾을 수 없습니다.\n"
 msgid "No signal sent.\n"
 msgstr "시그널 전송 실패.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "너무 긴 파일 이름.\n"
 
diff --git a/po/lt.po b/po/lt.po
index 944bdc80c05..1dd944845e8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4627,7 +4627,7 @@ msgstr "Aplinkos kintamasis nerastas.\n"
 msgid "No signal sent.\n"
 msgstr "Joks signalas neišsiųstas.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Failo vardas per ilgas.\n"
 
diff --git a/po/ml.po b/po/ml.po
index 241fdb614ee..a87500e1eee 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -4539,7 +4539,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 311a2f6b649..14f7003b73c 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -4644,7 +4644,7 @@ msgstr "Fant ikke miljøvariablen.\n"
 msgid "No signal sent.\n"
 msgstr "Intet signal sendt.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Filnavnet er for langt.\n"
 
diff --git a/po/nl.po b/po/nl.po
index 2abb4cd694d..bee3e02664e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4638,7 +4638,7 @@ msgstr "Omgevingsvariable niet gevonden.\n"
 msgid "No signal sent.\n"
 msgstr "Geen signaal verzonden.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Bestandsnaam is te lang.\n"
 
diff --git a/po/or.po b/po/or.po
index cd7c61113be..05376fd2859 100644
--- a/po/or.po
+++ b/po/or.po
@@ -4537,7 +4537,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 32ff61bbaf5..55228fe3499 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4537,7 +4537,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 6b7946349aa..2f1655c6394 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4641,7 +4641,7 @@ msgstr "Nie znaleziono zmiennej środowiskowej.\n"
 msgid "No signal sent.\n"
 msgstr "Brak wysłanego sygnału.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Nazwa pliku zbyt długa.\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4203228f5b2..2e924cc924a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4637,7 +4637,7 @@ msgstr "Variável de ambiente não encontrada.\n"
 msgid "No signal sent.\n"
 msgstr "Nenhum sinal enviado.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Nome de arquivo é muito longo.\n"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 01dd6f179a7..08a8a22969a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -4692,7 +4692,7 @@ msgstr "Variável de ambiente não encontrada.\n"
 msgid "No signal sent.\n"
 msgstr "Nenhum sinal enviado.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Nome de ficheiro é muito comprido.\n"
 
diff --git a/po/rm.po b/po/rm.po
index b09b1a8ff35..6e54193f37a 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -4571,7 +4571,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index c9ee6dbb9fc..3b518d4f8f8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -4654,7 +4654,7 @@ msgstr "Variabilă de mediu negăsită.\n"
 msgid "No signal sent.\n"
 msgstr "Niciun semnal trimis.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Numele de fișier este prea lung.\n"
 
diff --git a/po/ru.po b/po/ru.po
index c3cde1acfc9..5a515f5c897 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4646,7 +4646,7 @@ msgstr "Переменная окружения не найдена.\n"
 msgid "No signal sent.\n"
 msgstr "Сигнал не отправлен.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Слишком длинное имя файла.\n"
 
diff --git a/po/si.po b/po/si.po
index 032b69c451c..69e7e6e3d04 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4583,7 +4583,7 @@ msgstr "පරිසරය විචල්‍යය හම්බු වෙලා
 msgid "No signal sent.\n"
 msgstr "සංඥාවක් යැවුවේ නැහැ.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "ගොනුවේ නම දිග වැඩි.\n"
 
diff --git a/po/sk.po b/po/sk.po
index aaf2afb2338..b1a32f75a8a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4624,7 +4624,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 3f5b442dd08..2b752c489fc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4730,7 +4730,7 @@ msgstr "Okoljske spremenljivke ni mogoče najti.\n"
 msgid "No signal sent.\n"
 msgstr "Ni poslanega signala.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Ime datoteke je predolgo.\n"
 
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index c7694246e4b..5e9cc13af6f 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -4750,7 +4750,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 62b31417e12..b0bd89b3be0 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -4844,7 +4844,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 628a7ea434c..be4cb0df4b7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4671,7 +4671,7 @@ msgstr "Miljövariabeln hittades inte.\n"
 msgid "No signal sent.\n"
 msgstr "Ingen signal skickades.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Filnamnet för långt.\n"
 
diff --git a/po/ta.po b/po/ta.po
index f3d80f1708d..1ad48ca2eaf 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -4502,7 +4502,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index c2fb2c6efcc..064d0695332 100644
--- a/po/te.po
+++ b/po/te.po
@@ -4537,7 +4537,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 79d136e1353..9ec3afbc7de 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4620,7 +4620,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 2269babbcf2..7523cac4b56 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4639,7 +4639,7 @@ msgstr "Çevresel değişken bulunamadı.\n"
 msgid "No signal sent.\n"
 msgstr "Gönderilen sinyal yok.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Dosya adı çok uzun.\n"
 
diff --git a/po/uk.po b/po/uk.po
index b4f81e51aef..69394e24686 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4637,7 +4637,7 @@ msgstr "Змінна оточення не знайдена.\n"
 msgid "No signal sent.\n"
 msgstr "Сигнал не відіслано.\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "Ім'я файлу занадто довге.\n"
 
diff --git a/po/wa.po b/po/wa.po
index 1e07f0e9ff4..41e95c11d30 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -4607,7 +4607,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/wine.pot b/po/wine.pot
index 6fe60c589df..a600130a179 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -4491,7 +4491,7 @@ msgstr ""
 msgid "No signal sent.\n"
 msgstr ""
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 01a4ecd6690..70365b2370b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4570,7 +4570,7 @@ msgstr "未找到环境变量。\n"
 msgid "No signal sent.\n"
 msgstr "未发送任何信号。\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "文件名过长。\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 16c22e456a4..6b93f8b8bbf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4576,7 +4576,7 @@ msgstr "找不到環境變數。\n"
 msgid "No signal sent.\n"
 msgstr "未發送任何信號。\n"
 
-#: dlls/kernel32/winerror.mc:818
+#: dlls/kernel32/winerror.mc:818 programs/cmd/cmd.rc:410
 msgid "File name is too long.\n"
 msgstr "檔案名稱過長。\n"
 
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 2ff8e3ba9be..9a262c5fec5 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -472,7 +472,7 @@ void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute)
   /* After this, we need full information on the file,
     which is valid not to exist.  */
   if (!skipFileParsing) {
-    if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) {
+    if (!WCMD_get_fullpath(outputparam, MAX_PATH, fullfilename, &filepart)) {
       exists = FALSE;
       fullfilename[0] = 0x00;
     } else {
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index d14e69e072a..2fc7e07f7aa 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -805,7 +805,7 @@ void WCMD_copy(WCHAR * args) {
     WINE_TRACE("Destination supplied, processing to see if file or directory\n");
 
     /* Convert to fully qualified path/filename */
-    GetFullPathNameW(destination->name, ARRAY_SIZE(destname), destname, &filenamepart);
+    if (!WCMD_get_fullpath(destination->name, ARRAY_SIZE(destname), destname, &filenamepart)) return;
     WINE_TRACE("Full dest name is '%s'\n", wine_dbgstr_w(destname));
 
     /* If parameter is a directory, ensure it ends in \ */
@@ -887,7 +887,7 @@ void WCMD_copy(WCHAR * args) {
 
     /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing
        to where the filename portion begins (used for wildcard expansion).             */
-    GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart);
+    if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return;
     WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath));
 
     /* If parameter is a directory, ensure it ends in \* */
@@ -897,7 +897,7 @@ void WCMD_copy(WCHAR * args) {
       /* We need to know where the filename part starts, so append * and
          recalculate the full resulting path                              */
       lstrcatW(thiscopy->name, L"*");
-      GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart);
+      if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return;
       WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath));
 
     } else if ((wcspbrk(srcpath, L"*?") == NULL) &&
@@ -907,7 +907,7 @@ void WCMD_copy(WCHAR * args) {
       /* We need to know where the filename part starts, so append \* and
          recalculate the full resulting path                              */
       lstrcatW(thiscopy->name, L"\\*");
-      GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart);
+      if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return;
       WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath));
     }
 
@@ -1191,7 +1191,7 @@ static BOOL WCMD_delete_confirm_wildcard(const WCHAR *filename, BOOL *pPrompted)
         WCHAR fpath[MAX_PATH];
 
         /* Convert path into actual directory spec */
-        GetFullPathNameW(filename, ARRAY_SIZE(fpath), fpath, NULL);
+        if (!WCMD_get_fullpath(filename, ARRAY_SIZE(fpath), fpath, NULL)) return FALSE;
         _wsplitpath(fpath, drive, dir, fname, ext);
 
         /* Only prompt for * and *.*, not *a, a*, *.a* etc */
@@ -1319,7 +1319,8 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) {
       WCHAR ext[MAX_PATH];
 
       /* Convert path into actual directory spec */
-      GetFullPathNameW(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL);
+      if (!WCMD_get_fullpath(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL)) return FALSE;
+
       _wsplitpath(thisDir, drive, dir, fname, ext);
 
       lstrcpyW(thisDir, drive);
@@ -2933,8 +2934,8 @@ void WCMD_move (void)
 
   /* If 2nd parm is directory, then use original filename */
   /* Convert partial path to full path */
-  GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL);
-  GetFullPathNameW(param2, ARRAY_SIZE(output), output, NULL);
+  if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL) ||
+      !WCMD_get_fullpath(param2, ARRAY_SIZE(output), output, NULL)) return;
   WINE_TRACE("Move from '%s'('%s') to '%s'\n", wine_dbgstr_w(input),
              wine_dbgstr_w(param1), wine_dbgstr_w(output));
 
@@ -3158,7 +3159,7 @@ void WCMD_rename (void)
   }
 
   /* Convert partial path to full path */
-  GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL);
+  if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL)) return;
   WINE_TRACE("Rename from '%s'('%s') to '%s'\n", wine_dbgstr_w(input),
              wine_dbgstr_w(param1), wine_dbgstr_w(param2));
   dotDst = wcschr(param2, '.');
@@ -3439,7 +3440,7 @@ void WCMD_setshow_default (const WCHAR *args) {
           WCHAR ext[MAX_PATH];
 
           /* Convert path into actual directory spec */
-          GetFullPathNameW(string, ARRAY_SIZE(fpath), fpath, NULL);
+          if (!WCMD_get_fullpath(string, ARRAY_SIZE(fpath), fpath, NULL)) return;
           _wsplitpath(fpath, drive, dir, fname, ext);
 
           /* Rebuild path */
diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc
index fa604a6db56..f72ba87a9a2 100644
--- a/programs/cmd/cmd.rc
+++ b/programs/cmd/cmd.rc
@@ -406,4 +406,5 @@ Enter HELP <command> for further information on any of the above commands.\n"
   WCMD_NOOPERATOR, "Expected an operator.\n"
   WCMD_BADPAREN, "Mismatch in parentheses.\n"
   WCMD_BADHEXOCT, "Badly formed number - must be one of decimal (12),\n hexadecimal (0x34) or octal (056).\n"
+  WCMD_FILENAMETOOLONG, "File name is too long.\n"
 }
diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c
index 24b18bfa81b..807f7b386b1 100644
--- a/programs/cmd/directory.c
+++ b/programs/cmd/directory.c
@@ -787,7 +787,7 @@ void WCMD_directory (WCHAR *args)
       }
       WINE_TRACE("Using location '%s'\n", wine_dbgstr_w(fullname));
 
-      status = GetFullPathNameW(fullname, ARRAY_SIZE(path), path, NULL);
+      if (!WCMD_get_fullpath(fullname, ARRAY_SIZE(path), path, NULL)) continue;
 
       /*
        *  If the path supplied does not include a wildcard, and the endpoint of the
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index a02395ca123..234c253b49a 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -71,6 +71,7 @@ void WCMD_endlocal (void);
 void WCMD_enter_paged_mode(const WCHAR *);
 void WCMD_exit (CMD_LIST **cmdList);
 void WCMD_for (WCHAR *, CMD_LIST **cmdList);
+BOOL WCMD_get_fullpath(const WCHAR *, SIZE_T, WCHAR *, WCHAR **);
 void WCMD_give_help (const WCHAR *args);
 void WCMD_goto (CMD_LIST **cmdList);
 void WCMD_if (WCHAR *, CMD_LIST **cmdList);
@@ -317,3 +318,4 @@ extern WCHAR version_string[];
 #define WCMD_NOOPERATOR       1043
 #define WCMD_BADPAREN         1044
 #define WCMD_BADHEXOCT        1045
+#define WCMD_FILENAMETOOLONG  1046
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 675d7c5f464..65601348b05 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -452,6 +452,18 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR *next, const WCHAR *insert, int le
        memcpy(start, insert, len * sizeof(*insert));
 }
 
+BOOL WCMD_get_fullpath(const WCHAR* in, SIZE_T outsize, WCHAR* out, WCHAR** start)
+{
+    DWORD ret = GetFullPathNameW(in, outsize, out, start);
+    if (!ret) return FALSE;
+    if (ret > outsize)
+    {
+        WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_FILENAMETOOLONG));
+        return FALSE;
+    }
+    return TRUE;
+}
+
 /***************************************************************************
  * WCMD_skip_leading_spaces
  *
@@ -1057,7 +1069,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
   } else {
 
     /* Convert eg. ..\fred to include a directory by removing file part */
-    GetFullPathNameW(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL);
+    if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) return;
     lastSlash = wcsrchr(pathtosearch, '\\');
     if (lastSlash && wcschr(lastSlash, '.') != NULL) extensionsupplied = TRUE;
     lstrcpyW(stemofsearch, lastSlash+1);
@@ -1125,7 +1137,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
 
         /* Since you can have eg. ..\.. on the path, need to expand
            to full information                                      */
-        GetFullPathNameW(temp, MAX_PATH, thisDir, NULL);
+        if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) return;
     }
 
     /* 1. If extension supplied, see if that file exists */
@@ -2564,7 +2576,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[])
         WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg));
         if (wcschr(thisArg, '\\') != NULL) {
 
-          GetFullPathNameW(thisArg, ARRAY_SIZE(string), string, NULL);
+          if (!WCMD_get_fullpath(thisArg, ARRAY_SIZE(string), string, NULL)) return FALSE;
           WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string));
           p = string + lstrlenW(string);