[ros-diffs] 01/01: [MODE] Use more translated strings. CORE-12178

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e78e6a15680cf2e5979…

commit 84e78e6a15680cf2e59796f8554a1fd2dd28e128
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Apr 29 16:56:33 2018 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Apr 29 16:57:11 2018 +0200

    [MODE] Use more translated strings. CORE-12178
---
 base/applications/cmdutils/mode/lang/de-DE.rc | 14 +++++-----
 base/applications/cmdutils/mode/lang/en-US.rc | 14 +++++-----
 base/applications/cmdutils/mode/lang/ro-RO.rc | 13 +++++----
 base/applications/cmdutils/mode/lang/ru-RU.rc | 13 +++++----
 base/applications/cmdutils/mode/lang/tr-TR.rc | 14 +++++-----
 base/applications/cmdutils/mode/lang/zh-CN.rc | 14 +++++-----
 base/applications/cmdutils/mode/mode.c        | 33 ++++++++++++-----------
 base/applications/cmdutils/mode/resource.h    | 38 ++++++++++++++-------------
 8 files changed, 86 insertions(+), 67 deletions(-)

diff --git a/base/applications/cmdutils/mode/lang/de-DE.rc
b/base/applications/cmdutils/mode/lang/de-DE.rc
index 48ae8bcacb..883bc567ae 100644
--- a/base/applications/cmdutils/mode/lang/de-DE.rc
+++ b/base/applications/cmdutils/mode/lang/de-DE.rc
@@ -56,13 +56,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form
%s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "ERROR: Unzulässiger Parameter - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Unzulässiger Gerätename - %s
(0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device
COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device
COM%d:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "Unzulässiger Parameter - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "Unzulässiger Gerätename - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
     IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
     IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
-    IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of
lines and columns specified.\n"
+    IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and
columns specified.\n"
 END
diff --git a/base/applications/cmdutils/mode/lang/en-US.rc
b/base/applications/cmdutils/mode/lang/en-US.rc
index 36cb76a573..9663215a3b 100644
--- a/base/applications/cmdutils/mode/lang/en-US.rc
+++ b/base/applications/cmdutils/mode/lang/en-US.rc
@@ -56,13 +56,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form
%s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device
COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device
COM%d:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "Invalid parameter - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "Illegal device name - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
     IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
     IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
-    IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of
lines and columns specified.\n"
+    IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and
columns specified.\n"
 END
diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc
b/base/applications/cmdutils/mode/lang/ro-RO.rc
index 72822afcbe..6f92acd9db 100644
--- a/base/applications/cmdutils/mode/lang/ro-RO.rc
+++ b/base/applications/cmdutils/mode/lang/ro-RO.rc
@@ -64,12 +64,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "EROARE: Dispozitivul DOS (0x%lx) nu poate fi
interogat.\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) a returnat un formular
nerecunoscut %s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "EROARE: Parametru nevalid - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "EROARE: Nume eronat de dispozitiv - %s
(0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "EROARE: Nu poate fi determinată starea
dispozitivului COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "EROARE: Nu poate fi schimbată starea pentru
dispozitivul COM%d:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "EROARE: SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "Parametru nevalid - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "Nume eronat de dispozitiv - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "Nu poate fi determinată starea dispozitivului
%s:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "Nu poate fi schimbată starea pentru dispozitivul
%s:\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "EROARE: Valoare eronată pentru biții de paritate
%d:\n"
     IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori
%d:\n"
     IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n"
+    IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and
columns specified.\n"
 END
diff --git a/base/applications/cmdutils/mode/lang/ru-RU.rc
b/base/applications/cmdutils/mode/lang/ru-RU.rc
index 01c96d7fd0..7ef70b2368 100644
--- a/base/applications/cmdutils/mode/lang/ru-RU.rc
+++ b/base/applications/cmdutils/mode/lang/ru-RU.rc
@@ -56,12 +56,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "ОШИБКА: Не удалось опросить DOS устройства
(0x%lx).\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) возвратила не опознанное
состояние %s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "ОШИБКА: Неверный параметр - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "ОШИБКА: Недопустимое имя устройства - %s
(0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "ОШИБКА: Не удалось получить состояние устройства
COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "ОШИБКА: Не удалось установить состояние устройства
COM%d:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "ОШИБКА: SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "Неверный параметр - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "Недопустимое имя устройства - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "Не удалось получить состояние устройства
%s:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "Не удалось установить состояние устройства
%s:\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "ОШИБКА: Неверное значение битов четности
%d:\n"
     IDS_ERROR_INVALID_STOP_BITS "ОШИБКА: Неверное значение стоповых битов
%d:\n"
     IDS_ERROR_NO_MEMORY "ОШИБКА: Недостаточно памяти.\n"
+    IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and
columns specified.\n"
 END
diff --git a/base/applications/cmdutils/mode/lang/tr-TR.rc
b/base/applications/cmdutils/mode/lang/tr-TR.rc
index 07003fc7d0..aa919dac56 100644
--- a/base/applications/cmdutils/mode/lang/tr-TR.rc
+++ b/base/applications/cmdutils/mode/lang/tr-TR.rc
@@ -58,13 +58,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "YANLIŞLIK: (0x%lx) DOS aygıtı sorgulanamaz.\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s), %s tanınmamış biçim
döndürdü.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "YANLIŞLIK: Geçersiz değişken - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "YANLIŞLIK: Geçersiz aygıt adı - %s
(0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "YANLIŞLIK: COM%d aygıtının durumu
alınamıyor:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "YANLIŞLIK: COM%d aygıtının durumu
ayarlanamıyor:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "YANLIŞLIK: SetParallelState(%d) -
DefineDosDevice(%s) (0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "Geçersiz değişken - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "Geçersiz aygıt adı - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "%s: aygıtının durumu alınamıyor\n"
+    IDS_ERROR_STATUS_SET_DEVICE "%s: aygıtının durumu ayarlanamıyor\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "YANLIŞLIK: %d Eşlik İkilleri için geçersiz
değer:\n"
     IDS_ERROR_INVALID_STOP_BITS "YANLIŞLIK: %d Durma İkilleri için geçersiz
değer:\n"
     IDS_ERROR_NO_MEMORY "YANLIŞLIK: Yeterli bellek yok.\n"
-    IDS_ERROR_SCREEN_LINES_COL "YANLIŞLIK: Görüntülük, belirtilen yataç ve dikeç
sayısına ayarlanamıyor.\n"
+    IDS_ERROR_SCREEN_LINES_COL "Görüntülük, belirtilen yataç ve dikeç sayısına
ayarlanamıyor.\n"
 END
diff --git a/base/applications/cmdutils/mode/lang/zh-CN.rc
b/base/applications/cmdutils/mode/lang/zh-CN.rc
index 6d752557a7..99bf6f6802 100644
--- a/base/applications/cmdutils/mode/lang/zh-CN.rc
+++ b/base/applications/cmdutils/mode/lang/zh-CN.rc
@@ -56,13 +56,15 @@ STRINGTABLE
 BEGIN
     IDS_ERROR_QUERY_DEVICES "错误: 无法查询 DOS 设备 (0x%lx)。\n"
     IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) 返回无法识别的表格 %s。\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "错误: 无效参数 - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "错误: 非法设备名 - %s (0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "错误: 无法获得设备 COM%d 的状态:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "错误: 无法设置设备 COM%d 的状态:\n"
+    IDS_ERROR_SET_PARALLEL_STATE "错误: SetParallelState(%d) - DefineDosDevice(%s)
(0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "无效参数 - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "非法设备名 - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "无法获得设备 %s: 的状态\n"
+    IDS_ERROR_STATUS_SET_DEVICE "无法设置设备 %s: 的状态\n"
+    IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n"
+    IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n"
     IDS_ERROR_INVALID_PARITY_BITS "错误: 奇偶位 %d 值无效:\n"
     IDS_ERROR_INVALID_STOP_BITS "错误: 终止位 %d 值无效:\n"
     IDS_ERROR_NO_MEMORY "错误: 内存不足。\n"
-    IDS_ERROR_SCREEN_LINES_COL "错误: 屏幕无法被设置成指定的行数和列数。\n"
+    IDS_ERROR_SCREEN_LINES_COL "屏幕无法被设置成指定的行数和列数。\n"
 END
diff --git a/base/applications/cmdutils/mode/mode.c
b/base/applications/cmdutils/mode/mode.c
index 1d17ff7f00..f571549dfb 100644
--- a/base/applications/cmdutils/mode/mode.c
+++ b/base/applications/cmdutils/mode/mode.c
@@ -167,7 +167,7 @@ int ShowParallelStatus(INT nPortNum)
         }
         else
         {
-            ConPrintf(StdErr, L"    QueryDosDeviceW(%s) returned unrecognised form
%s.\n", szPortName, buffer);
+            ConResPrintf(StdErr, IDS_ERROR_QUERY_DEVICES_FORM, szPortName, buffer);
         }
     }
     else
@@ -187,7 +187,7 @@ int SetParallelState(INT nPortNum)
     swprintf(szTargetPath, L"COM%d", nPortNum);
     if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath))
     {
-        ConPrintf(StdErr, L"SetParallelState(%d) - DefineDosDevice(%s) failed:
0x%lx\n", nPortNum, szPortName, GetLastError());
+        ConPrintf(StdErr, L"ERROR: SetParallelState(%d) - DefineDosDevice(%s)
failed: 0x%lx\n", nPortNum, szPortName, GetLastError());
     }
 
     ShowParallelStatus(nPortNum);
@@ -408,12 +408,12 @@ int SetConsoleStateOld(IN PCWSTR ArgStr)
 Quit:
     ClearScreen(hConOut, &csbi);
     if (!ResizeTextConsole(hConOut, &csbi, Resolution))
-        ConPuts(StdErr, L"The screen cannot be set to the number of lines and
columns specified.\n");
+        ConResPuts(StdErr, IDS_ERROR_SCREEN_LINES_COL);
 
     return 0;
 
 invalid_parameter:
-    ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr);
+    ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr);
     return 1;
 }
 
@@ -486,7 +486,7 @@ int SetConsoleState(IN PCWSTR ArgStr)
         else
         {
 invalid_parameter:
-            ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr);
+            ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr);
             return 1;
         }
     }
