Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NET] Move the remaining IDS_GENERIC_PAGE strings into the command messages and fix a size restriction of ConPrintf().
by Eric Kohl 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5904abf94d78420ff0d7… commit e5904abf94d78420ff0d71e5207df3553f4b806d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 09:55:15 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 09:55:15 2019 +0100 [NET] Move the remaining IDS_GENERIC_PAGE strings into the command messages and fix a size restriction of ConPrintf(). --- base/applications/network/net/cmdAccounts.c | 1 - base/applications/network/net/cmdConfig.c | 1 - base/applications/network/net/cmdContinue.c | 1 - base/applications/network/net/cmdGroup.c | 1 - base/applications/network/net/cmdHelp.c | 2 - base/applications/network/net/cmdLocalGroup.c | 1 - base/applications/network/net/lang/en-US.rc | 1 - base/applications/network/net/lang/es-ES.rc | 1 - base/applications/network/net/lang/pl-PL.rc | 1 - base/applications/network/net/lang/ro-RO.rc | 1 - base/applications/network/net/lang/ru-RU.rc | 1 - base/applications/network/net/lang/tr-TR.rc | 1 - base/applications/network/net/lang/zh-CN.rc | 1 - base/applications/network/net/lang/zh-TW.rc | 1 - base/applications/network/net/main.c | 3 +- base/applications/network/net/resource.h | 1 - sdk/include/reactos/mc/net_msg.mc | 133 +++++++++++++++++++++++--- 17 files changed, 124 insertions(+), 28 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 2ffc6eb2c5..d04bc48f4f 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -47,7 +47,6 @@ cmdAccounts( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index ecc434ad5c..3f8569030c 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -201,7 +201,6 @@ cmdConfig( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); } else { diff --git a/base/applications/network/net/cmdContinue.c b/base/applications/network/net/cmdContinue.c index 7d656ca1e5..8b4716a411 100644 --- a/base/applications/network/net/cmdContinue.c +++ b/base/applications/network/net/cmdContinue.c @@ -31,7 +31,6 @@ INT cmdContinue(INT argc, WCHAR **argv) ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_CONTINUE_SYNTAX); PrintNetMessage(MSG_CONTINUE_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 1; } } diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index f825ed0408..919e9ddeae 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -225,7 +225,6 @@ cmdGroup( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_GROUP_SYNTAX); PrintNetMessage(MSG_GROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else if (_wcsicmp(argv[i], L"/add") == 0) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index a160075bed..449a2a00ef 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -68,7 +68,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_GROUP_SYNTAX); PrintNetMessage(MSG_GROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -83,7 +82,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_LOCALGROUP_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index 8be27ef8ca..673c9a683d 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -245,7 +245,6 @@ cmdLocalGroup( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else if (_wcsicmp(argv[i], L"/add") == 0) diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 506027b1b7..18b5ca746b 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -120,7 +120,6 @@ BEGIN IDS_GENERIC_LOCKED "Locked" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index e39ea9767e..9e802f3d38 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -123,7 +123,6 @@ BEGIN IDS_GENERIC_LOCKED "Bloqueado" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 4ea9dd4828..7fe511779c 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -119,7 +119,6 @@ BEGIN IDS_GENERIC_LOCKED "Zablokowane" IDS_GENERIC_UNLIMITED "Bez ograniczeń" IDS_GENERIC_SYNTAX "Składnia tego polecenia jest następująca:\n\n" - IDS_GENERIC_PAGE "NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Opcja %s nie jest jeszcze obsługiwana.\n" IDS_ERROR_INVALID_OPTION_VALUE "Wprowadzono nieprawidłową wartość dla opcji %s.\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index b94139c74a..61328729ce 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -126,7 +126,6 @@ BEGIN IDS_GENERIC_LOCKED "Blocat" IDS_GENERIC_UNLIMITED "Nelimitat" IDS_GENERIC_SYNTAX "Sintaxa acestei comenzi:\n\n" - IDS_GENERIC_PAGE "NET HELP comandă | MORE (pentru afișare paginată).\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n" IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 90a255ae7e..70b4dd777b 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "Заблокировано" IDS_GENERIC_UNLIMITED "Не ограничено" IDS_GENERIC_SYNTAX "Синтаксис данной команды:\n\n" - IDS_GENERIC_PAGE "NET HELP имя_команды | MORE - постраничный просмотр справки.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n" IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index aef7a7227e..5c001e5429 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "Kilitli" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 96c8aae7e1..35ae37150a 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "锁定" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n" IDS_ERROR_INVALID_OPTION_VALUE "您输入了 %s 选项的无效的值。\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index ff067a2add..b50e07c4e4 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "鎖定" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n" IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n" diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 63c825a11b..4707c148cd 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -163,7 +163,8 @@ PrintNetMessage( NULL); if (pBuffer) { - ConPrintf(StdOut, L"%s\n", pBuffer); + ConPuts(StdOut, pBuffer); + ConPuts(StdOut, L"\n"); LocalFree(pBuffer); pBuffer = NULL; } diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index ec2cab3cc2..1be6288333 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -116,7 +116,6 @@ #define IDS_GENERIC_LOCKED 605 #define IDS_GENERIC_UNLIMITED 606 #define IDS_GENERIC_SYNTAX 607 -#define IDS_GENERIC_PAGE 608 #define IDS_ERROR_OPTION_NOT_SUPPORTED 700 #define IDS_ERROR_INVALID_OPTION_VALUE 701 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index a687c06a3c..d0313b87e6 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -921,6 +921,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONTINUE wznawia działanie usługi, która została. @@ -933,6 +935,8 @@ usługa Wstrzymana usługa SCHEDULE SERVER WORKSTATION + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -944,6 +948,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -955,6 +961,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -966,6 +974,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -977,6 +987,7 @@ service Is the paused service SCHEDULE SERVER WORKSTATION +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -988,6 +999,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -999,6 +1012,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . @@ -1136,6 +1151,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET GROUP dodaje, wyświetla lub modyfikuje grupy globalne na serwerach. @@ -1154,6 +1171,8 @@ nazwa_użytkownika[ ...] Lista zawierająca nazwy jednego lub kilku Rozdziel kolejne nazwy znakiem spacji. /ADD Dodaje grupę lub dodaje nazwę użytkownika do grupy. /DELETE Usuwa grupę lub usuwa nazwę użytkownika z grupy. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET GROUP adds, displays or modifies global groups on servers. When @@ -1171,6 +1190,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET GROUP adds, displays or modifies global groups on servers. When @@ -1188,6 +1209,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET GROUP adds, displays or modifies global groups on servers. When @@ -1205,6 +1228,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET GROUP adds, displays or modifies global groups on servers. When @@ -1222,6 +1247,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET GROUP adds, displays or modifies global groups on servers. When @@ -1239,6 +1266,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET GROUP adds, displays or modifies global groups on servers. When @@ -1256,6 +1285,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . @@ -1337,7 +1368,7 @@ Language=Polish NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian Sunt disponibile următoarele comenzi: @@ -1352,7 +1383,7 @@ Language=Romanian NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian Доступны следующие команды: @@ -1367,7 +1398,7 @@ Language=Russian NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish Éstos son los argumentos de línea de comandos disponibles: @@ -1603,6 +1634,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET LOCALGROUP dodaje, wyświetla, lub modyfikuje grupy lokalne na komputerach @@ -1628,6 +1661,8 @@ nazwa[ ...] Lista zawierająca nazwy jednego lub kilku użytkowników poleceniem do grupy lokalnej należy wcześniej utworzyć odpowiednie konto. /DELETE Usuwa nazwę grupy lub użytkownika z grupy lokalnej. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1651,6 +1686,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1674,6 +1711,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1697,6 +1736,8 @@ name [ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1720,6 +1761,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1743,6 +1786,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1766,6 +1811,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . @@ -1875,40 +1922,56 @@ Language=English NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET PAUSE wstrzymuje usługę. usługa Nazwa wstrzymywanej usługi. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . @@ -2226,6 +2289,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET START uruchamia usługi lub wyświetla uruchomione usługi. @@ -2235,6 +2300,8 @@ usługa Nazwa uruchamianej usługi. Nazwy usług mające dwa lub więcej słów wpisywane w. wierszu polecenia muszą być ujęte w cudzysłów. Przykładowo, NET START "NET LOGON" uruchamia usługę logowania w sieci. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET START starts services or lists running services. @@ -2244,6 +2311,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET START starts services or lists running services. @@ -2253,6 +2322,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET START starts services or lists running services. @@ -2262,6 +2333,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET START starts services or lists running services. @@ -2271,6 +2344,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET START starts services or lists running services. @@ -2280,6 +2355,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET START starts services or lists running services. @@ -2289,6 +2366,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . @@ -2333,6 +2412,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET STATISTICS wyświetla dziennik statystyki dla lokalnej usługi @@ -2341,6 +2422,8 @@ usługi dla których statystyka jest dostępna. SERVER Wyświetla statystykę usługi Serwer. WORKSTATION Wyświetla statystykę usługi Stacja robocza. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET STATISTICS displays the statisticslog for the local Workstation or @@ -2349,6 +2432,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET STATISTICS displays the statisticslog for the local Workstation or @@ -2357,6 +2442,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET STATISTICS displays the statisticslog for the local Workstation or @@ -2365,6 +2452,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET STATISTICS displays the statisticslog for the local Workstation or @@ -2373,6 +2462,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET STATISTICS displays the statisticslog for the local Workstation or @@ -2381,6 +2472,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET STATISTICS displays the statisticslog for the local Workstation or @@ -2389,6 +2482,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . @@ -2434,6 +2529,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET STOP zatrzymuje usługi. @@ -2443,6 +2540,8 @@ usługa Nazwa zatrzymywanej usługi. Zatrzymanie usługi rozłącza wszystkie połączenia sieciowe używane przez usługę. Niektóre usługi zależą od innych. Zatrzymanie jednej może też zatrzymać inne. Niektóre usługi nie mogą być zatrzymane. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET STOP stops services. @@ -2452,6 +2551,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET STOP stops services. @@ -2461,6 +2562,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET STOP stops services. @@ -2470,6 +2573,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET STOP stops services. @@ -2479,6 +2584,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET STOP stops services. @@ -2488,6 +2595,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET STOP stops services. @@ -2497,6 +2606,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . @@ -2758,7 +2869,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Polish NET USER creates and modifies user accounts on computers. When used @@ -2832,7 +2943,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Romanian NET USER creates and modifies user accounts on computers. When used @@ -2906,7 +3017,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Russian NET USER creates and modifies user accounts on computers. When used @@ -2980,7 +3091,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Spanish NET USER creates and modifies user accounts on computers. When used @@ -3054,7 +3165,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Turkish NET USER creates and modifies user accounts on computers. When used @@ -3128,7 +3239,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Chinese NET USER creates and modifies user accounts on computers. When used @@ -3202,7 +3313,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese NET USER creates and modifies user accounts on computers. When used @@ -3276,7 +3387,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. .

1 0

[reactos] 01/01: [NET] Add help message for the NET USER command and move the IDS_GENERIC_PAGE string into the help messages.
by Eric Kohl 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b8141eb6c4c1656dd8a… commit e2b8141eb6c4c1656dd8abc4bc95ea22245a5648 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 08:59:32 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 08:59:32 2019 +0100 [NET] Add help message for the NET USER command and move the IDS_GENERIC_PAGE string into the help messages. --- base/applications/network/net/cmdHelp.c | 3 - sdk/include/reactos/mc/net_msg.mc | 640 +++++++++++++++++++++++++++++++- 2 files changed, 624 insertions(+), 19 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index 97e22e34b2..a160075bed 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -24,7 +24,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_ACCOUNTS_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -41,14 +40,12 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else { PrintNetMessage(MSG_CONFIG_SYNTAX); PrintNetMessage(MSG_CONFIG_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } } diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index dd0f13d188..a687c06a3c 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -117,6 +117,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET ACCOUNTS uaktualnia bazę kont użytkowników i zmienia hasło oraz wymagania @@ -161,6 +163,8 @@ spełnione dwa warunki. w bieżącej domenie. W innym wypadku, operacje te są dokonywane na komputerze lokalnym. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET ACCOUNTS actualizează baza de utilizatori și modifică parola și @@ -202,6 +206,8 @@ NET ACCOUNTS să aibă efect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET ACCOUNTS updates the user accounts database and modifies password @@ -243,6 +249,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET ACCOUNTS updates the user accounts database and modifies password @@ -284,6 +292,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET ACCOUNTS updates the user accounts database and modifies password @@ -325,6 +335,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET ACCOUNTS updates the user accounts database and modifies password @@ -366,6 +378,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET ACCOUNTS updates the user accounts database and modifies password @@ -407,6 +421,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . @@ -562,6 +578,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONFIG wyświetla informacje o konfiguracji usług Stacja robocza lub @@ -571,6 +589,8 @@ konfigurowania usługi, wpisz polecenie NET HELP CONFIG usługa. SERVER Wyświetla informacje o konfiguracji usługi Serwer WORKSTATION Wyświetla informacje o konfiguracji usługi Stacja robocza. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONFIG displays coniguration information of the Workstation or @@ -582,6 +602,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONFIG displays coniguration information of the Workstation or @@ -593,6 +615,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONFIG displays coniguration information of the Workstation or @@ -604,6 +628,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONFIG displays coniguration information of the Workstation or @@ -615,6 +641,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONFIG displays coniguration information of the Workstation or @@ -626,6 +654,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONFIG displays coniguration information of the Workstation or @@ -637,6 +667,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . @@ -699,6 +731,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer. @@ -718,6 +752,8 @@ NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer. Aby wyświetlić bieżącą konfigurację usługi Serwer, wpisz NET CONFIG SERVER bez parametrów. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONFIG SERVER displays or changes settings for the Server service. @@ -736,6 +772,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONFIG SERVER displays or changes settings for the Server service. @@ -754,6 +792,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONFIG SERVER displays or changes settings for the Server service. @@ -772,6 +812,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONFIG SERVER displays or changes settings for the Server service. @@ -790,6 +832,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONFIG SERVER displays or changes settings for the Server service. @@ -808,6 +852,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONFIG SERVER displays or changes settings for the Server service. @@ -826,6 +872,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . @@ -2639,36 +2687,596 @@ SymbolicName=MSG_USER_HELP Severity=Success Facility=System Language=English -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Polish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Romanian -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Russian -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Spanish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Turkish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Chinese -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. .

1 0

[reactos] 01/01: [NET] Implement the NET SYNTAX pseudo command.
by Eric Kohl 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaee5e840b9b02aaf04ae… commit eaee5e840b9b02aaf04ae430bbda379790512b04 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 01:04:26 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 01:04:26 2019 +0100 [NET] Implement the NET SYNTAX pseudo command. --- base/applications/network/net/cmdHelp.c | 11 +- base/applications/network/net/main.c | 1 + base/applications/network/net/net.h | 1 + sdk/include/reactos/mc/net_msg.mc | 270 +++++++++++++++++++++++++++++++- 4 files changed, 274 insertions(+), 9 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index b1643a2c4f..97e22e34b2 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -186,12 +186,13 @@ INT cmdHelp(INT argc, WCHAR **argv) { return 0; } +#endif if (_wcsicmp(argv[2], L"SYNTAX") == 0) { + PrintNetMessage(MSG_SYNTAX_HELP); return 0; } -#endif PrintNetMessage(MSG_HELP_SYNTAX); PrintNetMessage(MSG_HELP_HELP); @@ -199,3 +200,11 @@ INT cmdHelp(INT argc, WCHAR **argv) return 0; } + +INT +cmdSyntax(INT argc, WCHAR **argv) +{ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintNetMessage(MSG_SYNTAX_HELP); + return 0; +} diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 773c25fd94..63c825a11b 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -38,6 +38,7 @@ COMMAND cmds[] = {L"start", cmdStart}, {L"statistics", cmdStatistics}, {L"stop", cmdStop}, + {L"syntax", cmdSyntax}, {L"time", unimplemented}, {L"use", cmdUse}, {L"user", cmdUser}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index d4845232eb..43c5ae5a6a 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -68,6 +68,7 @@ INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStatistics(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); +INT cmdSyntax(INT argc, WCHAR **argv); INT cmdUse(INT argc, WCHAR **argv); INT cmdUser(INT argc, WCHAR **argv); diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 5e7b14deb5..dd0f13d188 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1273,7 +1273,8 @@ Language=English NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Polish Dostępne polecenia to: @@ -1287,7 +1288,8 @@ Language=Polish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Romanian Sunt disponibile următoarele comenzi: @@ -1301,7 +1303,8 @@ Language=Romanian NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Russian Доступны следующие команды: @@ -1315,7 +1318,8 @@ Language=Russian NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Spanish Éstos son los argumentos de línea de comandos disponibles: @@ -1329,7 +1333,8 @@ Language=Spanish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Turkish Aşağıdaki komutlar kullanılabilir: @@ -1343,7 +1348,8 @@ Language=Turkish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Chinese 以下命令可用: @@ -1357,7 +1363,8 @@ Language=Chinese NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese 以下命令是可用的: @@ -1371,7 +1378,8 @@ Language=Taiwanese NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . @@ -2776,3 +2784,249 @@ NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] . + + +MessageId=10047 +SymbolicName=MSG_SYNTAX_HELP +Severity=Success +Facility=System +Language=English +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Polish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Romanian +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Russian +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Spanish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Turkish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Chinese +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Taiwanese +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +.

1 0

[reactos] 01/01: [NET] Fix some 'net help' and 'net user' issues.
by Eric Kohl 09 Mar '19

09 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d8859cfd897f22a2fe30… commit 4d8859cfd897f22a2fe301f2760a2f27084c3594 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 00:30:27 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 00:30:27 2019 +0100 [NET] Fix some 'net help' and 'net user' issues. --- base/applications/network/net/cmdHelp.c | 6 +++--- base/applications/network/net/cmdUser.c | 4 ++-- base/applications/network/net/main.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index 716009ed59..b1643a2c4f 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -13,13 +13,13 @@ INT cmdHelp(INT argc, WCHAR **argv) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); -/* if (argc != 3) { - ConResPuts(StdOut, IDS_HELP_SYNTAX); + PrintNetMessage(MSG_HELP_SYNTAX); + PrintNetMessage(MSG_HELP_HELP); return 0; } -*/ + if (_wcsicmp(argv[2], L"ACCOUNTS") == 0) { PrintNetMessage(MSG_ACCOUNTS_SYNTAX); diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 238baaa3cf..0cb5dacc8f 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -637,14 +637,14 @@ cmdUser( NET_API_STATUS Status; i = 2; - if (argv[i][0] != L'/') + if ((i < argc) && (argv[i][0] != L'/')) { lpUserName = argv[i]; // ConPrintf(StdOut, L"User: %s\n", lpUserName); i++; } - if (argv[i][0] != L'/') + if ((i < argc) && (argv[i][0] != L'/')) { lpPassword = argv[i]; // ConPrintf(StdOut, L"Password: %s\n", lpPassword); diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 579ea4c10c..773c25fd94 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -246,7 +246,10 @@ int wmain(int argc, WCHAR **argv) done: if (bRun == FALSE) + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_NET_SYNTAX); + } if (hModuleNetMsg != NULL) FreeLibrary(hModuleNetMsg);

1 0

[reactos] 01/01: [NETAPI32] Initialize parm_err
by Eric Kohl 09 Mar '19

09 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=462418fe38aa92920a755… commit 462418fe38aa92920a755d5d1b5dc6dce32a035b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 9 20:26:00 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 9 20:26:00 2019 +0100 [NETAPI32] Initialize parm_err --- dll/win32/netapi32/group_new.c | 3 +++ dll/win32/netapi32/local_group.c | 3 +++ dll/win32/netapi32/user.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 9c3234abe5..027f1f7273 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -306,6 +306,9 @@ NetGroupAdd( TRACE("NetGroupAdd(%s, %d, %p, %p)\n", debugstr_w(servername), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Initialize the Server name*/ if (servername != NULL) RtlInitUnicodeString(&ServerName, servername); diff --git a/dll/win32/netapi32/local_group.c b/dll/win32/netapi32/local_group.c index 798248d8fc..1ef5aa64f9 100644 --- a/dll/win32/netapi32/local_group.c +++ b/dll/win32/netapi32/local_group.c @@ -352,6 +352,9 @@ NetLocalGroupAdd( TRACE("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Initialize the Server name*/ if (servername != NULL) RtlInitUnicodeString(&ServerName, servername); diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index d105634a52..3e29bc48c6 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -2060,6 +2060,9 @@ NetUserAdd(LPCWSTR servername, TRACE("(%s, %d, %p, %p)\n", debugstr_w(servername), level, bufptr, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Check the info level */ switch (level) {

1 0

[reactos] 01/01: [Win32SS] Add TextOut to GDI Batch
by James Tabor 09 Mar '19

09 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d57f7becc3f3204080086… commit d57f7becc3f320408008649fa21c86926d9d16b6 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Fri Mar 8 22:21:41 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Fri Mar 8 22:21:41 2019 -0600 [Win32SS] Add TextOut to GDI Batch Add fix ups to PolyPatBlt and freetype. TextOut supports 580 characters w/o Dx and Dx at a max of 193 characters with Dx*1, both if offset is 0. Noticed a lot of over drawing with start menu from ComCtl32 SB_SETTEXT going through User32 DrawText/Worker ExtTextOutW. Explain why it might be slowing down. If issues arise, commenting out lines in win32ss/include/gdi32p.h can help. Example: else if (Cmd == GdiBCTextOut) cjSize = 0;//sizeof(GDIBSTEXTOUT); <---- this one most of all. else if (Cmd == GdiBCExtTextOut) cjSize = 0;//sizeof(GDIBSEXTTEXTOUT); Test results: https://reactos.org/testman/compare.php?ids=66260,66262 --- win32ss/gdi/gdi32/include/gdi32p.h | 4 +- win32ss/gdi/gdi32/objects/painting.c | 11 ++- win32ss/gdi/gdi32/objects/text.c | 97 ++++++++++++++++++++++ win32ss/gdi/ntgdi/freetype.c | 2 +- win32ss/gdi/ntgdi/gdibatch.c | 155 +++++++++++++++++++++++++++++++---- win32ss/include/ntgdityp.h | 10 ++- 6 files changed, 255 insertions(+), 24 deletions(-) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index 67d3a68dbf..f0b4cb46d9 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -390,8 +390,8 @@ GdiAllocBatchCommand( /* Get the size of the entry */ if (Cmd == GdiBCPatBlt) cjSize = sizeof(GDIBSPATBLT); else if (Cmd == GdiBCPolyPatBlt) cjSize = sizeof(GDIBSPPATBLT); - else if (Cmd == GdiBCTextOut) cjSize = 0; - else if (Cmd == GdiBCExtTextOut) cjSize = 0; + else if (Cmd == GdiBCTextOut) cjSize = sizeof(GDIBSTEXTOUT); + else if (Cmd == GdiBCExtTextOut) cjSize = sizeof(GDIBSEXTTEXTOUT); else if (Cmd == GdiBCSetBrushOrg) cjSize = sizeof(GDIBSSETBRHORG); else if (Cmd == GdiBCExtSelClipRgn) cjSize = 0; else if (Cmd == GdiBCSelObj) cjSize = sizeof(GDIBSOBJECT); diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index efc987e6cb..8fc0d645c3 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -548,7 +548,8 @@ PolyPatBlt( pgO = GdiAllocBatchCommand(hdc, GdiBCPolyPatBlt); if (pgO) { - USHORT cjSize = sizeof(GDIBSPPATBLT) + (nCount-1) * sizeof(PATRECT); + USHORT cjSize = 0; + if (nCount > 1) cjSize = (nCount-1) * sizeof(PATRECT); if ((pTeb->GdiTebBatch.Offset + cjSize) <= GDIBATCHBUFSIZE) { @@ -563,10 +564,14 @@ PolyPatBlt( pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; pgO->ulBrushClr = pdcattr->ulBrushClr; RtlCopyMemory(pgO->pRect, pPoly, nCount * sizeof(PATRECT)); - // Recompute offset, remember one is already accounted for in the structure. - pTeb->GdiTebBatch.Offset += (nCount-1) * sizeof(PATRECT); + // Recompute offset and return size, remember one is already accounted for in the structure. + pTeb->GdiTebBatch.Offset += cjSize; + ((PGDIBATCHHDR)pgO)->Size += cjSize; return TRUE; } + // Reset offset and count then fall through + pTeb->GdiTebBatch.Offset -= sizeof(GDIBSPPATBLT); + pTeb->GdiBatchCount--; } } return NtGdiPolyPatBlt(hdc, dwRop, pPoly, nCount, dwMode); diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 1242020639..9ff4fde9df 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -488,6 +488,8 @@ ExtTextOutW( _In_ UINT cwc, _In_reads_opt_(cwc) const INT *lpDx) { + PDC_ATTR pdcattr; + HANDLE_METADC(BOOL, ExtTextOut, FALSE, @@ -506,6 +508,101 @@ ExtTextOutW( return LpkExtTextOut(hdc, x, y, fuOptions, lprc, lpString, cwc , lpDx, 0); } + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if ( pdcattr && + !(pdcattr->ulDirty_ & DC_DIBSECTION) && + !(pdcattr->lTextAlign & TA_UPDATECP)) + { + if ( lprc && !cwc ) + { + if ( fuOptions & ETO_OPAQUE ) + { + PGDIBSEXTTEXTOUT pgO; + + pgO = GdiAllocBatchCommand(hdc, GdiBCExtTextOut); + if (pgO) + { + pgO->Count = cwc; + pgO->Rect = *lprc; + pgO->Options = fuOptions; + /* Snapshot attribute */ + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->ptlViewportOrg = pdcattr->ptlViewportOrg; + return TRUE; + } + } + else // Do nothing, old explorer pops this off. + { + DPRINT1("GdiBCExtTextOut nothing\n"); + return TRUE; + } + } // Max 580 wchars, if offset 0 + else if ( cwc <= ((GDIBATCHBUFSIZE - sizeof(GDIBSTEXTOUT)) / sizeof(WCHAR)) ) + { + PGDIBSTEXTOUT pgO; + PTEB pTeb = NtCurrentTeb(); + + pgO = GdiAllocBatchCommand(hdc, GdiBCTextOut); + if (pgO) + { + USHORT cjSize = 0; + ULONG DxSize = 0; + + if (cwc > 2) cjSize = (cwc * sizeof(WCHAR)) - sizeof(pgO->String); + + /* Calculate buffer size for string and Dx values */ + if (lpDx) + { + /* If ETO_PDY is specified, we have pairs of INTs */ + DxSize = (cwc * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + cjSize += DxSize; + // The structure buffer holds 4 bytes. Store Dx data then string. + // Result one wchar -> Buf[ Dx ]Str[wC], [4][2][X] one extra unused wchar + // to assure alignment of 4. + } + + if ((pTeb->GdiTebBatch.Offset + cjSize ) <= GDIBATCHBUFSIZE) + { + pgO->cbCount = cwc; + pgO->x = x; + pgO->y = y; + pgO->Options = fuOptions; + pgO->iCS_CP = 0; + + if (lprc) pgO->Rect = *lprc; + else + { + pgO->Options |= GDIBS_NORECT; // Tell the other side lprc is nill. + } + + /* Snapshot attributes */ + pgO->crForegroundClr = pdcattr->crForegroundClr; + pgO->crBackgroundClr = pdcattr->crBackgroundClr; + pgO->ulForegroundClr = pdcattr->ulForegroundClr; + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->lBkMode = pdcattr->lBkMode == OPAQUE ? OPAQUE : TRANSPARENT; + pgO->hlfntNew = pdcattr->hlfntNew; + pgO->flTextAlign = pdcattr->flTextAlign; + pgO->ptlViewportOrg = pdcattr->ptlViewportOrg; + + pgO->Size = DxSize; // of lpDx then string after. + /* Put the Dx before the String to assure alignment of 4 */ + if (lpDx) RtlCopyMemory( &pgO->Buffer, lpDx, DxSize); + + if (cwc) RtlCopyMemory( &pgO->String[DxSize/sizeof(WCHAR)], lpString, cwc * sizeof(WCHAR)); + + // Recompute offset and return size + pTeb->GdiTebBatch.Offset += cjSize; + ((PGDIBATCHHDR)pgO)->Size += cjSize; + return TRUE; + } + // Reset offset and count then fall through + pTeb->GdiTebBatch.Offset -= sizeof(GDIBSTEXTOUT); + pTeb->GdiBatchCount--; + } + } + } return NtGdiExtTextOutW(hdc, x, y, diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 197304d469..7005057a07 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5814,7 +5814,7 @@ IntExtTextOutW( if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; - if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) + if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) DC_vUpdateTextBrush(dc) ; thickness = 1; diff --git a/win32ss/gdi/ntgdi/gdibatch.c b/win32ss/gdi/ntgdi/gdibatch.c index 3c7d6c2ad0..13d6ad9088 100644 --- a/win32ss/gdi/ntgdi/gdibatch.c +++ b/win32ss/gdi/ntgdi/gdibatch.c @@ -5,6 +5,8 @@ #include <debug.h> BOOL FASTCALL IntPatBlt( PDC,INT,INT,INT,INT,DWORD,PEBRUSHOBJ); +BOOL APIENTRY IntExtTextOutW(IN PDC,IN INT,IN INT,IN UINT,IN OPTIONAL PRECTL,IN LPCWSTR,IN INT,IN OPTIONAL LPINT,IN DWORD); + // // Gdi Batch Flush support functions. @@ -40,7 +42,7 @@ DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl) VOID FASTCALL -SynchonizeDriver(FLONG Flags) +SynchronizeDriver(FLONG Flags) { SURFOBJ *SurfObj; //PPDEVOBJ Device; @@ -130,7 +132,7 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) dc->pdcattr->ulForegroundClr = pgDPB->ulForegroundClr; dc->pdcattr->ulBackgroundClr = pgDPB->ulBackgroundClr; dc->pdcattr->ulBrushClr = pgDPB->ulBrushClr; - // Process dirty attributes if any + // Process dirty attributes if any. if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) @@ -157,7 +159,7 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) EBRUSHOBJ eboFill; PBRUSH pbrush; PPATRECT pRects; - INT cRects, i; + INT i; DWORD dwRop, flags; COLORREF crColor, crBkColor, crBrushClr; ULONG ulForegroundClr, ulBackgroundClr, ulBrushClr; @@ -200,10 +202,9 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) DC_vUpdateBackgroundBrush(dc); DPRINT1("GdiBCPolyPatBlt Testing\n"); - pRects = pgDPB->pRect; - cRects = pgDPB->Count; + pRects = &pgDPB->pRect[0]; - for (i = 0; i < cRects; i++) + for (i = 0; i < pgDPB->Count; i++) { pbrush = BRUSH_ShareLockBrush(pRects->hBrush); @@ -238,21 +239,141 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) dc->pdcattr->ulBrushClr = ulBrushClr; dc->pdcattr->ulDirty_ |= flags; break; - } + } + case GdiBCTextOut: + { + PGDIBSTEXTOUT pgO; + COLORREF crColor = -1, crBkColor; + ULONG ulForegroundClr, ulBackgroundClr; + DWORD flags = 0, saveflags; + FLONG flTextAlign = -1; + HANDLE hlfntNew; + PRECTL lprc; + USHORT jBkMode; + LONG lBkMode; + if (!dc) break; + pgO = (PGDIBSTEXTOUT) pHdr; + + // Save current attributes, flags and Set the attribute snapshots + saveflags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_TEXT|DIRTY_FILL|DC_BRUSH_DIRTY|DIRTY_CHARSET); + + // In this instance check for differences and set the appropriate dirty flags. + if ( dc->pdcattr->crForegroundClr != pgO->crForegroundClr) + { + crColor = dc->pdcattr->crForegroundClr; + dc->pdcattr->crForegroundClr = pgO->crForegroundClr; + ulForegroundClr = dc->pdcattr->ulForegroundClr; + dc->pdcattr->ulForegroundClr = pgO->ulForegroundClr; + flags |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT); + } + if (dc->pdcattr->crBackgroundClr != pgO->crBackgroundClr) + { + crBkColor = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->crBackgroundClr = pgO->crBackgroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->ulBackgroundClr = pgO->ulBackgroundClr; + flags |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT|DIRTY_BACKGROUND); + } + if (dc->pdcattr->flTextAlign != pgO->flTextAlign) + { + flTextAlign = dc->pdcattr->flTextAlign; + dc->pdcattr->flTextAlign = pgO->flTextAlign; + } + if (dc->pdcattr->hlfntNew != pgO->hlfntNew) + { + hlfntNew = dc->pdcattr->hlfntNew; + dc->pdcattr->hlfntNew = pgO->hlfntNew; + dc->pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + flags |= DIRTY_CHARSET; + } + + dc->pdcattr->ulDirty_ |= flags; + + jBkMode = dc->pdcattr->jBkMode; + dc->pdcattr->jBkMode = pgO->lBkMode; + lBkMode = dc->pdcattr->lBkMode; + dc->pdcattr->lBkMode = pgO->lBkMode; + + lprc = (pgO->Options & GDIBS_NORECT) ? NULL : &pgO->Rect; + pgO->Options &= ~GDIBS_NORECT; + + IntExtTextOutW( dc, + pgO->x, + pgO->y, + pgO->Options, + lprc, + (LPCWSTR)&pgO->String[pgO->Size/sizeof(WCHAR)], + pgO->cbCount, + pgO->Size ? (LPINT)&pgO->Buffer : NULL, + pgO->iCS_CP ); + + // Restore attributes and flags + dc->pdcattr->jBkMode = jBkMode; + dc->pdcattr->lBkMode = lBkMode; + + if (flags & DIRTY_TEXT && crColor != -1) + { + dc->pdcattr->crForegroundClr = crColor; + dc->pdcattr->ulForegroundClr = ulForegroundClr; + } + if (flags & DIRTY_BACKGROUND) + { + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + } + if (flTextAlign != -1) + { + dc->pdcattr->flTextAlign = flTextAlign; + } + + if (flags & DIRTY_CHARSET) + { + dc->pdcattr->hlfntNew = hlfntNew; + dc->pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + } + dc->pdcattr->ulDirty_ |= saveflags | flags; break; + } case GdiBCExtTextOut: { - //GreExtTextOutW( hDC, - // XStart, - // YStart, - // fuOptions, - // &SafeRect, - // SafeString, - // Count, - // SafeDx, - // dwCodePage ); + PGDIBSEXTTEXTOUT pgO; + COLORREF crBkColor; + ULONG ulBackgroundClr; + DWORD flags = 0, saveflags; + if (!dc) break; + pgO = (PGDIBSEXTTEXTOUT) pHdr; + + saveflags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND|DIRTY_TEXT|DIRTY_FILL|DC_BRUSH_DIRTY|DIRTY_CHARSET); + + if (dc->pdcattr->crBackgroundClr != pgO->ulBackgroundClr) + { + crBkColor = dc->pdcattr->crBackgroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->crBackgroundClr = pgO->ulBackgroundClr; + dc->pdcattr->ulBackgroundClr = pgO->ulBackgroundClr; + flags |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); + } + + dc->pdcattr->ulDirty_ |= flags; + + IntExtTextOutW( dc, + 0, + 0, + pgO->Options, + &pgO->Rect, + NULL, + pgO->Count, + NULL, + 0 ); + + if (flags & DIRTY_BACKGROUND) + { + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + } + dc->pdcattr->ulDirty_ |= saveflags | flags; break; } @@ -308,7 +429,7 @@ APIENTRY NtGdiFlush( VOID) { - SynchonizeDriver(GCAPS2_SYNCFLUSH); + SynchronizeDriver(GCAPS2_SYNCFLUSH); return STATUS_SUCCESS; } diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 4bf8aa92fa..99eed15cc9 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -495,12 +495,17 @@ typedef struct _GDIBSPPATBLT PATRECT pRect[1]; // POLYPATBLT } GDIBSPPATBLT, *PGDIBSPPATBLT; +// +// Both ExtSelectClipRgn and TextOut pass a nill RECT. +// +#define GDIBS_NORECT 0x80000000 + typedef struct _GDIBSTEXTOUT { GDIBATCHHDR gbHdr; COLORREF crForegroundClr; COLORREF crBackgroundClr; - LONG lmBkMode; + LONG lBkMode; ULONG ulForegroundClr; ULONG ulBackgroundClr; int x; @@ -513,7 +518,10 @@ typedef struct _GDIBSTEXTOUT HANDLE hlfntNew; FLONG flTextAlign; POINTL ptlViewportOrg; + union { WCHAR String[2]; + ULONG Buffer[1]; + }; } GDIBSTEXTOUT, *PGDIBSTEXTOUT; typedef struct _GDIBSEXTTEXTOUT

1 0

[reactos] 01/01: [BOOTDATA] Fix Volgograd time zone (UTC+04:00)
by Stanislav Motylkov 08 Mar '19

08 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6676b7c48baeea3ac81b5… commit 6676b7c48baeea3ac81b560eb0a1270956f0a13c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Mar 9 00:11:00 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 22:44:27 2019 +0100 [BOOTDATA] Fix Volgograd time zone (UTC+04:00) CORE-15831 --- boot/bootdata/hivesft.inf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index ba5b3919e1..90907e3d49 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -2201,7 +2201,7 @@ GMT_PLUS_03_A_DESC ="(GMT+03:00) Minsk" GMT_PLUS_03_A_DAYLIGHT="Belarus Daylight Time" GMT_PLUS_03_A_STANDARD="Belarus Standard Time" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Moscow, St. Petersburg, Volgograd" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Moscow, St. Petersburg" GMT_PLUS_03_B_DAYLIGHT="RTZ 2 Daylight Time" GMT_PLUS_03_B_STANDARD="RTZ 2 Standard Time" @@ -2229,7 +2229,7 @@ GMT_PLUS_04_B_DESC ="(GMT+04:00) Yerevan" GMT_PLUS_04_B_DAYLIGHT="Caucasus Daylight Time" GMT_PLUS_04_B_STANDARD="Caucasus Standard Time" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Izhevsk, Samara" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Izhevsk, Samara, Volgograd" GMT_PLUS_04_C_DAYLIGHT="RTZ 3 Daylight Time" GMT_PLUS_04_C_STANDARD="RTZ 3 Standard Time" @@ -3185,7 +3185,7 @@ GMT_PLUS_03_A_DESC ="(GMT+03:00) Mińsk" GMT_PLUS_03_A_DAYLIGHT="Białoruś (czas letni)" GMT_PLUS_03_A_STANDARD="Białoruś (czas standardowy)" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Moskwa, Sankt Petersburg, Wołgograd" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Moskwa, Sankt Petersburg" GMT_PLUS_03_B_DAYLIGHT="RTZ 2 (czas letni)" GMT_PLUS_03_B_STANDARD="RTZ 2 (czas standardowy)" @@ -3213,7 +3213,7 @@ GMT_PLUS_04_B_DESC ="(GMT+04:00) Erywań" GMT_PLUS_04_B_DAYLIGHT="Kaukaz (czas letni)" GMT_PLUS_04_B_STANDARD="Kaukaz (czas standardowy)" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Iżewsk, Samara" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Iżewsk, Samara, Wołgograd" GMT_PLUS_04_C_DAYLIGHT="RTZ 3 (czas letni)" GMT_PLUS_04_C_STANDARD="RTZ 3 (czas standardowy)" @@ -3761,7 +3761,7 @@ GMT_PLUS_03_A_DESC ="(UTC+03:00) Minsk" GMT_PLUS_03_A_DAYLIGHT="Oră de Belarus diurnă" GMT_PLUS_03_A_STANDARD="Oră de Belarus standard" -GMT_PLUS_03_B_DESC ="(UTC+03:00) Moscova, St. Petersburg, Volgograd" +GMT_PLUS_03_B_DESC ="(UTC+03:00) Moscova, St. Petersburg" GMT_PLUS_03_B_DAYLIGHT="Ora zonală rusă 2 diurnă" GMT_PLUS_03_B_STANDARD="Ora zonală rusă 2 standard" @@ -3789,7 +3789,7 @@ GMT_PLUS_04_B_DESC ="(UTC+04:00) Erevan" GMT_PLUS_04_B_DAYLIGHT="Oră de Caucaz diurnă" GMT_PLUS_04_B_STANDARD="Oră de Caucaz standard" -GMT_PLUS_04_C_DESC ="(UTC+04:00) Ijevsk, Samara" +GMT_PLUS_04_C_DESC ="(UTC+04:00) Ijevsk, Samara, Volgograd" GMT_PLUS_04_C_DAYLIGHT="Ora zonală rusă 3 diurnă" GMT_PLUS_04_C_STANDARD="Ora zonală rusă 3 standard" @@ -4220,14 +4220,14 @@ GMT_PLUS_02_E_DESC ="(GMT+02:00) Иерусалим" GMT_PLUS_02_F_DESC ="(GMT+02:00) Хараре, Претория" GMT_PLUS_02_G_DESC ="(GMT+02:00) Калининград" GMT_PLUS_03_A_DESC ="(GMT+03:00) Минск" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Волгоград, Москва, Санкт-Петербург" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Москва, Санкт-Петербург" GMT_PLUS_03_C_DESC ="(GMT+03:00) Кувейт, Эр-Рияд" GMT_PLUS_03_D_DESC ="(GMT+03:00) Найроби" GMT_PLUS_03_E_DESC ="(GMT+03:00) Багдад" GMT_PLUS_0330_A_DESC ="(GMT+03:30) Тегеран" GMT_PLUS_04_A_DESC ="(GMT+04:00) Абу-Даби, Мускат" GMT_PLUS_04_B_DESC ="(GMT+04:00) Ереван" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Ижевск, Самара" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Волгоград, Ижевск, Самара" GMT_PLUS_0430_A_DESC ="(GMT+04:30) Кабул" GMT_PLUS_05_A_DESC ="(GMT+05:00) Екатеринбург" GMT_PLUS_05_B_DESC ="(GMT+05:00) Исламабад, Карачи, Ташкент"

1 0

[reactos] 01/01: [SHUTDOWN] Small Italian translation update (#1397)
by Daniele Campione 08 Mar '19

08 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5873161f8d60298d117a… commit e5873161f8d60298d117a6dfd146dd03041bdeb3 Author: Daniele Campione <nonametekno(a)gmail.com> AuthorDate: Fri Mar 8 15:49:56 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 15:49:56 2019 +0100 [SHUTDOWN] Small Italian translation update (#1397) --- base/applications/shutdown/lang/it-IT.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/shutdown/lang/it-IT.rc b/base/applications/shutdown/lang/it-IT.rc index 0d939d607e..2decaa4eff 100644 --- a/base/applications/shutdown/lang/it-IT.rc +++ b/base/applications/shutdown/lang/it-IT.rc @@ -36,10 +36,10 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\ \n\ Non ci sono argomenti o/? Visualizza aiuti.\n\ - /i Mostra l'interfaccia utente grafica (GUI). Questa opzione deve essere la \n\ + /i Mostra l'interfaccia grafica (GUI). Questa opzione deve essere la \n\ prima.\n\ /l Disconnessione dal sistema locale. Non può essere utilizzata con /m or /d.\n\ - /s Chiusura del computer.\n\ + /s Spegnimento del computer.\n\ /r Riavvio del computer.\n\ /g Riavvio del computer e riavvio di tutte le applicazioni registrate.\n\ /a cancellare un arresto ritardato. Può essere utilizzato solo durante il periodo\n\ @@ -54,10 +54,10 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ 30 è il valore di default.\n\ /c ""comment"" Commento sul motivo per cui spegnere o riavviare.\n\ 512 caratteri massimi consentiti.\n\ - /f Forzare la chiusura delle applicazioni in esecuzione senza che avvertire gli utenti. Se\n\ - non è specificato un'altro parametro, questa opzione è valida anche per la disconnessione.\n\ - /d [p|u:]xx:yy Indicare il codice motivo per l'arresto o il riavvio.\n\ - p indica che l'arresto o il riavvio è previsto.\n\ + /f Forzare la chiusura delle applicazioni in esecuzione senza avvertire gli utenti. Se\n\ + non è specificato un altro parametro, questa opzione è valida anche per la disconnessione.\n\ + /d [p|u:]xx:yy Indicare il codice del motivo per cui s'intende effettuare l'arresto o il riavvio.\n\ + p indica che è previsto l'arresto o il riavvio.\n\ u indica che il motivo è definito dall'utente.\n\ Se nè p nè u vengono specificati, l'arresto o il riavvio non sono\n\ pianificati.\n\ @@ -70,12 +70,12 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ IDS_ERROR_LOGOFF "ERROR: Impossibile disconnettersi dal sistema \n" IDS_ERROR_SHUTDOWN "ERROR: Impossibile arrestare il sistema \n." IDS_ERROR_RESTART "ERROR: Impossibile riavviare il sistema \n." - IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: Lunghezza commento supera il limite massimo di caratteri impostato dal sistema \n" - IDS_ERROR_HIBERNATE "ERROR: Impossibile avviare il sistema in modalità di sospensione. \n" - IDS_ERROR_HIBERNATE_LOCAL "ERROR: Modalitài sospensione non può essere avviata in modalità remota \n" - IDS_ERROR_HIBERNATE_ENABLED "ERROR: Modalità di sospensione non è abilitata \n" + IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: La lunghezza del commento supera il limite massimo di caratteri impostato dal sistema \n" + IDS_ERROR_HIBERNATE "ERROR: Impossibile avviare il sistema in modalità sospensione. \n" + IDS_ERROR_HIBERNATE_LOCAL "ERROR: La modalità sospensione non può essere avviata in modalità remota \n" + IDS_ERROR_HIBERNATE_ENABLED "ERROR: La modalità sospensione non è abilitata \n" IDS_ERROR_DIALOG_CAPTION "Arresto improviso" - IDS_ERROR_DIALOG_INIT "Impossibile visualizzare l'interfaccia utente grafica." + IDS_ERROR_DIALOG_INIT "Impossibile visualizzare l'interfaccia grafica." END /* Remote shutdown action strings */ @@ -83,7 +83,7 @@ STRINGTABLE BEGIN IDS_ACTION_SHUTDOWN "Esci dal sistema" IDS_ACTION_RESTART "Riavvia il sistema" - IDS_ACTION_UNEXPECTED_SHUTDOWN "Arresto improviso" + IDS_ACTION_UNEXPECTED_SHUTDOWN "Arresto improvviso" END /* Remote shutdown reason strings */

1 0

[reactos] 01/01: [TRANSLATION] Hindi translation of SYSSETUP AND SAMSRV. (#1400)
by Arnav Bhatt 08 Mar '19

08 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c17bcb65b967686c17a13… commit c17bcb65b967686c17a13f3e3fa34e87d6ce29c4 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Fri Mar 8 20:18:20 2019 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 15:48:20 2019 +0100 [TRANSLATION] Hindi translation of SYSSETUP AND SAMSRV. (#1400) --- dll/win32/samsrv/lang/hi-IN.rc | 32 ++++++ dll/win32/samsrv/samsrv.rc | 3 + dll/win32/syssetup/lang/hi-IN.rc | 227 +++++++++++++++++++++++++++++++++++++++ dll/win32/syssetup/syssetup.rc | 3 + 4 files changed, 265 insertions(+) diff --git a/dll/win32/samsrv/lang/hi-IN.rc b/dll/win32/samsrv/lang/hi-IN.rc new file mode 100644 index 0000000000..01e71bc607 --- /dev/null +++ b/dll/win32/samsrv/lang/hi-IN.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: SAMSRV Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of SAMSRV + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "अंतर्निहित" + IDS_GROUP_NONE_NAME "कुछ भी नहीं" + IDS_GROUP_NONE_COMMENT "साधारण उपयोगकर्ता" + IDS_ALIAS_ADMINISTRATORS_NAME "एडमिनिस्ट्रेटर" + IDS_ALIAS_ADMINISTRATORS_COMMENT "एडमिनिस्ट्रेटर के पास कंप्यूटर या डोमेन तक अप्रतिबंधित पहुंच होती है।" + IDS_ALIAS_GUESTS_NAME "मेहमान" + IDS_ALIAS_GUESTS_COMMENT "डिफ़ॉल्ट रूप से मेहमान के पास उपयोगकर्ता समूह के सदस्यों के समान अधिकार हैं।" + IDS_ALIAS_POWER_USERS_NAME "पावर उपयोगकर्ता" + IDS_ALIAS_POWER_USERS_COMMENT "पावर उपयोगकर्ताओं के पास कुछ प्रतिबंधों के साथ अधिकांश प्रशासनिक अधिकार हैं।" + IDS_ALIAS_USERS_NAME "उपयोगकर्ता" + IDS_ALIAS_USERS_COMMENT "उपयोगकर्ताओं को सिस्टम-व्यापी परिवर्तन करने से रोका जाता है।" + /* + * ATTENTION: + * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ + IDS_USER_ADMINISTRATOR_NAME "एडमिनिस्ट्रेटर" + IDS_USER_ADMINISTRATOR_COMMENT "अंतर्निहित खाता कंप्यूटर या डोमेन का प्रशासन करने के लिए उपयोग किया जाता है।" + IDS_USER_GUEST_NAME "उपयोगकर्ता" + IDS_USER_GUEST_COMMENT "कंप्यूटर या डोमेन तक अतिथि पहुंच के लिए अंतर्निहित खाता।" +END diff --git a/dll/win32/samsrv/samsrv.rc b/dll/win32/samsrv/samsrv.rc index 8c0ae9ad63..43872f6561 100644 --- a/dll/win32/samsrv/samsrv.rc +++ b/dll/win32/samsrv/samsrv.rc @@ -31,6 +31,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc new file mode 100644 index 0000000000..9ae9d9722b --- /dev/null +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -0,0 +1,227 @@ +/* + * PROJECT: SYSSETUP Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of SYSSETUP + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "रिऐक्ट ओएस सेटअप विज़ार्ड में आपका स्वागत है।", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "यह विज़ार्ड आपके कंप्यूटर पर रिऐक्ट ओएस इंस्टॉल करता है। विज़ार्ड को आपके और आपके कंप्यूटर के बारे में कुछ जानकारी इकट्ठा करने की आवश्यकता है ताकि रिऐक्ट ओएस को ठीक से इंस्टॉल किया जा सके।", IDC_STATIC, 115, 40, 195, 100 + LTEXT "सेटअप के साथ जारी रखने के लिए आगे क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "रिऐक्ट ओएस डेवलपर्स निम्नलिखित ओपन सोर्स प्रोजेक्ट्स, (के कुछ हिस्सों) को स्वीकार करना चाहेंगे, जिनका उपयोग रिऐक्ट ओएस बनाने के लिए किया गया था:", IDC_STATIC, 15, 7, 286, 19 + LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "रिऐक्ट ओएस को जीपीएल के तहत लाइसेंस प्राप्त है, इसलिए यदि आप पुन: उपयोग या पुनर्वितरित करना चाहते हैं (भागों) तो आपको जीपीएल का सम्मान करना चाहिए।", IDC_STATIC, 15, 110, 227, 19 + PUSHBUTTON "जीपीएल &देखें...", IDC_VIEWGPL, 251, 110, 50, 19 + LTEXT "सेटअप के साथ जारी रखने के लिए अगला क्लिक करें।", IDC_STATIC, 15, 136, 195, 17 +END + +IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "अपना पूरा नाम और अपनी कंपनी या संगठन का नाम लिखें।", IDC_STATIC, 54, 7, 242, 21 + LTEXT "&नाम:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&संगठन:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + +IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "अपने कंप्यूटर के लिए एक नाम लिखें जो १५ वर्ण या उससे कम का हो। यदि आप नेटवर्क पर हैं, तो आपके कंप्यूटर का नाम अद्वितीय होना चाहिए।", IDC_STATIC, 54, 7, 250, 24 + LTEXT "&कंप्यूटर का नाम:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "सेटअप आपके कंप्यूटर पर एक उपयोगकर्ता खाता बनाएगा जिसे एडमिनिस्ट्रेटर कहा जाता है। यदि आपको अपने कंप्यूटर पर पूर्ण पहुंच की आवश्यकता है तो आप इस खाते का उपयोग कर सकते हैं।", IDC_STATIC, 54, 57, 250, 25 + LTEXT "एक एडमिनिस्ट्रेटर पासवर्ड टाइप करें जो १२७ वर्ण या उससे कम का हो।", IDC_STATIC, 54, 87, 250, 8 + LTEXT "&एडमिनिस्ट्रेटर पासवर्ड:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "पासवर्ड की &पुष्टि कीजिये:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "सिस्टम लोकेल को उन एप्लिकेशन की भाषा से मेल खाना चाहिए जिनका आप उपयोग करना चाहते हैं। उपयोगकर्ता का स्थान नियंत्रित करता है कि संख्याएँ, मुद्राएँ और दिनांक कैसे दिखाई देते हैं।", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "सिस्टम या उपयोगकर्ता लोकेल सेटिंग बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "कीबोर्ड लेआउट आपके द्वारा टाइप किए जाने पर दिखाई देने वाले अक्षरों को नियंत्रित करता है।", IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "कीबोर्ड लेआउट बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "दिनांक और समय:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "समय क्षेत्र:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "&डेलाइट बचत में परिवर्तन के लिए खुद ब खुद रूप से घड़ी समायोजित करें", IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "लौटस थीम", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "क्लासिक थीम", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + +IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप पूरा करना" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "रिऐक्ट ओएस सेटअप विज़ार्ड को पूरा करना", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "आपने रिऐक्ट ओएस सेटअप को सफलतापूर्वक पूरा कर लिया है।\n\nजब आप समाप्त पर क्लिक करते हैं, तो आपका कंप्यूटर रीस्टॉर्ट हो जाएगा।", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "यदि किसी ड्राइव में एक सीडी है, तो उसे हटा दें। फिर, अपने कंप्यूटर को रीस्टॉर्ट करने के लिए, समाप्त पर क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "जीए.न.यू जनरल पब्लिक लाइसेंस" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "ठीक", IDOK, 141, 209, 50, 14 +END + +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "कृपया प्रतीक्षा करें..." +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 +END + +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "एडवांस सेटिंग" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&नमूना दर:", -1, 27, 35, 90, 8 + LTEXT "प्रति सेकंड की रिपोर्ट", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&पहिया का पता लगाना:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&इनपुट बफर लंबाई:", -1, 27, 75, 90, 8 + LTEXT "पैकेट", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&तेज प्रारंभ", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&डिफ़ॉल्ट", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_ACKTITLE "अक्नॉलज्मन्ट" + IDS_ACKSUBTITLE "कंधे जिसमे रिऐक्ट ओएस खड़ा होता है और लाइसेंस जानकारी" + IDS_OWNERTITLE "अपने सॉफ़्टवेयर का निजीकृत" + IDS_OWNERSUBTITLE "सेटअप रिऐक्ट ओएस को निजीकृत करने के लिए अपने बारे में इस जानकारी का उपयोग करता है।" + IDS_COMPUTERTITLE "कंप्यूटर का नाम और एडमिनिस्ट्रेटर पासवर्ड" + IDS_COMPUTERSUBTITLE "आपको अपने कंप्यूटर के लिए एक नाम और एक एडमिनिस्ट्रेटर पासवर्ड प्रदान करना होगा।" + IDS_LOCALETITLE "क्षेत्रीय सेटिंग" + IDS_LOCALESUBTITLE "आप विभिन्न क्षेत्रों और भाषाओं के लिए रिऐक्ट ओएस को अनुकूलित कर सकते हैं।" + IDS_DATETIMETITLE "दिनांक और समय" + IDS_DATETIMESUBTITLE "अपने कंप्यूटर के लिए सही तारीख और समय निर्धारित करें।" + IDS_PROCESSTITLE "कम्पोनन्ट का दर्ज" + IDS_PROCESSSUBTITLE "कृपया प्रतीक्षा करें..." + IDS_THEMESELECTIONTITLE "दिखावट" + IDS_THEMESELECTIONSUBTITLE "अपनी पसंद का थीम चुनें।" + +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "रिऐक्ट ओएस सेटअप" + IDS_UNKNOWN_ERROR "अज्ञात त्रुटि" + IDS_REGISTERING_COMPONENTS "कॉम्पोनेन्ट का दर्ज होना..." + IDS_LOADLIBRARY_FAILED "लोडलाइब्रेरी विफल रहा: " + IDS_GETPROCADDR_FAILED "गैटप्रौकऐड्र विफल रहा: " + IDS_REGSVR_FAILED "डीललरजिस्टरसर्वर विफल रहा: " + IDS_DLLINSTALL_FAILED "डीललइंस्टॉल विफल रहा: " + IDS_TIMEOUT "दर्ज होने के दौरान समय समाप्त" + IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administrator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "एडमिनिस्ट्रेटर" + IDS_MACHINE_OWNER_NAME "मालिक" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "जब तक आप अपना नाम दर्ज नहीं करते तब तक सेटअप जारी नहीं रह सकता।" + IDS_WZD_SETCOMPUTERNAME "कंप्यूटर नाम सेट करने में सेटअप विफल रहा।" + IDS_WZD_COMPUTERNAME "जब तक आप अपने कंप्यूटर का नाम दर्ज नहीं करते तब तक सेटअप जारी नहीं रह सकता।" + IDS_WZD_PASSWORDEMPTY "आपको एक पासवर्ड दर्ज करना होगा!" + IDS_WZD_PASSWORDMATCH "आपके द्वारा दर्ज किया गया पासवर्ड मेल नहीं खाता है। कृपया फिर से वांछित पासवर्ड दर्ज करें।" + IDS_WZD_PASSWORDCHAR "आपके द्वारा दर्ज किए गए पासवर्ड में अमान्य वर्ण हैं। कृपया एक साफ़ किया हुआ पासवर्ड डालें।" + IDS_WZD_LOCALTIME "सेटअप स्थानीय समय निर्धारित करने में असमर्थ था।" +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "डिवाइस का इन्स्टलेशन..." +END + +/* ATTENTION: Synchronize the translation of these strings with shell32 */ +STRINGTABLE +BEGIN + IDS_PROGRAMFILES "%SystemDrive%\\प्रोग्राम फाइलें" + IDS_COMMONFILES "आम फाइलें" +END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "डिटेक्शन अक्षम" + IDS_LOOKFORWHEEL "पहिया के लिए देखो" + IDS_ASSUMEPRESENT "मान लें कि पहिया मौजूद है" +END diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index f3e59ac2f1..17f485aa34 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -73,6 +73,9 @@ IDR_GPL RT_TEXT "COPYING" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

[reactos] 01/01: Hindi translation of comdlg32. (#1391)
by Arnav Bhatt 07 Mar '19

07 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a856775316d79199037f… commit 3a856775316d79199037f14c5111a37775f00251 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Thu Mar 7 14:35:08 2019 +0530 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Thu Mar 7 10:05:08 2019 +0100 Hindi translation of comdlg32. (#1391) Hindi translation of comdlg32. --- dll/win32/comdlg32/lang/cdlg_Hi.rc | 508 +++++++++++++++++++++++++++++++++++++ dll/win32/comdlg32/rsrc.rc | 3 + 2 files changed, 511 insertions(+) diff --git a/dll/win32/comdlg32/lang/cdlg_Hi.rc b/dll/win32/comdlg32/lang/cdlg_Hi.rc new file mode 100644 index 0000000000..580b33b36c --- /dev/null +++ b/dll/win32/comdlg32/lang/cdlg_Hi.rc @@ -0,0 +1,508 @@ + /* + * PROJECT: Comdlg32 Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of Comdlg32 + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +{ + IDS_FILENOTFOUND "फाइल नहीं मिली" + IDS_VERIFYFILE "कृपया सत्यापित करें कि सही फ़ाइल नाम दिया गया था" + IDS_CREATEFILE "फाइल मौजूद नहीं है।\n\ +क्या आप फ़ाइल बनाना चाहते हैं?" + IDS_OVERWRITEFILE "फ़ाइल पहले से ही मौजूद है।\n\ +क्या आप इसे बदलना चाहते हैं?" + IDS_INVALID_FILENAME_TITLE "पथ में अमान्य कैरेक्टर" + IDS_INVALID_FILENAME "फ़ाइलनेम में निम्न में से कोई भी कैरेक्टर नहीं हो सकता है:\n\ + / : < > |" + IDS_PATHNOTEXISTING "पथ मौजूद नहीं है" + IDS_FILENOTEXISTING "फ़ाइल मौजूद नहीं है" + IDS_INVALID_FOLDERNAME "चयन में एक गैर-फ़ोल्डर ऑब्जेक्ट है" +} + +STRINGTABLE +{ + IDS_UPFOLDER "एक स्तर ऊपर" + IDS_NEWFOLDER "नया फ़ोल्डर बनाएँ" + IDS_LISTVIEW "सूची" + IDS_REPORTVIEW "विवरण" + IDS_TODESKTOP "डेस्कटॉप पर ब्राउज़ करें" +} + +STRINGTABLE +{ + PD32_PRINT_TITLE "प्रिंट" + + PD32_VALUE_UREADABLE "अपठनीय प्रविष्टि" + PD32_INVALID_PAGE_RANGE "यह मान पृष्ठ सीमा के भीतर नहीं है।\n\ +कृपया %1!d! और %2!d! के बीच एक मान दर्ज करें।" + PD32_FROM_NOT_ABOVE_TO "'से' प्रविष्टि 'तक' प्रविष्टि से अधिक नहीं हो सकती।" + PD32_MARGINS_OVERLAP "मार्जिन ओवरलैप या पेपर सीमाओं के बाहर गिर जाते हैं।\n\ +कृपया मार्जिन पुनः दर्ज करें।" + PD32_NR_OF_COPIES_EMPTY "'प्रतियों की संख्या' फ़ील्ड खाली नहीं हो सकती।" + PD32_TOO_LARGE_COPIES "बड़ी संख्या में प्रतियां आपके प्रिंटर द्वारा समर्थित नहीं हैं।\n\ +कृपया 1 और %d के बीच एक मान दर्ज करें।" + PD32_PRINT_ERROR "प्रिंटर त्रुटि हुई।" + PD32_NO_DEFAULT_PRINTER "कोई डिफ़ॉल्ट प्रिंटर परिभाषित नहीं है।" + PD32_CANT_FIND_PRINTER "प्रिंटर नहीं मिल रहा है।" + PD32_OUT_OF_MEMORY "मेमोरी खत्म।" + PD32_GENERIC_ERROR "एक त्रुटि पाई गई।" + PD32_DRIVER_UNKNOWN "अज्ञात प्रिंटर ड्राइवर।" + PD32_NO_DEVICES "इससे पहले कि आप प्रिंटर से संबंधित कार्य कर सकें जैसे कि पेज सेटअप या डॉक्यूमेंट प्रिंट करना, आपको प्रिंटर इंस्टॉल करना होगा। कृपया एक इंस्टॉल करें और पुनः प्रयास करें।" + + PD32_DEFAULT_PRINTER "डिफ़ॉल्ट प्रिंटर; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "पंक्ति में %d दस्तावेज़ हैं" + PD32_MARGINS_IN_INCHES "मार्जिन [इंच]" + PD32_MARGINS_IN_MILLIMETERS "मार्जिन [mm]" + PD32_MILLIMETERS "mm" + + PD32_PRINTER_STATUS_READY "तैयार" + PD32_PRINTER_STATUS_PAUSED "रोके गए; " + PD32_PRINTER_STATUS_ERROR "त्रुटि; " + PD32_PRINTER_STATUS_PENDING_DELETION "हटाने का काम लंबित; " + PD32_PRINTER_STATUS_PAPER_JAM "कागज जाम; " + PD32_PRINTER_STATUS_PAPER_OUT "कागज खत्म; " + PD32_PRINTER_STATUS_MANUAL_FEED "फीड पेपर मैनुअल; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "कागज की समस्या; " + PD32_PRINTER_STATUS_OFFLINE "प्रिंटर ऑफ़लाइन; " + PD32_PRINTER_STATUS_IO_ACTIVE "आई/ओ एक्टिव; " + PD32_PRINTER_STATUS_BUSY "व्यस्त; " + PD32_PRINTER_STATUS_PRINTING "मुद्रण; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "आउटपुट ट्रे भरी हुई है; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "अनुपलब्ध; " + PD32_PRINTER_STATUS_WAITING "इंतिज़ार; " + PD32_PRINTER_STATUS_PROCESSING "प्रसंस्करण; " + PD32_PRINTER_STATUS_INITIALIZING "इनिशलाइज़ करना; " + PD32_PRINTER_STATUS_WARMING_UP "गरम करना; " + PD32_PRINTER_STATUS_TONER_LOW "कम टोनर; " + PD32_PRINTER_STATUS_NO_TONER "कोई टोनर नहीं; " + PD32_PRINTER_STATUS_PAGE_PUNT "पेज पंट; " + PD32_PRINTER_STATUS_USER_INTERVENTION "उपयोगकर्ता द्वारा बाधित; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "मेमोरी खत्म; " + PD32_PRINTER_STATUS_DOOR_OPEN "प्रिंटर का दरवाजा खुला है; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "प्रिंट सर्वर अज्ञात; " + PD32_PRINTER_STATUS_POWER_SAVE "बिजली बचाने की प्रणाली; " +} + +STRINGTABLE /* Font styles */ +{ + IDS_FONT_REGULAR "नियमित" + IDS_FONT_BOLD "बोल्ड" + IDS_FONT_ITALIC "तिरछा" + IDS_FONT_BOLD_ITALIC "बोल्ड तिरछा" +} + +STRINGTABLE /* Color names */ +{ + IDS_COLOR_BLACK "काला" + IDS_COLOR_MAROON "मारून" + IDS_COLOR_GREEN "हरा" + IDS_COLOR_OLIVE "ओलिव" + IDS_COLOR_NAVY "नेवी" + IDS_COLOR_PURPLE "पर्पल" + IDS_COLOR_TEAL "टील" + IDS_COLOR_GRAY "ग्रे" + IDS_COLOR_SILVER "चांदी" + IDS_COLOR_RED "लाल" + IDS_COLOR_LIME "लाइम्" + IDS_COLOR_YELLOW "पीला" + IDS_COLOR_BLUE "नीला" + IDS_COLOR_FUCHSIA "फ्यूशिया" + IDS_COLOR_AQUA "एक्वा" + IDS_COLOR_WHITE "सफेद" +} + +STRINGTABLE +{ + IDS_FONT_SIZE "%1!d और %2!d अंक के बीच एक फ़ॉन्ट साइज़ चुनें।" + IDS_SAVE_BUTTON "&सेव" + IDS_SAVE_IN "सेव &इन:" + IDS_SAVE "सेव" + IDS_SAVE_AS "सेव इज़" + IDS_OPEN_FILE "फाइल खोलो" + IDS_SELECT_FOLDER "फोल्डर का चयन करें" + IDS_FONT_SIZE_INPUT "फ़ॉन्ट का साइज़ एक संख्या होना चाहिए।" +} + +/* + * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. + */ + +OPEN_FILE DIALOG 36, 24, 275, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का &नाम:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&डाइरेक्टरी:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&प्रकार की सूची फ़ाइलें:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&ड्राइव:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "खोलो", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&केवल पठीय", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +SAVE_FILE DIALOG 36, 24, 275, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "सेव इज़..." +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का &नाम:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&डाइरेक्टर:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&प्रकार की सूची फ़ाइलें:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&ड्राइव:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "सेव इज़", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&केवल पठीय", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT DIALOG 36, 24, 264, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "प्रिंट" +FONT 8, "MS Shell Dlg" +{ + LTEXT "प्रिंटर:", stc1, 6, 6, 40, 9 + LTEXT "", stc2, 60, 6, 150, 9 + GROUPBOX "प्रिंट रेंज", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&सब", rad1, 16, 45, 60, 12 + RADIOBUTTON "&चुनाव", rad2, 16, 60, 60, 12 + RADIOBUTTON "&पृष्ठों", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "प्रिंट", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सेटअप", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&से:", stc3, 60, 80, 30, 9 + LTEXT "&तक:", stc4, 120, 80, 30, 9 + LTEXT "प्रिंट की &गुणवत्ता:", stc5, 6, 100, 76, 9 + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "&फाइल करने के लिए प्रिंट", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "घनीभूत", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT_SETUP DIALOG 36, 24, 264, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "प्रिंट सेटअप" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "प्रिंटर", grp1, 6, 6, 180, 72, BS_GROUPBOX + RADIOBUTTON "&डिफ़ॉल्ट प्रिंटर", rad1, 16, 16, 150, 12 + LTEXT "[कुछ भी नहीं]", stc1, 35, 30, 120, 9 + RADIOBUTTON "Specific &Printer", rad2, 16, 44, 150, 12 + COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "ठीक", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सेटअप", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "उन्मुखीकरण", grp2, 6, 82, 100, 50, BS_GROUPBOX + RADIOBUTTON "&पॉर्ट्रट", rad3, 50, 95, 50, 12 + RADIOBUTTON "&लैन्ड्स्केप", rad4, 50, 110, 50, 12 + ICON "लैन्ड्स्केप", stc10, 10, 95, 32, 32 + ICON "पॉर्ट्रट", stc11, 10, 95, 32, 32 + GROUPBOX "कागज़", grp3, 116, 82, 178, 50, BS_GROUPBOX + LTEXT "&साइज़", stc2, 126, 95, 35, 9 + LTEXT "&सॉर्स", stc3, 126, 110, 35, 9 + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_FONT DIALOG 13, 54, 274, 147 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "फ़ॉन्ट" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&फ़ॉन्ट:",stc1 ,6,3,90,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "फ़ॉन्ट &शैली:",stc2 ,108,3,60,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&साइज़:",stc3,179,3,32,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "ठीक",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&लागू करें", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP + GROUPBOX "प्रभाव",grp1,6,72,84,36,WS_GROUP + CHECKBOX "&स्ट्राइक आउट", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&रेखांकित", chx2, 10,94,78,10, BS_AUTOCHECKBOX + LTEXT "&रंग:", stc4 ,6,114,80,9 + COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "सैम्पल",grp2,98,72,120,36,WS_GROUP + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "&लिपि:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_COLOR DIALOG 36, 24, 300, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "रंग" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&मूल रंग:", stc1, 4, 4, 140, 10 + LTEXT "&कस्टम रंग:", stc2, 4, 106, 140, 10 + LTEXT "रंग | &ठोस", stc3, 150, 151, 48, 10 + LTEXT "&लाल:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&हरा:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&नीला:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ह्यू:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&सैट:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&लूम:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + DEFPUSHBUTTON "ठीक", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "मदद", pshHelp,100,166, 44, 14 + PUSHBUTTON "कस्टम रंग में &ऐड करे", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "कस्टम रंगों को &परिभाषित करें >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "रंग | &ठोस", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ +} + + +FINDDLGORD DIALOG 36, 24, 276, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "खोज" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&क्या ढूँडो:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "केवल &पूर्ण शब्द मिलाएं", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&केस मिलाएँ", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "दिशाओं", grp1, 147, 21, 58, 38 + CONTROL "&ऊपर", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&नीचे", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + + DEFPUSHBUTTON "अगला &ढूंढो", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG 36, 24, 276, 94 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "बदले" +FONT 8, "MS Shell Dlg" +{ + LTEXT "क्या &ढूँडो:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&से बदलो:", -1, 4, 26, 52, 8 + EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "केवल &पूर्ण शब्द मिलाएं", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&केस मिलाएँ", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "अगला &ढूंढो", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&बदले", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सबको बदली करें", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP +} + + +PRINT32 DIALOG 32, 32, 288, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP +CAPTION "प्रिंट" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "ठीक", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL, 230,164, 50,14, WS_GROUP + PUSHBUTTON "&मदद", pshHelp, 50, 161, 50,14, WS_GROUP + + GROUPBOX "प्रिंटर", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "&फाइल करने के लिए प्रिंट", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + PUSHBUTTON "&गुण", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&नाम:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "टिप्पणी:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "प्रतियां", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "&प्रतियों की संख्या:",stc5,168,105,68,8 + ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&कोलेट", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "प्रिंट रेंज", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&सब", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&पृष्ठों", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&चयन", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "&से:", stc2, 52,124, 20,8 + RTEXT "&तक:", stc3, 99,124, 20,8 +} + +PRINT32_SETUP DIALOG 32, 32, 288, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +CAPTION "प्रिंट सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ठीक",IDOK,176,156,50,14,WS_GROUP + PUSHBUTTON "रद्द करें",IDCANCEL,230,156,50,14 +/* PUSHBUTTON "नेटवर्क...", psh5, 284,156,48,14 */ + + GROUPBOX "प्रिंटर", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&गुण", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&नाम:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "टिप्पणी:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "कागज़", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&साइज़:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&सॉर्स:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "उन्मुखीकरण", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&पोर्ट्रिट", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "&लैंडस्केप", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +PAGESETUPDLGORD DIALOG 32, 32, 240, 240 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "सेटअप पृष्ठ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "कागज़", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&साइज़:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&ट्रे:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "उन्मुखीकरण", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&पोर्ट्रिट", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&लैंडस्केप", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&बाएं:", stc15, 88, 172, 30, 8 + EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&दांए:", stc16, 159, 172, 30, 8 + EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&टॉप:", stc17, 88, 192, 30, 8 + EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&तल:", stc18, 159, 192, 30, 8 + EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "ठीक", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&प्रिंटर...", psh3, 182, 220, 50, 14 +END + +NEWFILEOPENORD DIALOG 0, 0, 280, 164 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&इसमें देखें:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "फ़ाइल का &नाम:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY + EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 + + LTEXT "&प्रकार की फाइलें:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY + COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "केवल पठनीय के रूप में खोलें",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 + + DEFPUSHBUTTON "&खोलो", IDOK,222,110,54,14 + PUSHBUTTON "रद्द करें", IDCANCEL,222,128,54,14 + PUSHBUTTON "&मदद", pshHelp,222,145,54,14 +} + +NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&इसमें देखें:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "फ़ाइल का &नाम:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 + + LTEXT "&प्रकार की फाइलें:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "केवल पठनीय के रूप में खोलें", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + + DEFPUSHBUTTON "&खोलो", IDOK, 310, 180, 54, 14 + PUSHBUTTON "रद्द करें", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "&मदद", pshHelp, 310, 215, 54, 14 +} + +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का नाम:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL + + LTEXT "प्रकार की फाइलें:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | + WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&खोलो", IDOK, 350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS + + /* drop-down menu for open button */ + CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | + BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 + + PUSHBUTTON "रद्द करें", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS + PUSHBUTTON "&मदद", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS +} diff --git a/dll/win32/comdlg32/rsrc.rc b/dll/win32/comdlg32/rsrc.rc index 3d83d96c4d..7bf688e660 100644 --- a/dll/win32/comdlg32/rsrc.rc +++ b/dll/win32/comdlg32/rsrc.rc @@ -83,6 +83,9 @@ #ifdef LANGUAGE_HE_IL #include "lang/cdlg_He.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/cdlg_Hi.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/cdlg_Hu.rc" #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs