From c302dbcc96d03dc6547f1515ca350ab79bb8761d Mon Sep 17 00:00:00 2001
From: Serge Gautherie <reactos-git_serge_171003@gautherie.fr>
Date: Thu, 17 Oct 2024 00:45:29 +0200
Subject: [PATCH] [FORMAT] wmain(): Call GetLastError() immediately

and adapt STRING_ERROR_DRIVE_TYPE strings.
---
 base/system/format/format.c      | 29 +++++++++++++++--------------
 base/system/format/lang/bg-BG.rc |  2 +-
 base/system/format/lang/cs-CZ.rc |  2 +-
 base/system/format/lang/de-DE.rc |  2 +-
 base/system/format/lang/el-GR.rc |  2 +-
 base/system/format/lang/en-US.rc |  2 +-
 base/system/format/lang/es-ES.rc |  2 +-
 base/system/format/lang/fr-FR.rc |  2 +-
 base/system/format/lang/hu-HU.rc |  2 +-
 base/system/format/lang/id-ID.rc |  2 +-
 base/system/format/lang/it-IT.rc |  2 +-
 base/system/format/lang/ja-JP.rc |  2 +-
 base/system/format/lang/lt-LT.rc |  2 +-
 base/system/format/lang/no-NO.rc |  2 +-
 base/system/format/lang/pl-PL.rc |  2 +-
 base/system/format/lang/ro-RO.rc |  2 +-
 base/system/format/lang/ru-RU.rc |  2 +-
 base/system/format/lang/sk-SK.rc |  2 +-
 base/system/format/lang/sq-AL.rc |  2 +-
 base/system/format/lang/tr-TR.rc |  2 +-
 base/system/format/lang/uk-UA.rc |  2 +-
 base/system/format/lang/zh-CN.rc |  2 +-
 base/system/format/lang/zh-TW.rc |  2 +-
 23 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/base/system/format/format.c b/base/system/format/format.c
index 20d82a6b6c5..3c1d200b59e 100644
--- a/base/system/format/format.c
+++ b/base/system/format/format.c
@@ -369,6 +369,7 @@ int wmain(int argc, WCHAR *argv[])
     DWORD serialNumber;
     ULARGE_INTEGER totalNumberOfBytes, totalNumberOfFreeBytes;
     WCHAR szMsg[RC_STRING_MAX_SIZE];
+    DWORD dwError;
 
     /* Initialize the Console Standard Streams */
     ConInitStdStreams();
@@ -423,9 +424,9 @@ int wmain(int argc, WCHAR *argv[])
     driveType = GetDriveTypeW(RootDirectory);
     switch (driveType)
     {
-        case DRIVE_UNKNOWN :
-            K32LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg));
-            PrintWin32Error(szMsg, GetLastError());
+        case DRIVE_UNKNOWN:
+        case DRIVE_NO_ROOT_DIR: // This case used to report STRING_NO_VOLUME, which has no ".\n".
+            ConResPuts(StdErr, STRING_ERROR_DRIVE_TYPE);
             return -1;
 
         case DRIVE_REMOTE:
@@ -433,11 +434,6 @@ int wmain(int argc, WCHAR *argv[])
             ConResPuts(StdOut, STRING_NO_SUPPORT);
             return -1;
 
-        case DRIVE_NO_ROOT_DIR:
-            K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg));
-            PrintWin32Error(szMsg, GetLastError());
-            return -1;
-
         case DRIVE_REMOVABLE:
             ConResPrintf(StdOut, STRING_INSERT_DISK, RootDirectory[0]);
             fgetws(input, ARRAYSIZE(input), stdin);
@@ -474,14 +470,15 @@ int wmain(int argc, WCHAR *argv[])
                                NULL, NULL, NULL,
                                fileSystem, ARRAYSIZE(fileSystem)))
     {
-        if (GetLastError() == ERROR_UNRECOGNIZED_VOLUME)
+        dwError = GetLastError();
+        if (dwError == ERROR_UNRECOGNIZED_VOLUME)
         {
             wcscpy(fileSystem, L"RAW");
         }
         else
         {
             K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg));
-            PrintWin32Error(szMsg, GetLastError());
+            PrintWin32Error(szMsg, dwError);
             return -1;
         }
     }
@@ -505,8 +502,9 @@ int wmain(int argc, WCHAR *argv[])
                              &totalNumberOfBytes,
                              NULL))
     {
+        dwError = GetLastError();
         K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg));
-        PrintWin32Error(szMsg, GetLastError());
+        PrintWin32Error(szMsg, dwError);
         return -1;
     }
 
@@ -605,8 +603,9 @@ int wmain(int argc, WCHAR *argv[])
         input[wcslen(input) - 1] = 0;
         if (!SetVolumeLabelW(RootDirectory, input))
         {
+            dwError = GetLastError();
             K32LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg));
-            PrintWin32Error(szMsg, GetLastError());
+            PrintWin32Error(szMsg, dwError);
             return -1;
         }
     }
@@ -619,8 +618,9 @@ int wmain(int argc, WCHAR *argv[])
                              &totalNumberOfBytes,
                              &totalNumberOfFreeBytes))
     {
+        dwError = GetLastError();
         K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg));
-        PrintWin32Error(szMsg, GetLastError());
+        PrintWin32Error(szMsg, dwError);
         return -1;
     }
 
@@ -635,8 +635,9 @@ int wmain(int argc, WCHAR *argv[])
                                &serialNumber, NULL, NULL,
                                NULL, 0))
     {
+        dwError = GetLastError();
         K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg));
-        PrintWin32Error(szMsg, GetLastError());
+        PrintWin32Error(szMsg, dwError);
         return -1;
     }
 
diff --git a/base/system/format/lang/bg-BG.rc b/base/system/format/lang/bg-BG.rc
index 75fe6e4d804..cefadb9aa91 100644
--- a/base/system/format/lang/bg-BG.rc
+++ b/base/system/format/lang/bg-BG.rc
@@ -29,7 +29,7 @@ BEGIN
     STRING_FMIFS_FAIL "Неуспешно определяне разположението на входните точки на FMIFS\n\n"
     STRING_UNKNOW_ARG "Неизвестен ключ: %s\n"
     STRING_DRIVE_PARM "Задължителният ключ за името на устройството липсва.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Неуспешно определяне вида на устройството"
+    STRING_ERROR_DRIVE_TYPE "Неуспешно определяне вида на устройството.\n"
     STRING_INSERT_DISK "Сложете нова дискета в устройство %C:\n,след което натиснете Enter..."
     STRING_NO_VOLUME "Неуспешно определяне на тома"
     STRING_NO_VOLUME_SIZE "Неуспешно определяне на размера на тома"
diff --git a/base/system/format/lang/cs-CZ.rc b/base/system/format/lang/cs-CZ.rc
index 329893e7c1d..545b2c5a2fb 100644
--- a/base/system/format/lang/cs-CZ.rc
+++ b/base/system/format/lang/cs-CZ.rc
@@ -27,7 +27,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nelze najít vstupní body FMIFS.\n\n"
     STRING_UNKNOW_ARG "Neznámý agrument: %s\n"
     STRING_DRIVE_PARM "Schází nutný parametr disku.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nelze zjistit typ disku"
+    STRING_ERROR_DRIVE_TYPE "Nelze zjistit typ disku.\n"
     STRING_INSERT_DISK "Vložte novou disketu do jednotky %C:\na poté stiskněte klávesu ENTER..."
     STRING_NO_VOLUME "Nelze zjistit svazek"
     STRING_NO_VOLUME_SIZE "Nelze zjistit velikost svazku"
diff --git a/base/system/format/lang/de-DE.rc b/base/system/format/lang/de-DE.rc
index 3242887f855..72bf6b92a92 100644
--- a/base/system/format/lang/de-DE.rc
+++ b/base/system/format/lang/de-DE.rc
@@ -32,7 +32,7 @@ BEGIN
     STRING_FMIFS_FAIL "Kann FMIFS-Eingangspunkte nicht lokalisieren.\n\n"
     STRING_UNKNOW_ARG "Unbekanntes Argument: %s\n"
     STRING_DRIVE_PARM "Benötigter Laufwerksparameter fehlt.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten"