@@ -495,7 +495,7 @@ invalid_parameter:
     {
         ClearScreen(hConOut, &csbi);
         if (!ResizeTextConsole(hConOut, &csbi, Resolution))
-            ConPuts(StdErr, L"The screen cannot be set to the number of lines and
columns specified.\n");
+            ConResPuts(StdErr, IDS_ERROR_SCREEN_LINES_COL);
     }
     else if (kbdMode)
     {
@@ -537,7 +537,7 @@ int SetConsoleCPState(IN PCWSTR ArgStr)
     else
     {
 invalid_parameter:
-        ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr);
+        ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr);
         return 1;
     }
 
@@ -570,8 +570,7 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS
pCommTimeouts, BOOL bWr
 
     if (hPort == INVALID_HANDLE_VALUE)
     {
-        ConPrintf(StdErr, L"Illegal device name - %s\n", szPortName);
-        ConPrintf(StdErr, L"Last error = 0x%lx\n", GetLastError());
+        ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, GetLastError());
         return FALSE;
     }
 
@@ -579,7 +578,9 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS
pCommTimeouts, BOOL bWr
                      : GetCommState(hPort, pDCB);
     if (!Success)
     {
-        ConPrintf(StdErr, L"Failed to %s the status for device COM%d:\n",
bWrite ? L"set" : L"get", nPortNum);
+        ConResPrintf(StdErr,
+                     bWrite ? IDS_ERROR_STATUS_SET_DEVICE : IDS_ERROR_STATUS_GET_DEVICE,
+                     szPortName);
         goto Quit;
     }
 
