Skip to content

Commit e3e520d

Browse files
TheNNXTheNNX
authored
[TELNET] Fix Unicode character printing (reactos#7597)
CORE-18304 The included Telnet client does not support displaying messages with Unicode characters in them. This is a problem, because even though localisation for the program was made for ReactOS, it doesn't work properly. - Make the `printm` function load and format messages using wide character APIs instead of the narrow ones. - Add format specifiers to the resource files (this is necessary, as there are a lot of places, where narrow strings are used in the program, and passed as parameters to `printm`).
1 parent cef5aa2 commit e3e520d

File tree

9 files changed

+245
-183
lines changed

9 files changed

+245
-183
lines changed

‎base/applications/network/telnet/lang/en-US.rc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ BEGIN
99
MSG_HELP "Commands may be abbreviated. Commands are:\n\ncl[ose] close current connection\nop[en] connect to a site\nq[uit] exit telnet\n"
1010
MSG_HELP_1 "ke[ys] changes/displays keymaps (write keys to see the options)\nse[t] displays/alters configuration options\nz suspend\n? h[elp] print help information\n"
1111
MSG_INVCMD "Invalid command. Type ? for help.\n"
12-
MSG_ERROR "%1 failed.\n"
13-
MSG_INFO "%1\n"
14-
MSG_WARNING "%1\n"
15-
MSG_TRYING "Trying %1.%2.%3.%4:%5...\n"
16-
MSG_CONNECTED "Connected to %1. Escape key is ALT-%2.\n"
12+
MSG_ERROR "%1!hs! failed.\n"
13+
MSG_INFO "%1!hs!\n"
14+
MSG_WARNING "%1!hs!\n"
15+
MSG_TRYING "Trying %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n"
16+
MSG_CONNECTED "Connected to %1!hs!. Escape key is ALT-%2!hs!.\n"
1717
MSG_TERMBYREM "Connection terminated.\n"
18-
MSG_KEYMAP "Loading %1 from %2.\n"
18+
MSG_KEYMAP "Loading %1!hs! from %2!hs!.\n"
1919
MSG_ERRKEYMAP "Error loading keymap.\n"
20-
MSG_DUMPFILE "Writing output to file %1.\n"
21-
MSG_CONFIG "Loading configuration options from %1.\n"
22-
MSG_NOINI "Error loading configuration file %1.\nLoading default options.\n"
23-
MSG_BADVAL "Warning: invalid variable %1.\n"
20+
MSG_DUMPFILE "Writing output to file %1!hs!.\n"
21+
MSG_CONFIG "Loading configuration options from %1!hs!.\n"
22+
MSG_NOINI "Error loading configuration file %1!hs!.\nLoading default options.\n"
23+
MSG_BADVAL "Warning: invalid variable %1!hs!.\n"
2424
MSG_NOSPAWN "Unable to spawn process.\n"
25-
MSG_RESOLVING "Looking up host: %1..."
26-
MSG_NOSERVICE "Could not find TCP service %1.\n"
27-
MSG_SIZEALIAS "Warning: size of alias %1 is too big, ignoring.\n"
25+
MSG_RESOLVING "Looking up host: %1!hs!..."
26+
MSG_NOSERVICE "Could not find TCP service %1!hs!.\n"
27+
MSG_SIZEALIAS "Warning: size of alias %1!hs! is too big, ignoring.\n"
2828
MSG_ERRPIPE "Error: unable to spawn process for pipe.\n"
2929
MSG_BADUSAGE "Error: invalid usage of command.\n"
30-
MSG_ALREADYCONNECTED "Already connected to %1.\n"
30+
MSG_ALREADYCONNECTED "Already connected to %1!hs!.\n"
3131
MSG_WSAEINTR "Interrupted function call.\n"
3232
MSG_WSAEBADF "WSAEBADF\n"
3333
MSG_WSAEACCESS "Permission denied.\n"
@@ -72,25 +72,25 @@ BEGIN
7272
MSG_WSATRY_AGAIN "Non-authoritative host not found.\n"
7373
MSG_WSANO_RECOVERY "This is a non-recoverable error.\n"
7474
MSG_WSANO_DATA "Valid name, no data record of requested type.\n"
75-
MSG_KEYNOVAL "[GLOBAL]: No value for %1.\n"
76-
MSG_KEYBADVAL "[GLOBAL]: Bad value for %1.\n"
77-
MSG_KEYBADSTRUCT "%1: Bad structure.\n"
78-
MSG_KEYBADCHARS "%1: Bad chars? %1 -> %3.\n"
79-
MSG_KEYUNEXPLINE "Unexpected line ""%1"".\n"
75+
MSG_KEYNOVAL "[GLOBAL]: No value for %1!hs!.\n"
76+
MSG_KEYBADVAL "[GLOBAL]: Bad value for %1!hs!.\n"
77+
MSG_KEYBADSTRUCT "%1!hs!: Bad structure.\n"
78+
MSG_KEYBADCHARS "%1!hs!: Bad chars? %1!hs! -> %3!hs!.\n"
79+
MSG_KEYUNEXPLINE "Unexpected line ""%1!hs!"".\n"
8080
MSG_KEYUNEXPEOF "Unexpended end of file.\n"
81-
MSG_KEYUNEXPTOK "Unexpected token %1.\n"
82-
MSG_KEYUNEXPTOKIN "Unexpected token in %1.\n"
81+
MSG_KEYUNEXPTOK "Unexpected token %1!hs!.\n"
82+
MSG_KEYUNEXPTOKIN "Unexpected token in %1!hs!.\n"
8383
MSG_KEYUNEXP "Unexpected end of file or token.\n"
8484
MSG_KEYNOGLOBAL "No [GLOBAL] definition!\n"
85-
MSG_KEYNOCONFIG "No [CONFIG %1].\n"
86-
MSG_KEYUSECONFIG "Use configuration: %1.\n"
87-
MSG_KEYNOSWKEY "No switch key for ""%1"".\n"
85+
MSG_KEYNOCONFIG "No [CONFIG %1!hs!].\n"
86+
MSG_KEYUSECONFIG "Use configuration: %1!hs!.\n"
87+
MSG_KEYNOSWKEY "No switch key for ""%1!hs!"".\n"
8888
MSG_KEYCANNOTDEF "You cannot define switch key for default keymap - ignored.\n"
8989
MSG_KEYDUPSWKEY "Duplicate switching key.\n"
90-
MSG_KEYUNKNOWNMAP "Unknown keymap %1.\n"
90+
MSG_KEYUNKNOWNMAP "Unknown keymap %1!hs!.\n"
9191
MSG_KEYNOCHARMAPS "No charmaps loaded.\n"
9292
MSG_KEYNOKEYMAPS "No keymaps loaded.\n"
93-
MSG_KEYNUMMAPS "There are %1 maps.\n"
93+
MSG_KEYNUMMAPS "There are %1!hs! maps.\n"
9494
MSG_KEYBADMAP "Bad keymap number - try 'keys display'\n"
9595
MSG_KEYMAPSWITCHED "keymap switched.\n"
9696
END

‎base/applications/network/telnet/lang/pl-PL.rc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ BEGIN
99
MSG_HELP "Polecenia mogą być skracane. Dostępne polecenia:\n\ncl[ose] zamknij bieżące połączenie\nop[en] połącz z witryną\nq[uit] zakończ telnet\n"
1010
MSG_HELP_1 "ke[ys] zmienia/wyświetla mapy klawiszy (wpisz klawisze,\naby zobaczyć opcje)\nse[t] wyświetla/zmienia opcje konfiguracji\nz wstrzymaj\n? h[elp] wypisz informacje pomocy\n"
1111
MSG_INVCMD "Nieprawidłowe polecenie. Wpisz ?, aby uzyskać pomoc.\n"
12-
MSG_ERROR "%1 nie powiodło się.\n"
13-
MSG_INFO "%1\n"
14-
MSG_WARNING "%1\n"
15-
MSG_TRYING "Podejmowanie próby %1.%2.%3.%4:%5...\n"
16-
MSG_CONNECTED "Podłączono do %1. Klawisze wyjścia to ALT-%2.\n"
12+
MSG_ERROR "%1!hs! nie powiodło się.\n"
13+
MSG_INFO "%1!hs!\n"
14+
MSG_WARNING "%1!hs!\n"
15+
MSG_TRYING "Podejmowanie próby %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n"
16+
MSG_CONNECTED "Podłączono do %1!hs!. Klawisze wyjścia to ALT-%2!hs!.\n"
1717
MSG_TERMBYREM "Połączenie zakończone.\n"
18-
MSG_KEYMAP "Ładowanie %1 z %2.\n"
18+
MSG_KEYMAP "Ładowanie %1!hs! z %2!hs!.\n"
1919
MSG_ERRKEYMAP "Błąd podczas ładowania mapy klawiszy.\n"
20-
MSG_DUMPFILE "Zapisywanie danych wyjściowych do pliku %1.\n"
21-
MSG_CONFIG "Ładowanie opcji konfiguracji z %1.\n"
22-
MSG_NOINI "Błąd podczas ładowania pliku konfiguracyjnego %1.\nŁadowanie domyślnych opcji.\n"
23-
MSG_BADVAL "Ostrzeżenie: nieprawidłowa zmienna %1.\n"
20+
MSG_DUMPFILE "Zapisywanie danych wyjściowych do pliku %1!hs!.\n"
21+
MSG_CONFIG "Ładowanie opcji konfiguracji z %1!hs!.\n"
22+
MSG_NOINI "Błąd podczas ładowania pliku konfiguracyjnego %1!hs!.\nŁadowanie domyślnych opcji.\n"
23+
MSG_BADVAL "Ostrzeżenie: nieprawidłowa zmienna %1!hs!.\n"
2424
MSG_NOSPAWN "Nie można zduplikować procesu.\n"
25-
MSG_RESOLVING "Wyszukiwanie hosta: %1..."
26-
MSG_NOSERVICE "Nie odnaleziono usługi TCP %1.\n"
27-
MSG_SIZEALIAS "Ostrzeżenie: rozmiar aliasu %1 jest zbyt duży, ignorowanie.\n"
25+
MSG_RESOLVING "Wyszukiwanie hosta: %1!hs!..."
26+
MSG_NOSERVICE "Nie odnaleziono usługi TCP %1!hs!.\n"
27+
MSG_SIZEALIAS "Ostrzeżenie: rozmiar aliasu %1!hs! jest zbyt duży, ignorowanie.\n"
2828
MSG_ERRPIPE "Błąd: nie można zduplikować procesu dla potoku.\n"
2929
MSG_BADUSAGE "Błąd: nieprawidłowe użycie polecenia.\n"
30-
MSG_ALREADYCONNECTED "Już połączono z %1.\n"
30+
MSG_ALREADYCONNECTED "Już połączono z %1!hs!.\n"
3131
MSG_WSAEINTR "Przerwano wywołanie funkcji.\n"
3232
MSG_WSAEBADF "WSAEBADF\n"
3333
MSG_WSAEACCESS "Odmowa uprawnień.\n"
@@ -72,25 +72,25 @@ BEGIN
7272
MSG_WSATRY_AGAIN "Nie odnaleziono nieautorytatywnego hosta.\n"
7373
MSG_WSANO_RECOVERY "Ten błąd jest niemożliwy do naprawienia.\n"
7474
MSG_WSANO_DATA "Nazwa jest prawidłowa, brak rekordu danych żądanego typu.\n"
75-
MSG_KEYNOVAL "[GLOBAL]: Brak wartości dla %1.\n"
76-
MSG_KEYBADVAL "[GLOBAL]: Zła wartość dla %1.\n"
77-
MSG_KEYBADSTRUCT "%1: Zła struktura.\n"
78-
MSG_KEYBADCHARS "%1: Złe znaki? %1 -> %3.\n"
79-
MSG_KEYUNEXPLINE "Nieoczekiwany wiersz ""%1"".\n"
75+
MSG_KEYNOVAL "[GLOBAL]: Brak wartości dla %1!hs!.\n"
76+
MSG_KEYBADVAL "[GLOBAL]: Zła wartość dla %1!hs!.\n"
77+
MSG_KEYBADSTRUCT "%1!hs!: Zła struktura.\n"
78+
MSG_KEYBADCHARS "%1!hs!: Złe znaki? %1!hs! -> %3!hs!.\n"
79+
MSG_KEYUNEXPLINE "Nieoczekiwany wiersz ""%1!hs!"".\n"
8080
MSG_KEYUNEXPEOF "Nieoczekiwany koniec pliku.\n"
81-
MSG_KEYUNEXPTOK "Nieoczekiwany token %1.\n"
82-
MSG_KEYUNEXPTOKIN "Nieoczekiwany token w %1.\n"
81+
MSG_KEYUNEXPTOK "Nieoczekiwany token %1!hs!.\n"
82+
MSG_KEYUNEXPTOKIN "Nieoczekiwany token w %1!hs!.\n"
8383
MSG_KEYUNEXP "Nieoczekiwany koniec pliku lub tokena.\n"
8484
MSG_KEYNOGLOBAL "Brak definicji [GLOBAL]!\n"
85-
MSG_KEYNOCONFIG "Brak [CONFIG %1].\n"
86-
MSG_KEYUSECONFIG "Użyj konfiguracji: %1.\n"
87-
MSG_KEYNOSWKEY "Brak klawisza przełączającego dla ""%1"".\n"
85+
MSG_KEYNOCONFIG "Brak [CONFIG %1!hs!].\n"
86+
MSG_KEYUSECONFIG "Użyj konfiguracji: %1!hs!.\n"
87+
MSG_KEYNOSWKEY "Brak klawisza przełączającego dla ""%1!hs!"".\n"
8888
MSG_KEYCANNOTDEF "Nie można zdefiniować klawisza przełączającego dla domyślnej mapy klawiszy - zignorowano.\n"
8989
MSG_KEYDUPSWKEY "Duplikuj klawisz przełączający.\n"
90-
MSG_KEYUNKNOWNMAP "Nieznana mapa klawiszy %1.\n"
90+
MSG_KEYUNKNOWNMAP "Nieznana mapa klawiszy %1!hs!.\n"
9191
MSG_KEYNOCHARMAPS "Nie załadowano żadnych tablic znaków.\n"
9292
MSG_KEYNOKEYMAPS "Nie załadowano żadnych map klawiszy.\n"
93-
MSG_KEYNUMMAPS "Istnieje %1 map.\n"
93+
MSG_KEYNUMMAPS "Istnieje %1!hs! map.\n"
9494
MSG_KEYBADMAP "Zły numer mapy klawiszy - sróbuj 'keys display'\n"
9595
MSG_KEYMAPSWITCHED "mapa klawiszy przełączona.\n"
9696
END

‎base/applications/network/telnet/lang/ro-RO.rc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ BEGIN
1010
MSG_HELP "Comenzile pot fi abreviate. Acestea sunt:\n\ncl[ose] Închide conexiunea curentă.\nop[en] Conectează la un sit.\nq[uit] Ieșire din telnet.\n"
1111
MSG_HELP_1 "ke[ys] Afișează/alterează configurații de taste.\nse[t] Afișează/alterează opțiunile de configurare.\nz Suspendă.\n? h[elp] Afișează informațiile de utilizare.\n"
1212
MSG_INVCMD "Comandă nevalidă. Tastați ? pentru informații.\n"
13-
MSG_ERROR "%1 a eșuat.\n"
14-
MSG_INFO "%1\n"
15-
MSG_WARNING "%1\n"
16-
MSG_TRYING "Este încearcată %1.%2.%3.%4:%5...\n"
17-
MSG_CONNECTED "Conectat la %1. Pentru ieșire apăsați ALT-%2.\n"
13+
MSG_ERROR "%1!hs! a eșuat.\n"
14+
MSG_INFO "%1!hs!\n"
15+
MSG_WARNING "%1!hs!\n"
16+
MSG_TRYING "Este încearcată %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n"
17+
MSG_CONNECTED "Conectat la %1!hs!. Pentru ieșire apăsați ALT-%2!hs!.\n"
1818
MSG_TERMBYREM "Conexiune încheiată.\n"
19-
MSG_KEYMAP "Este încarcată %1 de la %2.\n"
19+
MSG_KEYMAP "Este încarcată %1!hs! de la %2!hs!.\n"
2020
MSG_ERRKEYMAP "Eșec la încărcarea configurației de taste.\n"
21-
MSG_DUMPFILE "Sunt scrise informații de ieșire în fișierul %1.\n"
22-
MSG_CONFIG "Este încarcată din %1 opțiunile de configurare.\n"
23-
MSG_NOINI "Eroare la încărcarea fișierului de configurare %1.\nSunt încărcate opțiunile implicite.\n"
24-
MSG_BADVAL "Avertisment: variabila %1 nu este validă.\n"
21+
MSG_DUMPFILE "Sunt scrise informații de ieșire în fișierul %1!hs!.\n"
22+
MSG_CONFIG "Este încarcată din %1!hs! opțiunile de configurare.\n"
23+
MSG_NOINI "Eroare la încărcarea fișierului de configurare %1!hs!.\nSunt încărcate opțiunile implicite.\n"
24+
MSG_BADVAL "Avertisment: variabila %1!hs! nu este validă.\n"
2525
MSG_NOSPAWN "Lansarea procesului a eșuat.\n"
26-
MSG_RESOLVING "Este căutată gazda: %1..."
27-
MSG_NOSERVICE "Serviciul TCP %1 nu a fost găsit.\n"
28-
MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1 este prea mare, va fi ignorată.\n"
26+
MSG_RESOLVING "Este căutată gazda: %1!hs!..."
27+
MSG_NOSERVICE "Serviciul TCP %1!hs! nu a fost găsit.\n"
28+
MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1!hs! este prea mare, va fi ignorată.\n"
2929
MSG_ERRPIPE "Eroare: lansarea procesului pentru conexiune a eșuat.\n"
3030
MSG_BADUSAGE "Eroare: utilizare nevalidă a comenzii.\n"
31-
MSG_ALREADYCONNECTED "Conexiunea la %1 a fost deja stabilită.\n"
31+
MSG_ALREADYCONNECTED "Conexiunea la %1!hs! a fost deja stabilită.\n"
3232
MSG_WSAEINTR "Apel de funcție întrerupt.\n"
3333
MSG_WSAEBADF "WSAEBADF\n"
3434
MSG_WSAEACCESS "Acces respins.\n"
@@ -73,25 +73,25 @@ BEGIN
7373
MSG_WSATRY_AGAIN "Gazda ne-autoritată nu a fost găsită.\n"
7474
MSG_WSANO_RECOVERY "Eroare, stare nerecuperabilă.\n"
7575
MSG_WSANO_DATA "Numeele este valid, nu există date de tipul solicitat.\n"
76-
MSG_KEYNOVAL "[GLOBAL]: Nu există valoare pentru %1.\n"
77-
MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1 este eronată.\n"
78-
MSG_KEYBADSTRUCT "%1: Structură eronată.\n"
79-
MSG_KEYBADCHARS "%1: Caractere eronate? %1 -> %3.\n"
80-
MSG_KEYUNEXPLINE "Rând neprevăzut «%1».\n"
76+
MSG_KEYNOVAL "[GLOBAL]: Nu există valoare pentru %1!hs!.\n"
77+
MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1!hs! este eronată.\n"
78+
MSG_KEYBADSTRUCT "%1!hs!: Structură eronată.\n"
79+
MSG_KEYBADCHARS "%1!hs!: Caractere eronate? %1!hs! -> %3!hs!.\n"
80+
MSG_KEYUNEXPLINE "Rând neprevăzut «%1!hs!».\n"
8181
MSG_KEYUNEXPEOF "Sfârșit neprevăzut de fișier.\n"
82-
MSG_KEYUNEXPTOK "Simbol neprevăzut %1.\n"
83-
MSG_KEYUNEXPTOKIN "Simbol neprevăzut la %1.\n"
82+
MSG_KEYUNEXPTOK "Simbol neprevăzut %1!hs!.\n"
83+
MSG_KEYUNEXPTOKIN "Simbol neprevăzut la %1!hs!.\n"
8484
MSG_KEYUNEXP "Sfârșit neprevăzut de fișier sau simbol.\n"
8585
MSG_KEYNOGLOBAL "Nu există definiție pentru [GLOBAL]!\n"
86-
MSG_KEYNOCONFIG "Nu există [CONFIG %1].\n"
87-
MSG_KEYUSECONFIG "Utilizare configurație: %1.\n"
88-
MSG_KEYNOSWKEY "Nu există tastă de comutare pentru «%1».\n"
86+
MSG_KEYNOCONFIG "Nu există [CONFIG %1!hs!].\n"
87+
MSG_KEYUSECONFIG "Utilizare configurație: %1!hs!.\n"
88+
MSG_KEYNOSWKEY "Nu există tastă de comutare pentru «%1!hs!».\n"
8989
MSG_KEYCANNOTDEF "În configurația implicită nu pot fi definite taste de comutare, vor fi ignorate.\n"
9090
MSG_KEYDUPSWKEY "Duplicare tastă de comutare.\n"
91-
MSG_KEYUNKNOWNMAP "%1 este o configurație de taste necunoscută.\n"
91+
MSG_KEYUNKNOWNMAP "%1!hs! este o configurație de taste necunoscută.\n"
9292
MSG_KEYNOCHARMAPS "Nu au fost încărcate configurații de caractere.\n"
9393
MSG_KEYNOKEYMAPS "Nu au fost încărcate configurații de taste.\n"
94-
MSG_KEYNUMMAPS "În total există %1 configurații.\n"
94+
MSG_KEYNUMMAPS "În total există %1!hs! configurații.\n"
9595
MSG_KEYBADMAP "Număr de configurație de taste nevalid, încercați «keys display»\n"
9696
MSG_KEYMAPSWITCHED "Configurația de taste a fost comutată.\n"
9797
END

‎base/applications/network/telnet/lang/ru-RU.rc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ BEGIN
99
MSG_HELP "Команды можно сократить. Команды:\n\ncl[ose] закрыть текущее соединение\nop[en] подключиться к узлу\nq[uit] выйти из telnet\n"
1010
MSG_HELP_1 "ke[ys] изменить/показать раскладку\nse[t] изменить/показать опции\nz приостановить\n? h[elp] отобразить справку\n"
1111
MSG_INVCMD "Неверная команда. Введите ? для справки.\n"
12-
MSG_ERROR "%1 не удалось.\n"
13-
MSG_INFO "%1\n"
14-
MSG_WARNING "%1\n"
15-
MSG_TRYING "Попытка %1.%2.%3.%4:%5...\n"
16-
MSG_CONNECTED "Подключение к %1. Для выхода нажмите ALT-%2.\n"
12+
MSG_ERROR "%1!hs! не удалось.\n"
13+
MSG_INFO "%1!hs!\n"
14+
MSG_WARNING "%1!hs!\n"
15+
MSG_TRYING "Попытка %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n"
16+
MSG_CONNECTED "Подключение к %1!hs!. Для выхода нажмите ALT-%2!hs!.\n"
1717
MSG_TERMBYREM "Соединение прервано.\n"
18-
MSG_KEYMAP "Загрузка %1 из %2.\n"
18+
MSG_KEYMAP "Загрузка %1!hs! из %2!hs!.\n"
1919
MSG_ERRKEYMAP "Ошибка при загрузке раскладки.\n"
20-
MSG_DUMPFILE "Запись вывода в файл %1.\n"
21-
MSG_CONFIG "Загрузка параметров из %1.\n"
22-
MSG_NOINI "Ошибка загрузки параметров из %1.\nЗагрузка параметров по умолчанию.\n"
23-
MSG_BADVAL "Предупреждение: неправильная переменная %1.\n"
20+
MSG_DUMPFILE "Запись вывода в файл %1!hs!.\n"
21+
MSG_CONFIG "Загрузка параметров из %1!hs!.\n"
22+
MSG_NOINI "Ошибка загрузки параметров из %1!hs!.\nЗагрузка параметров по умолчанию.\n"
23+
MSG_BADVAL "Предупреждение: неправильная переменная %1!hs!.\n"
2424
MSG_NOSPAWN "Невозможно породить процесс.\n"
25-
MSG_RESOLVING "Поиск узла: %1..."
26-
MSG_NOSERVICE "TCP служба не найдена: %1.\n"
27-
MSG_SIZEALIAS "Внимание: Размер псевдонима %1 слишком большой, игнорирование.\n"
25+
MSG_RESOLVING "Поиск узла: %1!hs!..."
26+
MSG_NOSERVICE "TCP служба не найдена: %1!hs!.\n"
27+
MSG_SIZEALIAS "Внимание: Размер псевдонима %1!hs! слишком большой, игнорирование.\n"
2828
MSG_ERRPIPE "Ошибка: невозможно породить процесс для пайпа.\n"
2929
MSG_BADUSAGE "Ошибка: недопустимое использование команды.\n"
30-
MSG_ALREADYCONNECTED "Уже подключен к %1.\n"
30+
MSG_ALREADYCONNECTED "Уже подключен к %1!hs!.\n"
3131
MSG_WSAEINTR "Вызов функции прерван.\n"
3232
MSG_WSAEBADF "WSAEBADF\n"
3333
MSG_WSAEACCESS "Отказано в доступе.\n"
@@ -72,25 +72,25 @@ BEGIN
7272
MSG_WSATRY_AGAIN "Ненадежный узел не найден.\n"
7373
MSG_WSANO_RECOVERY "Это неустранимая ошибка.\n"
7474
MSG_WSANO_DATA "Действительное имя, без записи данных требуемого типаe.\n"
75-
MSG_KEYNOVAL "[GLOBAL]: Нет значения для %1.\n"
76-
MSG_KEYBADVAL "[GLOBAL]: Неверное значение для %1.\n"
77-
MSG_KEYBADSTRUCT "%1: Неправильная структура.\n"
78-
MSG_KEYBADCHARS "%1: Неверные символы? %1 -> %3.\n"
79-
MSG_KEYUNEXPLINE "Неожиданная строка ""%1"".\n"
75+
MSG_KEYNOVAL "[GLOBAL]: Нет значения для %1!hs!.\n"
76+
MSG_KEYBADVAL "[GLOBAL]: Неверное значение для %1!hs!.\n"
77+
MSG_KEYBADSTRUCT "%1!hs!: Неправильная структура.\n"
78+
MSG_KEYBADCHARS "%1!hs!: Неверные символы? %1!hs! -> %3!hs!.\n"
79+
MSG_KEYUNEXPLINE "Неожиданная строка ""%1!hs!"".\n"
8080
MSG_KEYUNEXPEOF "Неожиданный конец файла.\n"
81-
MSG_KEYUNEXPTOK "Неожиданный символ %1.\n"
82-
MSG_KEYUNEXPTOKIN "Неожиданный символ в %1.\n"
81+
MSG_KEYUNEXPTOK "Неожиданный символ %1!hs!.\n"
82+
MSG_KEYUNEXPTOKIN "Неожиданный символ в %1!hs!.\n"
8383
MSG_KEYUNEXP "Неожиданный конец файла или символ.\n"
8484
MSG_KEYNOGLOBAL "[GLOBAL] Не определено!\n"
85-
MSG_KEYNOCONFIG "Нет [CONFIG %1].\n"
86-
MSG_KEYUSECONFIG "Используются настройки: %1.\n"
87-
MSG_KEYNOSWKEY "Нет клавиши переключения для ""%1"".\n"
85+
MSG_KEYNOCONFIG "Нет [CONFIG %1!hs!].\n"
86+
MSG_KEYUSECONFIG "Используются настройки: %1!hs!.\n"
87+
MSG_KEYNOSWKEY "Нет клавиши переключения для ""%1!hs!"".\n"
8888
MSG_KEYCANNOTDEF "Нельзя указать клавишу изменения раскладки клавиатуры по умолчанию – игнорирование.\n"
8989
MSG_KEYDUPSWKEY "Эта кнопка уже назначина.\n"
90-
MSG_KEYUNKNOWNMAP "Неизвестная раскладка %1.\n"
90+
MSG_KEYUNKNOWNMAP "Неизвестная раскладка %1!hs!.\n"
9191
MSG_KEYNOCHARMAPS "Не загружена таблица символов.\n"
9292
MSG_KEYNOKEYMAPS "Не загружена раскладка.\n"
93-
MSG_KEYNUMMAPS "Раскладка %1 уже существует.\n"
93+
MSG_KEYNUMMAPS "Раскладка %1!hs! уже существует.\n"
9494
MSG_KEYBADMAP "Неправильный номер раскладки - попробуйте 'keys display'\n"
9595
MSG_KEYMAPSWITCHED "раскладка переключена.\n"
9696
END

0 commit comments

Comments
 (0)