+    STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten.\n"
     STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund drücken Sie ENTER, wenn das Laufwerk bereit ist."
     STRING_NO_VOLUME "Kann Medium nicht abfragen"
     STRING_NO_VOLUME_SIZE "Kann Mediengröße nicht abfragen"
diff --git a/base/system/format/lang/el-GR.rc b/base/system/format/lang/el-GR.rc
index f25a676d79f..d71bd676570 100644
--- a/base/system/format/lang/el-GR.rc
+++ b/base/system/format/lang/el-GR.rc
@@ -30,7 +30,7 @@ BEGIN
     STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n"
     STRING_UNKNOW_ARG "Άγνωστο όρισμα: %s\n"
     STRING_DRIVE_PARM "Required drive parameter is missing.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Δεν ήταν δυνατή η ανάγνωση του τύπου του τόμου."
+    STRING_ERROR_DRIVE_TYPE "Δεν ήταν δυνατή η ανάγνωση του τύπου του τόμου.\n"
     STRING_INSERT_DISK "ΕΙσάγετε μια νέα δισκέτα στο %C:\nκαι πατήστε Enter όταν είστε έτοιμοι..."
     STRING_NO_VOLUME "Could not query volume"
     STRING_NO_VOLUME_SIZE "Could not query volume size"
diff --git a/base/system/format/lang/en-US.rc b/base/system/format/lang/en-US.rc
index 2990400cd74..dda08f0732c 100644
--- a/base/system/format/lang/en-US.rc
+++ b/base/system/format/lang/en-US.rc
@@ -28,7 +28,7 @@ BEGIN
     STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n"
     STRING_UNKNOW_ARG "Unknown argument: %s\n"
     STRING_DRIVE_PARM "Required drive parameter is missing.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Could not get drive type"
+    STRING_ERROR_DRIVE_TYPE "Could not get drive type.\n"
     STRING_INSERT_DISK "Insert a new floppy in drive %C:\nand press Enter when ready..."
     STRING_NO_VOLUME "Could not query volume"
     STRING_NO_VOLUME_SIZE "Could not query volume size"
diff --git a/base/system/format/lang/es-ES.rc b/base/system/format/lang/es-ES.rc
index 7930c1794b3..c6b118dff59 100644
--- a/base/system/format/lang/es-ES.rc
+++ b/base/system/format/lang/es-ES.rc
@@ -28,7 +28,7 @@ BEGIN
     STRING_FMIFS_FAIL "Imposible localizar puntos de entrada FMIFS.\n\n"
     STRING_UNKNOW_ARG "Argumento desconocido: %s\n"
     STRING_DRIVE_PARM "Parámetro de unidad requerido no encontrado.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Imposible determinar el tipo de unidad"
+    STRING_ERROR_DRIVE_TYPE "Imposible determinar el tipo de unidad.\n"
     STRING_INSERT_DISK "Inserte un nuevo disco en la unidad %C:\ny presione Enter cuando esté preparado..."
     STRING_NO_VOLUME "Imposible consultar el volumen"
     STRING_NO_VOLUME_SIZE "Imposible consultar el tamaño de volumen"
diff --git a/base/system/format/lang/fr-FR.rc b/base/system/format/lang/fr-FR.rc
index 70385a8bb97..2321978f3f7 100644
--- a/base/system/format/lang/fr-FR.rc
+++ b/base/system/format/lang/fr-FR.rc
@@ -26,7 +26,7 @@ BEGIN
     STRING_FMIFS_FAIL "Impossible de trouver les points d'entrée FMIFS.\n\n"
     STRING_UNKNOW_ARG "Argument inconnu : %s\n"
     STRING_DRIVE_PARM "Le disque à formater n'est pas indiqué.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Impossible d'obtenir le type de disque"