@@ -587,7 +588,9 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS
pCommTimeouts, BOOL bWr
                      : GetCommTimeouts(hPort, pCommTimeouts);
     if (!Success)
     {
-        ConPrintf(StdErr, L"Failed to %s timeout status for device COM%d:\n",
bWrite ? L"set" : L"get", nPortNum);
+        ConResPrintf(StdErr,
+                     bWrite ? IDS_ERROR_TIMEOUT_SET_DEVICE :
IDS_ERROR_TIMEOUT_GET_DEVICE,
+                     szPortName);
         goto Quit;
     }
 
@@ -619,12 +622,12 @@ int ShowSerialStatus(INT nPortNum)
     }
     if (dcb.Parity >= ARRAYSIZE(parity_strings))
     {
-        ConPrintf(StdErr, L"ERROR: Invalid value for Parity Bits %d:\n",
dcb.Parity);
+        ConResPrintf(StdErr, IDS_ERROR_INVALID_PARITY_BITS, dcb.Parity);
         dcb.Parity = 0;
     }
     if (dcb.StopBits >= ARRAYSIZE(stopbit_strings))
     {
-        ConPrintf(StdErr, L"ERROR: Invalid value for Stop Bits %d:\n",
dcb.StopBits);
+        ConResPrintf(StdErr, IDS_ERROR_INVALID_STOP_BITS, dcb.StopBits);
         dcb.StopBits = 0;
     }
 
@@ -1087,7 +1090,7 @@ int SetSerialState(INT nPortNum, IN PCWSTR ArgStr)
 
     if (!Success)
     {
-        ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr);
+        ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr);
         return 1;
     }
 
@@ -1282,7 +1285,7 @@ show_status:
     goto Quit;
 
 invalid_parameter:
-    ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr);
+    ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr);
     goto Quit;
 
 Quit:
diff --git a/base/applications/cmdutils/mode/resource.h
b/base/applications/cmdutils/mode/resource.h
index dac782113a..c54e8ac31e 100644
--- a/base/applications/cmdutils/mode/resource.h
+++ b/base/applications/cmdutils/mode/resource.h
@@ -18,20 +18,20 @@
 #define IDS_COM_STATUS_PARITY               7
 #define IDS_COM_STATUS_DATA_BITS            8
 #define IDS_COM_STATUS_STOP_BITS            9
-#define IDS_COM_STATUS_TIMEOUT             10
-#define IDS_COM_STATUS_XON_XOFF            11
-#define IDS_COM_STATUS_CTS_HANDSHAKING     12
-#define IDS_COM_STATUS_DSR_HANDSHAKING     13
-#define IDS_COM_STATUS_DSR_SENSITIVITY     14
-#define IDS_COM_STATUS_DTR_CIRCUIT         15
-#define IDS_COM_STATUS_RTS_CIRCUIT         16
-#define IDS_CONSOLE_STATUS_LINES           17
-#define IDS_CONSOLE_STATUS_COLS            18
-#define IDS_CONSOLE_KBD_RATE               19
-#define IDS_CONSOLE_KBD_DELAY              20
-#define IDS_CONSOLE_CODEPAGE               21
-#define IDS_PRINTER_OUTPUT_NOT_REROUTED    22
-#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23
+#define IDS_COM_STATUS_TIMEOUT              10
+#define IDS_COM_STATUS_XON_XOFF             11
+#define IDS_COM_STATUS_CTS_HANDSHAKING      12
+#define IDS_COM_STATUS_DSR_HANDSHAKING      13
+#define IDS_COM_STATUS_DSR_SENSITIVITY      14
+#define IDS_COM_STATUS_DTR_CIRCUIT          15
+#define IDS_COM_STATUS_RTS_CIRCUIT          16
+#define IDS_CONSOLE_STATUS_LINES            17
+#define IDS_CONSOLE_STATUS_COLS             18
+#define IDS_CONSOLE_KBD_RATE                19
+#define IDS_CONSOLE_KBD_DELAY               20
+#define IDS_CONSOLE_CODEPAGE                21
+#define IDS_PRINTER_OUTPUT_NOT_REROUTED     22
+#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL  23
 
 #define IDS_ERROR_QUERY_DEVICES         24
 #define IDS_ERROR_QUERY_DEVICES_FORM    25
@@ -40,9 +40,11 @@
 #define IDS_ERROR_ILLEGAL_DEVICE_NAME   28
 #define IDS_ERROR_STATUS_GET_DEVICE     29
 #define IDS_ERROR_STATUS_SET_DEVICE     30
-#define IDS_ERROR_INVALID_PARITY_BITS   31
-#define IDS_ERROR_INVALID_STOP_BITS     32
-#define IDS_ERROR_NO_MEMORY             33
-#define IDS_ERROR_SCREEN_LINES_COL      34
+#define IDS_ERROR_TIMEOUT_GET_DEVICE    31
+#define IDS_ERROR_TIMEOUT_SET_DEVICE    32
+#define IDS_ERROR_INVALID_PARITY_BITS   33
+#define IDS_ERROR_INVALID_STOP_BITS     34
+#define IDS_ERROR_NO_MEMORY             35
+#define IDS_ERROR_SCREEN_LINES_COL      36
 
 #endif /* RESOURCE_H */