+    STRING_ERROR_DRIVE_TYPE "Impossible d'obtenir le type de disque.\n"
     STRING_INSERT_DISK "Mettre une nouvelle disquette dans le lecteur %C:\n et appuyer sur Entrée..."
     STRING_NO_VOLUME "Impossible de trouver le disque"
     STRING_NO_VOLUME_SIZE "Impossible de déterminer la taille du disque"
diff --git a/base/system/format/lang/hu-HU.rc b/base/system/format/lang/hu-HU.rc
index 9105327e755..8dbce283d6c 100644
--- a/base/system/format/lang/hu-HU.rc
+++ b/base/system/format/lang/hu-HU.rc
@@ -32,7 +32,7 @@ BEGIN
     STRING_FMIFS_FAIL "Az FMIFS belépési pontok nem találhatók.\n\n"
     STRING_UNKNOW_ARG "Érvénytelen paraméter: %s\n"
     STRING_DRIVE_PARM "Hiányzik a meghajtó meghatározás.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát"
+    STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát.\n"
     STRING_INSERT_DISK "Helyezzen be új lemezt a következő meghajtóba: %C:\nHa készen áll, nyomja meg az ENTER billentyűt..."
     STRING_NO_VOLUME "Nem sikerült megállapítani címkét"
     STRING_NO_VOLUME_SIZE "Nem sikerült megállapítani a kötet méretét"
diff --git a/base/system/format/lang/id-ID.rc b/base/system/format/lang/id-ID.rc
index 8369ece9de6..60ed8ccb294 100644
--- a/base/system/format/lang/id-ID.rc
+++ b/base/system/format/lang/id-ID.rc
@@ -29,7 +29,7 @@ BEGIN
     STRING_FMIFS_FAIL "Tidak bisa menemukan FMIFS entry points.\n\n"
     STRING_UNKNOW_ARG "Argumen tidak dikenal: %s\n"
     STRING_DRIVE_PARM "Parameter drive yang diperlukan hilang.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Tidak bisa mendapatkan jenis drive"
+    STRING_ERROR_DRIVE_TYPE "Tidak bisa mendapatkan jenis drive.\n"
     STRING_INSERT_DISK "Sisipkan disket baru di drive %C:\ndan tekan Enter bila siap..."
     STRING_NO_VOLUME "Tidak bisa memdapatkan volume"
     STRING_NO_VOLUME_SIZE "Tidak bisa mendapatkan ukuran volume"
diff --git a/base/system/format/lang/it-IT.rc b/base/system/format/lang/it-IT.rc
index 0add43bd09a..08ca2e5d9cd 100644
--- a/base/system/format/lang/it-IT.rc
+++ b/base/system/format/lang/it-IT.rc
@@ -27,7 +27,7 @@ BEGIN
     STRING_FMIFS_FAIL "Impossibile trovare 'FMIFS entry points'.\n\n"
     STRING_UNKNOW_ARG "Parametro sconosciuto: %s\n"
     STRING_DRIVE_PARM "Manca il parametro 'drive'.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Impossibile rilevare il tipo di drive"
+    STRING_ERROR_DRIVE_TYPE "Impossibile rilevare il tipo di drive.\n"
     STRING_INSERT_DISK "Inserire un floppy nuovo nel drive %C:\n e successivamente premere Invio..."
     STRING_NO_VOLUME "Impossibile rilevare il volume"
     STRING_NO_VOLUME_SIZE "Impossibile rilevare la dimensione del volume"
diff --git a/base/system/format/lang/ja-JP.rc b/base/system/format/lang/ja-JP.rc
index f0203afbcbb..b1cb767b9e1 100644
--- a/base/system/format/lang/ja-JP.rc
+++ b/base/system/format/lang/ja-JP.rc
@@ -31,7 +31,7 @@ BEGIN
     STRING_FMIFS_FAIL "FMIFS エントリ ポイント を設定できませんでした。\n\n"
     STRING_UNKNOW_ARG "不明な引数: %s\n"
     STRING_DRIVE_PARM "必要なドライブを指定するパラメータが不足しています。\n\n"
-    STRING_ERROR_DRIVE_TYPE "ドライブの種類がわかりませんでした"
+    STRING_ERROR_DRIVE_TYPE "ドライブの種類がわかりませんでした。\n"
     STRING_INSERT_DISK "%C: ドライブに新しいフロッピーを挿入してください。\n準備ができたら、[Enter] キーを押してください..."
     STRING_NO_VOLUME "ボリュームの問い合わせができませんでした"
     STRING_NO_VOLUME_SIZE "ボリューム サイズの問い合わせができませんでした"
diff --git a/base/system/format/lang/lt-LT.rc b/base/system/format/lang/lt-LT.rc
index 30819ecb5a3..80b32b626b8 100644
--- a/base/system/format/lang/lt-LT.rc
+++ b/base/system/format/lang/lt-LT.rc
@@ -28,7 +28,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nepavyko rasti FMIFS įėjimo taškų.\n\n"
     STRING_UNKNOW_ARG "Nežinomas parametras: %s\n"
     STRING_DRIVE_PARM "Trūksta reikiamo disko parametro.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nepavyko nustatyti disko tipo"
+    STRING_ERROR_DRIVE_TYPE "Nepavyko nustatyti disko tipo.\n"
     STRING_INSERT_DISK "Į įrenginį %C:\nįdėkite naują diskelį ir paspaukite Enter..."
     STRING_NO_VOLUME "Nepavyko kreiptis į tomą"
     STRING_NO_VOLUME_SIZE "Nepavyko nustatyti tomo dydžio"
diff --git a/base/system/format/lang/no-NO.rc b/base/system/format/lang/no-NO.rc
index d3e5b10f4f6..8ed731a533e 100644
--- a/base/system/format/lang/no-NO.rc
+++ b/base/system/format/lang/no-NO.rc
@@ -28,7 +28,7 @@ BEGIN
     STRING_FMIFS_FAIL "Kunne ikke befinne seg FMIFS artikkel momenter.\n\n"
     STRING_UNKNOW_ARG "Ukjent argument: %s\n"
     STRING_DRIVE_PARM "Obligatorisk drive parameter er mistet.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Kunne ikke få drive typen"
+    STRING_ERROR_DRIVE_TYPE "Kunne ikke få drive typen.\n"
     STRING_INSERT_DISK "Sett inn en ny diskett i stasjon %C:\nog trykk på Enter når du er klar..."
     STRING_NO_VOLUME "Kunne ikke spørre om volumet"
     STRING_NO_VOLUME_SIZE "Kunne ikke spørre om volumet størrelse"
diff --git a/base/system/format/lang/pl-PL.rc b/base/system/format/lang/pl-PL.rc
index aa4a70720cf..df2e825734e 100644
--- a/base/system/format/lang/pl-PL.rc
+++ b/base/system/format/lang/pl-PL.rc
@@ -31,7 +31,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nie można zlokalizować punktów wejściowych FMIFS.\n\n"
     STRING_UNKNOW_ARG "Nieprawidłowy parametr: %s\n"
     STRING_DRIVE_PARM "Brakujący wymagany parametr dysku.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nie można określić rodzaju dysku"
+    STRING_ERROR_DRIVE_TYPE "Nie można określić rodzaju dysku.\n"
     STRING_INSERT_DISK "Włóż nowy dysk do napędu %C:\ni naciśnij Enter..."
     STRING_NO_VOLUME "Nie można odczytać woluminu"
     STRING_NO_VOLUME_SIZE "Nie można odczytać rozmiaru woluminu"
diff --git a/base/system/format/lang/ro-RO.rc b/base/system/format/lang/ro-RO.rc
index 3a4103eaf0d..1b611e5fdf7 100644
--- a/base/system/format/lang/ro-RO.rc
+++ b/base/system/format/lang/ro-RO.rc
@@ -33,7 +33,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nu s-au putut localiza punctele de intrare FMIFS.\n\n"
     STRING_UNKNOW_ARG "Argument necunoscut: %s\n"
     STRING_DRIVE_PARM "Lipsește argumentul (obligatoriu) ce indică unitatea de stocare.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nu se poate determina tipul discului"
+    STRING_ERROR_DRIVE_TYPE "Nu se poate determina tipul discului.\n"
     STRING_INSERT_DISK "Introduceți un disc flexibil în unitatea %C:\napoi apăsați Enter pentru a continua..."
     STRING_NO_VOLUME "Nu se poate accesa volumul"
     STRING_NO_VOLUME_SIZE "Nu se poate determina dimensiunea volumului"
diff --git a/base/system/format/lang/ru-RU.rc b/base/system/format/lang/ru-RU.rc
index fcedd2654b6..614ec343416 100644
--- a/base/system/format/lang/ru-RU.rc
+++ b/base/system/format/lang/ru-RU.rc
@@ -29,7 +29,7 @@ BEGIN
     STRING_FMIFS_FAIL "Невозможно определить расположение точек входа FMIFS.\n\n"
     STRING_UNKNOW_ARG "Неправильные аргументы: %s\n"
     STRING_DRIVE_PARM "Требуемый параметр операции отсутствует.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Не удалось получить тип тома"
+    STRING_ERROR_DRIVE_TYPE "Не удалось получить тип тома.\n"
     STRING_INSERT_DISK "Вставьте чистый диск в устройство чтения %C:\nи нажмите Enter для продолжения..."
     STRING_NO_VOLUME "Не удалось выполнить запрос к тому"
     STRING_NO_VOLUME_SIZE "Не удалось определить размер тома"
diff --git a/base/system/format/lang/sk-SK.rc b/base/system/format/lang/sk-SK.rc
index 7411a75db96..a5778b2ffd0 100644
--- a/base/system/format/lang/sk-SK.rc
+++ b/base/system/format/lang/sk-SK.rc
@@ -29,7 +29,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nepodarilo sa lokalizovať vstupné body FMIFS.\n\n"
     STRING_UNKNOW_ARG "Neznámy argument: %s\n"
     STRING_DRIVE_PARM "Chýba nevyhnutný parameter jednotky.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nemožno získať typ jednotky"
+    STRING_ERROR_DRIVE_TYPE "Nemožno získať typ jednotky.\n"
     STRING_INSERT_DISK "Vložte novú disketu do jednotky %C:\na potom stlačte ENTER..."
     STRING_NO_VOLUME "Nemožno dotazovať zväzok"
     STRING_NO_VOLUME_SIZE "Nemožno dotazovať veľkosť zväzku"
diff --git a/base/system/format/lang/sq-AL.rc b/base/system/format/lang/sq-AL.rc
index a8a93e55a02..3fbff9a9548 100644
--- a/base/system/format/lang/sq-AL.rc
+++ b/base/system/format/lang/sq-AL.rc
@@ -28,7 +28,7 @@ BEGIN
     STRING_FMIFS_FAIL "Nuk alokohet FMIFS pika hyrjes.\n\n"
     STRING_UNKNOW_ARG "Argument i panjohur: %s\n"
     STRING_DRIVE_PARM "Parametra e duhura te driverit mungojne.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Nuk dihet tipi i driverit"
+    STRING_ERROR_DRIVE_TYPE "Nuk dihet tipi i driverit.\n"
     STRING_INSERT_DISK "Fusni nje floppy ne drive %C:\nadhe shtypni Enter kur te jeni gati..."
     STRING_NO_VOLUME "Nuk mund te pyesi nje volum"
     STRING_NO_VOLUME_SIZE "Nuk mund te pyesi masen e nje volumi"
diff --git a/base/system/format/lang/tr-TR.rc b/base/system/format/lang/tr-TR.rc
index 9504a3dd5d7..2fea331eb4b 100644
--- a/base/system/format/lang/tr-TR.rc
+++ b/base/system/format/lang/tr-TR.rc
@@ -30,7 +30,7 @@ BEGIN
     STRING_FMIFS_FAIL "FMIFS giriş noktaları konumlandırılamadı.\n\n"
     STRING_UNKNOW_ARG "Bilinmeyen değişken: %s\n"
     STRING_DRIVE_PARM "İstenen sürücü değişkeni eksik.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Sürücü türü alınamadı."
+    STRING_ERROR_DRIVE_TYPE "Sürücü türü alınamadı.\n"
     STRING_INSERT_DISK "%C: sürücüsüne yeni bir yumuşak disk yerleştiriniz\nve hazır olduğunda Enter'e basınız..."
     STRING_NO_VOLUME "Birim sorgulanamadı."
     STRING_NO_VOLUME_SIZE "Birim boyutu sorgulanamadı."
diff --git a/base/system/format/lang/uk-UA.rc b/base/system/format/lang/uk-UA.rc
index f6ccf704148..a97178b03db 100644
--- a/base/system/format/lang/uk-UA.rc
+++ b/base/system/format/lang/uk-UA.rc
@@ -27,7 +27,7 @@ BEGIN
     STRING_FMIFS_FAIL "Не зміг знацти FMIFS точки входу.\n\n"
     STRING_UNKNOW_ARG "Невідомий аргумент: %s\n"
     STRING_DRIVE_PARM "Необхідний параметр операції відсутній.\n\n"
-    STRING_ERROR_DRIVE_TYPE "Не вдалося втсанвити тип пристрою"
+    STRING_ERROR_DRIVE_TYPE "Не вдалося втсанвити тип пристрою.\n"
     STRING_INSERT_DISK "Вставте чистий диск в пристрій %C:\nі натисніть Enter щоб продовжити..."
     STRING_NO_VOLUME "Не вдалося виконати запит до пристрою"
     STRING_NO_VOLUME_SIZE "Не вдалося визначити розмір диску"
diff --git a/base/system/format/lang/zh-CN.rc b/base/system/format/lang/zh-CN.rc
index 1f5bba51926..3daff759058 100644
--- a/base/system/format/lang/zh-CN.rc
+++ b/base/system/format/lang/zh-CN.rc
@@ -26,7 +26,7 @@ BEGIN
     STRING_FMIFS_FAIL "不能定位 FMIFS 入口点。\n\n"
     STRING_UNKNOW_ARG "未知参数：%s\n"
     STRING_DRIVE_PARM "必要的驱动器参数缺失。\n\n"
-    STRING_ERROR_DRIVE_TYPE "无法获得驱动器类型"
+    STRING_ERROR_DRIVE_TYPE "无法获得驱动器类型。\n"
     STRING_INSERT_DISK "在驱动器 %C: 中插入一张新的软盘\n就绪时按 Enter..."
     STRING_NO_VOLUME "无法查询卷"
     STRING_NO_VOLUME_SIZE "无法查询卷大小"
diff --git a/base/system/format/lang/zh-TW.rc b/base/system/format/lang/zh-TW.rc
index c9de9f4827c..968186f8d3a 100644
--- a/base/system/format/lang/zh-TW.rc
+++ b/base/system/format/lang/zh-TW.rc
@@ -26,7 +26,7 @@ BEGIN
     STRING_FMIFS_FAIL "無法定位 FMIFS 進入點。\n\n"
     STRING_UNKNOW_ARG "未知參數：%s\n"
     STRING_DRIVE_PARM "缺少必要的磁碟參數。\n\n"
-    STRING_ERROR_DRIVE_TYPE "無法獲得磁碟機類型"
+    STRING_ERROR_DRIVE_TYPE "無法獲得磁碟機類型。\n"
     STRING_INSERT_DISK "在磁碟機 %C: 中插入一張新的軟碟片\n如果您準備就緒，請按 ENTER..."
     STRING_NO_VOLUME "無法查詢磁碟"
     STRING_NO_VOLUME_SIZE "無法查詢磁碟大小"