Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [EXPAND] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4ab01b670a2bb40b2c37… commit f4ab01b670a2bb40b2c37240dd163dc6db0e6317 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:12:40 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:12:40 2018 +0100 [EXPAND] Sync with Wine Staging 3.3. CORE-14434 --- base/system/expand/expand.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/base/system/expand/expand.c b/base/system/expand/expand.c index 6acfb63c0f..ea7bfdf80b 100644 --- a/base/system/expand/expand.c +++ b/base/system/expand/expand.c @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> +#include <string.h> +#include <windows.h> #include <lzexpand.h> #include <setupapi.h> diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8f54e3b2bb..e9b7d7e492 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -242,7 +242,7 @@ reactos/base/applications/winhlp32 # Synced to WineStaging-3.3 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-3.3 reactos/base/services/rpcss # Synced to WineStaging-3.3 -reactos/base/system/expand # Synced to WineStaging-2.9 +reactos/base/system/expand # Synced to WineStaging-3.3 reactos/base/system/msiexec # Synced to WineStaging-2.16 reactos/modules/rosapps/winfile # Autosync

1 0

01/01: [RPCSS] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=444338ae2e4ea1cdd5a9b… commit 444338ae2e4ea1cdd5a9b8bc2f6a2481496d9b3c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:11:47 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:11:47 2018 +0100 [RPCSS] Sync with Wine Staging 3.3. CORE-14434 --- base/services/rpcss/CMakeLists.txt | 5 +- base/services/rpcss/epmp.c | 5 +- base/services/rpcss/irotp.c | 12 ++- base/services/rpcss/precomp.h | 22 ++++++ base/services/rpcss/rpcss.h | 41 ----------- base/services/rpcss/rpcss_main.c | 147 +++++++++++++++++++++---------------- base/services/rpcss/rpcss_ros.diff | 40 ---------- base/services/rpcss/service_main.c | 101 ------------------------- media/doc/README.WINE | 2 +- 9 files changed, 120 insertions(+), 255 deletions(-) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 1d429832a8..a7a31c5dfe 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -8,8 +8,7 @@ list(APPEND SOURCE epmp.c irotp.c rpcss_main.c - service_main.c - rpcss.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c) @@ -23,5 +22,5 @@ endif() target_link_libraries(rpcss ${PSEH_LIB} wine) set_module_type(rpcss win32cui UNICODE) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(rpcss rpcss.h SOURCE) +add_pch(rpcss precomp.h SOURCE) add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all) diff --git a/base/services/rpcss/epmp.c b/base/services/rpcss/epmp.c index 5e2866e9af..58498b0ee3 100644 --- a/base/services/rpcss/epmp.c +++ b/base/services/rpcss/epmp.c @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "rpcss.h" +#include "epm_s.h" -#include <wine/debug.h> +#include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/base/services/rpcss/irotp.c b/base/services/rpcss/irotp.c index bf9c5690ee..c73cb78476 100644 --- a/base/services/rpcss/irotp.c +++ b/base/services/rpcss/irotp.c @@ -18,9 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "rpcss.h" +#include <stdarg.h> +#include <string.h> -#include <wine/debug.h> +#include "winerror.h" +#include "windef.h" +#include "winbase.h" + +#include "irot_s.h" + +#include "wine/list.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rpcss); diff --git a/base/services/rpcss/precomp.h b/base/services/rpcss/precomp.h new file mode 100644 index 0000000000..34be35b068 --- /dev/null +++ b/base/services/rpcss/precomp.h @@ -0,0 +1,22 @@ + +#ifndef _RPCSS_PRECOMP_H_ +#define _RPCSS_PRECOMP_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> + +#include <irot_s.h> +#include <epm_s.h> + +#include <wine/list.h> + +#endif /* !_RPCSS_PRECOMP_H_ */ diff --git a/base/services/rpcss/rpcss.h b/base/services/rpcss/rpcss.h deleted file mode 100644 index 347a5cf942..0000000000 --- a/base/services/rpcss/rpcss.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * RPCSS definitions - * - * Copyright (C) 2002 Greg Turner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_RPCSS_H -#define __WINE_RPCSS_H - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> - -#include <irot_s.h> -#include <epm_s.h> - -#include <wine/list.h> - -#endif /* __WINE_RPCSS_H */ diff --git a/base/services/rpcss/rpcss_main.c b/base/services/rpcss/rpcss_main.c index adf0e7f9ec..885726dba1 100644 --- a/base/services/rpcss/rpcss_main.c +++ b/base/services/rpcss/rpcss_main.c @@ -15,45 +15,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * ---- rpcss_main.c: - * Initialize and start serving requests. Bail if rpcss already is - * running. - * - * ---- RPCSS.EXE: - * - * Wine needs a server whose role is somewhat like that - * of rpcss.exe in windows. This is not a clone of - * windows rpcss at all. It has been given the same name, however, - * to provide for the possibility that at some point in the future, - * it may become interface compatible with the "real" rpcss.exe on - * Windows. - * - * ---- KNOWN BUGS / TODO: - * - * o Service hooks are unimplemented (if you bother to implement - * these, also implement net.exe, at least for "net start" and - * "net stop" (should be pretty easy I guess, assuming the rest - * of the services API infrastructure works. - * - * o There is a looming problem regarding listening on privileged - * ports. We will need to be able to coexist with SAMBA, and be able - * to function without running winelib code as root. This may - * take some doing, including significant reconceptualization of the - * role of rpcss.exe in wine. */ -#include "rpcss.h" +#include <stdio.h> +#include <stdarg.h> +#include <limits.h> +#include <assert.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winsvc.h" +#include "irot_s.h" +#include "epm_s.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +#include "wine/debug.h" -HANDLE exit_event; +WINE_DEFAULT_DEBUG_CHANNEL(ole); -//extern HANDLE __wine_make_process_system(void); +static WCHAR rpcssW[] = {'R','p','c','S','s',0}; +static HANDLE exit_event; +static SERVICE_STATUS_HANDLE service_handle; -BOOL RPCSS_Initialize(void) +static BOOL RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; @@ -94,16 +78,6 @@ BOOL RPCSS_Initialize(void) if (status != RPC_S_OK) goto fail; -#ifndef __REACTOS__ - exit_event = __wine_make_process_system(); -#else - exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires - { - HANDLE hStartEvent = CreateEventW(NULL, TRUE, FALSE, L"ScmCreatedEvent"); - SetEvent(hStartEvent); - } -#endif - return TRUE; fail: @@ -112,33 +86,76 @@ fail: return FALSE; } -/* returns false if we discover at the last moment that we - aren't ready to terminate */ -BOOL RPCSS_Shutdown(void) +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { - RpcMgmtStopServerListening(NULL); - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); - RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, TRUE); + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch (ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + TRACE( "shutting down\n" ); + RpcMgmtStopServerListening( NULL ); + RpcServerUnregisterIf( epm_v3_0_s_ifspec, NULL, TRUE ); + RpcServerUnregisterIf( Irot_v0_2_s_ifspec, NULL, TRUE ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( exit_event ); + return NO_ERROR; + default: + FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} - CloseHandle(exit_event); +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; - return TRUE; + TRACE( "starting service\n" ); + + if (!RPCSS_Initialize()) return; + + exit_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( rpcssW, service_handler, NULL ); + if (!service_handle) return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( exit_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + TRACE( "service stopped\n" ); } -#ifndef __REACTOS__ -int main( int argc, char **argv ) +int wmain( int argc, WCHAR *argv[] ) { - /* - * We are invoked as a standard executable; we act in a - * "lazy" manner. We register our interfaces and endpoints, and hang around - * until we all user processes exit, and then silently terminate. - */ - - if (RPCSS_Initialize()) { - WaitForSingleObject(exit_event, INFINITE); - RPCSS_Shutdown(); - } - - return 0; + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { rpcssW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; } -#endif diff --git a/base/services/rpcss/rpcss_ros.diff b/base/services/rpcss/rpcss_ros.diff deleted file mode 100644 index f23583afd7..0000000000 --- a/base/services/rpcss/rpcss_ros.diff +++ /dev/null @@ -1,40 +0,0 @@ -Index: rpcss_main.c -=================================================================== ---- rpcss_main.c -+++ rpcss_main.c -@@ -58,11 +58,11 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - --static HANDLE exit_event; -+HANDLE exit_event; - - //extern HANDLE __wine_make_process_system(void); - --static BOOL RPCSS_Initialize(void) -+BOOL RPCSS_Initialize(void) - { - static unsigned short irot_protseq[] = IROT_PROTSEQ; - static unsigned short irot_endpoint[] = IROT_ENDPOINT; -@@ -116,7 +116,7 @@ - - /* returns false if we discover at the last moment that we - aren't ready to terminate */ --static BOOL RPCSS_Shutdown(void) -+BOOL RPCSS_Shutdown(void) - { - RpcMgmtStopServerListening(NULL); - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); -@@ -127,6 +127,7 @@ - return TRUE; - } - -+#if 0 - int main( int argc, char **argv ) - { - /* -@@ -142,3 +143,4 @@ - - return 0; - } -+#endif diff --git a/base/services/rpcss/service_main.c b/base/services/rpcss/service_main.c deleted file mode 100644 index 63be4e9929..0000000000 --- a/base/services/rpcss/service_main.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * PROJECT: ReactOS Remote Procedure Call service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/rpcss/service_main.c - * PURPOSE: Service control code - * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "rpcss.h" - -#include <winsvc.h> - -#define NDEBUG -#include <debug.h> - -extern BOOL RPCSS_Initialize(void); -extern BOOL RPCSS_Shutdown(void); -extern HANDLE exit_event; - -static VOID WINAPI ServiceMain(DWORD, LPWSTR *); -static WCHAR ServiceName[] = L"RpcSs"; -SERVICE_TABLE_ENTRYW ServiceTable[] = -{ - { ServiceName, ServiceMain }, - { NULL, NULL } -}; - -static SERVICE_STATUS ServiceStatus; -static SERVICE_STATUS_HANDLE ServiceStatusHandle; - -DWORD WINAPI -ServiceControlHandler(DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext) -{ - switch (dwControl) - { - case SERVICE_CONTROL_SHUTDOWN: - case SERVICE_CONTROL_STOP: - SetEvent(exit_event); - return NO_ERROR; - - case SERVICE_CONTROL_INTERROGATE: - return NO_ERROR; - - default: - return ERROR_CALL_NOT_IMPLEMENTED; - } -} - -VOID WINAPI -ServiceMain(DWORD argc, LPWSTR argv[]) -{ - DWORD dwError; - - ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, - ServiceControlHandler, - NULL); - if (!ServiceStatusHandle) - { - dwError = GetLastError(); - DPRINT1("RegisterServiceCtrlHandlerW() failed! (Error %lu)\n", dwError); - return; - } - - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - ServiceStatus.dwCurrentState = SERVICE_START_PENDING; - ServiceStatus.dwControlsAccepted = 0; - ServiceStatus.dwWin32ExitCode = NO_ERROR; - ServiceStatus.dwServiceSpecificExitCode = 0; - ServiceStatus.dwCheckPoint = 0; - ServiceStatus.dwWaitHint = 1000; - SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - - if (RPCSS_Initialize()) - { - ServiceStatus.dwCurrentState = SERVICE_RUNNING; - ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - - WaitForSingleObject(exit_event, INFINITE); - - RPCSS_Shutdown(); - - ServiceStatus.dwCurrentState = SERVICE_STOPPED; - SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - } -} - -int wmain(int argc, LPWSTR argv[]) -{ - if (!StartServiceCtrlDispatcherW(ServiceTable)) - { - DPRINT1("StartServiceCtrlDispatcherW() failed\n"); - return 1; - } - - return 0; -} diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d6d104ec63..8f54e3b2bb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -241,7 +241,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-3.3 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-3.3 -reactos/base/services/rpcss # Synced to WineStaging-1.9.16 +reactos/base/services/rpcss # Synced to WineStaging-3.3 reactos/base/system/expand # Synced to WineStaging-2.9 reactos/base/system/msiexec # Synced to WineStaging-2.16 reactos/modules/rosapps/winfile # Autosync

1 0

01/01: [WRITE] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=905c9ea7b1aac186e5b5a… commit 905c9ea7b1aac186e5b5a1a2242f55e31b703aab Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:10:37 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:10:37 2018 +0100 [WRITE] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/write/resources.h | 5 ++++- base/applications/write/rsrc.rc | 3 --- base/applications/write/write.c | 6 +++--- media/doc/README.WINE | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/write/resources.h b/base/applications/write/resources.h index 0aac99e176..bcf716f7d3 100644 --- a/base/applications/write/resources.h +++ b/base/applications/write/resources.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma once +#include <windef.h> +#ifdef __REACTOS__ +#include <winuser.h> +#endif #define IDS_FAILED 101 diff --git a/base/applications/write/rsrc.rc b/base/applications/write/rsrc.rc index 362ce94ea6..c5f4fd92c9 100644 --- a/base/applications/write/rsrc.rc +++ b/base/applications/write/rsrc.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resources.h" #include <reactos/manifest_exe.rc> diff --git a/base/applications/write/write.c b/base/applications/write/write.c index 5326db605a..9bf9361142 100644 --- a/base/applications/write/write.c +++ b/base/applications/write/write.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> +#include <windows.h> #include "resources.h" static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6b4613069f..d6d104ec63 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -240,7 +240,7 @@ reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-3.3 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 -reactos/base/applications/write # Synced to WineStaging-2.9 +reactos/base/applications/write # Synced to WineStaging-3.3 reactos/base/services/rpcss # Synced to WineStaging-1.9.16 reactos/base/system/expand # Synced to WineStaging-2.9 reactos/base/system/msiexec # Synced to WineStaging-2.16

1 0

01/01: [WINHLP32] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e289916aaa166d92d85df… commit e289916aaa166d92d85df8617b865fbab491a9da Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:09:44 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:09:44 2018 +0100 [WINHLP32] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/winhlp32/CMakeLists.txt | 4 +- base/applications/winhlp32/callback.c | 9 + base/applications/winhlp32/hlpfile.c | 12 ++ base/applications/winhlp32/hlpfile.h | 2 + base/applications/winhlp32/macro.c | 11 +- base/applications/winhlp32/macro.h | 7 + base/applications/winhlp32/macro.lex.l | 6 +- base/applications/winhlp32/macro.lex.yy.c | 27 ++- base/applications/winhlp32/macro.lex.yy.h | 323 ++++++++++++++++++++++++++++++ base/applications/winhlp32/precomp.h | 20 ++ base/applications/winhlp32/rsrc.rc | 3 - base/applications/winhlp32/winhelp.c | 22 +- base/applications/winhlp32/winhelp.h | 26 +-- base/applications/winhlp32/winhelp_res.h | 3 + media/doc/README.WINE | 2 +- 15 files changed, 431 insertions(+), 46 deletions(-) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index 4c9848466c..aecb08cfd3 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -13,12 +13,12 @@ list(APPEND SOURCE macro.c macro.lex.yy.c winhelp.c - winhelp.h) + precomp.h) add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) add_executable(winhlp32 ${SOURCE} string.c rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) -add_pch(winhlp32 winhelp.h SOURCE) +add_pch(winhlp32 precomp.h SOURCE) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) diff --git a/base/applications/winhlp32/callback.c b/base/applications/winhlp32/callback.c index a15b728df6..e58fab128d 100644 --- a/base/applications/winhlp32/callback.c +++ b/base/applications/winhlp32/callback.c @@ -18,8 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN + +#include <stdio.h> + +#include "windows.h" #include "winhelp.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); + static WORD CALLBACK WHD_GetFSError(void) { WINE_FIXME("()\n"); diff --git a/base/applications/winhlp32/hlpfile.c b/base/applications/winhlp32/hlpfile.c index 850bfcbc6e..4655446502 100644 --- a/base/applications/winhlp32/hlpfile.c +++ b/base/applications/winhlp32/hlpfile.c @@ -20,8 +20,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "winhelp.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); + static inline unsigned short GET_USHORT(const BYTE* buffer, unsigned i) { return (BYTE)buffer[i] + 0x100 * (BYTE)buffer[i + 1]; diff --git a/base/applications/winhlp32/hlpfile.h b/base/applications/winhlp32/hlpfile.h index 55ef681edd..20c0ca4d99 100644 --- a/base/applications/winhlp32/hlpfile.h +++ b/base/applications/winhlp32/hlpfile.h @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + struct tagHelpFile; typedef struct diff --git a/base/applications/winhlp32/macro.c b/base/applications/winhlp32/macro.c index 02a0ffc1a5..5a25d6c944 100644 --- a/base/applications/winhlp32/macro.c +++ b/base/applications/winhlp32/macro.c @@ -19,9 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN + +#include <stdio.h> + +#include "windows.h" +#include "commdlg.h" +#include "shellapi.h" #include "winhelp.h" -#include <shellapi.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); /**************************************************/ /* Macro table */ diff --git a/base/applications/winhlp32/macro.h b/base/applications/winhlp32/macro.h index a82b90e5f3..ca6445d497 100644 --- a/base/applications/winhlp32/macro.h +++ b/base/applications/winhlp32/macro.h @@ -19,6 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + struct lexret { LPCSTR proto; BOOL bool; diff --git a/base/applications/winhlp32/macro.lex.l b/base/applications/winhlp32/macro.lex.l index 8f6945ca98..da2dd22e44 100644 --- a/base/applications/winhlp32/macro.lex.l +++ b/base/applications/winhlp32/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option noinput nounput never-interactive 8bit +%option noinput nounput never-interactive 8bit noyywrap %x quote %{ #include "config.h" @@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) { return lex_data ? lex_data->window : Globals.active_win; } - -#ifndef yywrap -int yywrap(void) { return 1; } -#endif diff --git a/base/applications/winhlp32/macro.lex.yy.c b/base/applications/winhlp32/macro.lex.yy.c index 13f864eaf8..255bdb159a 100644 --- a/base/applications/winhlp32/macro.lex.yy.c +++ b/base/applications/winhlp32/macro.lex.yy.c @@ -333,6 +333,9 @@ void yyfree (void * ); /* Begin user sect3 */ +#define yywrap() 1 +#define YY_SKIP_YYWRAP + typedef unsigned char YY_CHAR; FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; @@ -494,11 +497,21 @@ char *yytext; #define YY_NO_INPUT 1 #line 26 "macro.lex.l" -#include <config.h> +#include "config.h" +#include <assert.h> +#include <stdarg.h> #define YY_NO_UNISTD_H +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "winhelp.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); + struct lex_data { LPCSTR macroptr; LPSTR strptr; @@ -515,7 +528,7 @@ struct lexret yylval; #define YY_INPUT(buf,result,max_size)\ if ((result = *lex_data->macroptr ? 1 : 0)) buf[0] = *lex_data->macroptr++; -#line 537 "macro.lex.yy.c" +#line 532 "macro.lex.yy.c" #define INITIAL 0 #define quote 1 @@ -699,7 +712,7 @@ YY_DECL #line 58 "macro.lex.l" -#line 726 "macro.lex.yy.c" +#line 716 "macro.lex.yy.c" if ( !(yy_init) ) { @@ -867,7 +880,7 @@ YY_RULE_SETUP #line 108 "macro.lex.l" ECHO; YY_BREAK -#line 894 "macro.lex.yy.c" +#line 884 "macro.lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1825,7 +1838,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 108 "macro.lex.l" +#line 107 "macro.lex.l" @@ -2090,7 +2103,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) return lex_data ? lex_data->window : Globals.active_win; } -#ifndef yywrap -int yywrap(void) { return 1; } -#endif - diff --git a/base/applications/winhlp32/macro.lex.yy.h b/base/applications/winhlp32/macro.lex.yy.h new file mode 100644 index 0000000000..05147e869b --- /dev/null +++ b/base/applications/winhlp32/macro.lex.yy.h @@ -0,0 +1,323 @@ +#ifndef yyHEADER_H +#define yyHEADER_H 1 +#define yyIN_HEADER 1 + +#line 6 "macro.lex.yy.h" + +#line 8 "macro.lex.yy.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 37 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; + +extern FILE *yyin, *yyout; + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); + +/* Begin user sect3 */ + +#define yywrap() 1 +#define YY_SKIP_YYWRAP + +extern int yylineno; + +extern char *yytext; +#define yytext_ptr yytext + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define quote 1 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (void ); + +int yyget_debug (void ); + +void yyset_debug (int debug_flag ); + +YY_EXTRA_TYPE yyget_extra (void ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *yyget_in (void ); + +void yyset_in (FILE * in_str ); + +FILE *yyget_out (void ); + +void yyset_out (FILE * out_str ); + +yy_size_t yyget_leng (void ); + +char *yyget_text (void ); + +int yyget_lineno (void ); + +void yyset_lineno (int line_number ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (void ); +#else +extern int yywrap (void ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 107 "macro.lex.l" + + +#line 322 "macro.lex.yy.h" +#undef yyIN_HEADER +#endif /* yyHEADER_H */ diff --git a/base/applications/winhlp32/precomp.h b/base/applications/winhlp32/precomp.h new file mode 100644 index 0000000000..28061d4b57 --- /dev/null +++ b/base/applications/winhlp32/precomp.h @@ -0,0 +1,20 @@ + +#ifndef _WINHELP_PRECOMP_H_ +#define _WINHELP_PRECOMP_H_ + +#include <assert.h> +#include <stdio.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> + +#include <wine/debug.h> + +#include "winhelp.h" +#include "hlpfile.h" +#include "macro.h" +#include "winhelp_res.h" + +#endif /* !_WINHELP_PRECOMP_H_ */ diff --git a/base/applications/winhlp32/rsrc.rc b/base/applications/winhlp32/rsrc.rc index d1f279eb28..3666e11258 100644 --- a/base/applications/winhlp32/rsrc.rc +++ b/base/applications/winhlp32/rsrc.rc @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "winhelp_res.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/base/applications/winhlp32/winhelp.c b/base/applications/winhlp32/winhelp.c index fdd1b40969..2ac3d2ff24 100644 --- a/base/applications/winhlp32/winhelp.c +++ b/base/applications/winhlp32/winhelp.c @@ -22,10 +22,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdio.h> +#include <string.h> +#include <stdarg.h> +#include <stdlib.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "commdlg.h" #include "winhelp.h" +#include "winhelp_res.h" +#include "shellapi.h" +#include "richedit.h" +#include "commctrl.h" -#include <richedit.h> -#include <commctrl.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}, NULL}; diff --git a/base/applications/winhlp32/winhelp.h b/base/applications/winhlp32/winhelp.h index ae0b92030d..dd4e9a4e27 100644 --- a/base/applications/winhlp32/winhelp.h +++ b/base/applications/winhlp32/winhelp.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WINHELP_H_ -#define _WINHELP_H_ +#pragma once #define MAX_LANGUAGE_NUMBER 255 #define MAX_STRING_LEN 255 @@ -35,29 +34,12 @@ #ifndef RC_INVOKED -#include <assert.h> #include <stdarg.h> -#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> #include "hlpfile.h" +#include "windef.h" +#include "winbase.h" #include "macro.h" - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); - #include "winhelp_res.h" typedef struct tagHelpButton @@ -206,5 +188,3 @@ extern const char STRING_DIALOG_TEST[]; /* Buttons */ #define WH_FIRST_BUTTON 500 - -#endif /* _WINHELP_H_ */ diff --git a/base/applications/winhlp32/winhelp_res.h b/base/applications/winhlp32/winhelp_res.h index dccf230490..f0261a0074 100644 --- a/base/applications/winhlp32/winhelp_res.h +++ b/base/applications/winhlp32/winhelp_res.h @@ -1,5 +1,8 @@ #pragma once +#include <windef.h> +#include <winuser.h> + #define MNID_FILE_OPEN 0x101 #define MNID_FILE_PRINT 0x104 #define MNID_FILE_SETUP 0x106 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 492d022c16..6b4613069f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -238,7 +238,7 @@ reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/iexplore # Synced to WineStaging-3.3 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync -reactos/base/applications/winhlp32 # Synced to Wine-3.0 +reactos/base/applications/winhlp32 # Synced to WineStaging-3.3 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-2.9 reactos/base/services/rpcss # Synced to WineStaging-1.9.16

1 0

01/01: [IEXPLORE] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e79d3bbbe10f76d7c273… commit 1e79d3bbbe10f76d7c27371beb0722c2be3ebd4d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:08:41 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:08:41 2018 +0100 [IEXPLORE] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/iexplore/iexplore.inf | 8 ++++++-- base/applications/iexplore/main.c | 23 +++++------------------ media/doc/README.WINE | 2 +- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index 95340ba79a..5e059669d0 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -22,13 +22,16 @@ HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" +HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe"" -startmanager" + + [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","ShowGoButton",2,"yes" -#HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +#HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.reactos.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" -#HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +#HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://www.winehq.org" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.reactos.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" @@ -43,3 +46,4 @@ HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" [Strings] CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" +CLSID_InternetExplorerManager="{df4fcc34-067a-4e0a-8352-4a1a5095346e}" diff --git a/base/applications/iexplore/main.c b/base/applications/iexplore/main.c index 4b76ce3eda..b881443810 100644 --- a/base/applications/iexplore/main.c +++ b/base/applications/iexplore/main.c @@ -18,26 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windows.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <winver.h> - +#include <windows.h> #include <advpub.h> -//#include <ole2.h> -//#include <rpcproxy.h> +#include <ole2.h> +#include <rpcproxy.h> -#include <wine/unicode.h> -#include <wine/debug.h> +#include "wine/unicode.h" +#include "wine/debug.h" extern DWORD WINAPI IEWinMain(const WCHAR*, int); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c0ddf543e1..492d022c16 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3 -reactos/base/applications/iexplore # Synced to WineStaging-2.9 +reactos/base/applications/iexplore # Synced to WineStaging-3.3 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-3.0

1 0

01/01: [APPVEYOR] Clean up our build logs so we can focus on warnings and errors.
by Amine Khaldi 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6f2c9fc5c608749d0404… commit b6f2c9fc5c608749d0404c9e20a4fa7abc704e98 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Apr 1 13:07:09 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Apr 1 13:07:09 2018 +0100 [APPVEYOR] Clean up our build logs so we can focus on warnings and errors. --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 443508b7f8..caf0f951ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,8 +27,10 @@ build_script: - md c:\ros_build - cd c:\ros_build - call %APPVEYOR_BUILD_FOLDER%\configure.cmd %clang_configure_option% -DENABLE_ROSTESTS=1 - - ninja -k0 - - ninja bootcd + - ps: >- + & ninja -k0 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} + - ps: >- + & ninja bootcd 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} test: off deploy: off

1 0

01/01: [NET] Reorganize and improve the help texts (1/X) - Move common texts into separate string resources. - Add missing help texts for ACCOUNTS, COMPUTER, CONFIG and CONTINUE commands.
by Eric Kohl 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=480cd1e60c9e8bebd0fdf… commit 480cd1e60c9e8bebd0fdfca1e1c954caa5c41468 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 1 12:23:15 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 1 12:23:57 2018 +0200 [NET] Reorganize and improve the help texts (1/X) - Move common texts into separate string resources. - Add missing help texts for ACCOUNTS, COMPUTER, CONFIG and CONTINUE commands. --- base/applications/network/net/cmdAccounts.c | 15 ++- base/applications/network/net/cmdContinue.c | 7 +- base/applications/network/net/cmdHelpMsg.c | 1 + base/applications/network/net/cmdLocalGroup.c | 3 + base/applications/network/net/cmdPause.c | 1 + base/applications/network/net/cmdStop.c | 1 + base/applications/network/net/cmdUser.c | 3 + base/applications/network/net/help.c | 50 ++++++++-- base/applications/network/net/lang/en-US.rc | 130 ++++++++++++++++++++------ base/applications/network/net/lang/es-ES.rc | 130 ++++++++++++++++++++------ base/applications/network/net/lang/ro-RO.rc | 128 +++++++++++++++++++------ base/applications/network/net/lang/ru-RU.rc | 128 +++++++++++++++++++------ base/applications/network/net/lang/tr-TR.rc | 128 +++++++++++++++++++------ base/applications/network/net/lang/zh-CN.rc | 128 +++++++++++++++++++------ base/applications/network/net/lang/zh-TW.rc | 130 ++++++++++++++++++++------ base/applications/network/net/resource.h | 111 +++++++++++++--------- 16 files changed, 843 insertions(+), 251 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index ff986f9011..6bade9b574 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -36,6 +36,7 @@ cmdAccounts( if (_wcsicmp(argv[i], L"help") == 0) { /* Print short syntax help */ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); return 0; } @@ -43,7 +44,19 @@ cmdAccounts( if (_wcsicmp(argv[i], L"/help") == 0) { /* Print full help text*/ - ConResPuts(StdOut, IDS_ACCOUNTS_HELP); + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_1); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_2); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_3); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_4); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_5); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_6); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_7); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_8); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_9); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_10); + ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/cmdContinue.c b/base/applications/network/net/cmdContinue.c index d2b3888579..7fa3a934dd 100644 --- a/base/applications/network/net/cmdContinue.c +++ b/base/applications/network/net/cmdContinue.c @@ -19,6 +19,7 @@ INT cmdContinue(INT argc, WCHAR **argv) if (argc != 3) { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); return 1; } @@ -27,7 +28,11 @@ INT cmdContinue(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_CONTINUE_HELP); + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); + ConResPuts(StdOut, IDS_CONTINUE_HELP_1); + ConResPuts(StdOut, IDS_CONTINUE_HELP_2); + ConResPuts(StdOut, IDS_GENERIC_PAGE); return 1; } } diff --git a/base/applications/network/net/cmdHelpMsg.c b/base/applications/network/net/cmdHelpMsg.c index 47a343fc9e..e95da9cc19 100644 --- a/base/applications/network/net/cmdHelpMsg.c +++ b/base/applications/network/net/cmdHelpMsg.c @@ -21,6 +21,7 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (argc < 3) { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_HELPMSG_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index 84bc7d5e92..c70aa1e2e4 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -376,7 +376,10 @@ done: RtlFreeHeap(RtlGetProcessHeap(), 0, lpMembers); if (result != 0) + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); + } return result; } diff --git a/base/applications/network/net/cmdPause.c b/base/applications/network/net/cmdPause.c index a84251ae4a..eb8056ce13 100644 --- a/base/applications/network/net/cmdPause.c +++ b/base/applications/network/net/cmdPause.c @@ -19,6 +19,7 @@ INT cmdPause(INT argc, WCHAR **argv) if (argc != 3) { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_PAUSE_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdStop.c b/base/applications/network/net/cmdStop.c index 6a7db35186..27d2897569 100644 --- a/base/applications/network/net/cmdStop.c +++ b/base/applications/network/net/cmdStop.c @@ -20,6 +20,7 @@ INT cmdStop(INT argc, WCHAR **argv) if (argc != 3) { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_STOP_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index c034bb9c6c..3ee392b6c5 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -624,7 +624,10 @@ done: NetApiBufferFree(pUserInfo); if (result != 0) + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); ConResPuts(StdOut, IDS_USER_SYNTAX); + } return result; } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index ba09babddc..f054c0efab 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -11,44 +11,81 @@ INT cmdHelp(INT argc, WCHAR **argv) { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + +/* if (argc != 3) { ConResPuts(StdOut, IDS_HELP_SYNTAX); return 0; } - +*/ if (_wcsicmp(argv[2], L"ACCOUNTS") == 0) { - ConResPuts(StdOut, IDS_ACCOUNTS_HELP); + ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_1); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_2); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_3); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_4); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_5); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_6); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_7); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_8); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_9); + ConResPuts(StdOut, IDS_ACCOUNTS_HELP_10); + ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } if (_wcsicmp(argv[2], L"COMPUTER") == 0) { - ConResPuts(StdOut, IDS_COMPUTER_HELP); + ConResPuts(StdOut, IDS_COMPUTER_SYNTAX); + ConResPuts(StdOut, IDS_COMPUTER_HELP_1); + ConResPuts(StdOut, IDS_COMPUTER_HELP_2); return 0; } if (_wcsicmp(argv[2], L"CONFIG") == 0) { - ConResPuts(StdOut, IDS_CONFIG_HELP); - return 0; + if ((argc > 3) && (_wcsicmp(argv[3], L"SERVER") == 0)) + { + ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); + ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_1); + ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_2); + ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_3); + ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_4); + ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_5); + ConResPuts(StdOut, IDS_GENERIC_PAGE); + return 0; + } + else + { + ConResPuts(StdOut, IDS_CONFIG_SYNTAX); + ConResPuts(StdOut, IDS_CONFIG_HELP_1); + ConResPuts(StdOut, IDS_CONFIG_HELP_2); + ConResPuts(StdOut, IDS_GENERIC_PAGE); + return 0; + } } if (_wcsicmp(argv[2], L"CONTINUE") == 0) { - ConResPuts(StdOut, IDS_CONTINUE_HELP); + ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); + ConResPuts(StdOut, IDS_CONTINUE_HELP_1); + ConResPuts(StdOut, IDS_CONTINUE_HELP_2); return 0; } if (_wcsicmp(argv[2], L"FILE") == 0) { + ConResPuts(StdOut, IDS_FILE_SYNTAX); ConResPuts(StdOut, IDS_FILE_HELP); return 0; } if (_wcsicmp(argv[2], L"GROUP") == 0) { + ConResPuts(StdOut, IDS_GROUP_SYNTAX); ConResPuts(StdOut, IDS_GROUP_HELP); return 0; } @@ -61,6 +98,7 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"LOCALGROUP") == 0) { + ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); ConResPuts(StdOut, IDS_LOCALGROUP_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 0632d58c04..c2160d6867 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,55 +2,124 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "Usage:\nNET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ - [/UNIQUEPW:Count] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "Usage:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "Usage:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "Usage:\nNET CONTINUE <Service Name>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "Usage:\nNET FILE ..." + [/UNIQUEPW:Count] [/DOMAIN]\n\n" + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE service\n\n" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "Usage:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "Usage:\nNET HELPMSG <Error Code>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Usage:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "Usage:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "Usage:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "Usage:\nNET PAUSE <Service Name>" + IDS_PAUSE_SYNTAX "NET PAUSE <Service Name>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "Usage:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "Usage:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "Usage:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Usage:\nNET START <Service name>" + IDS_START_SYNTAX "NET START <Service name>" IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "Usage:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "Usage:\nNET STOP <Service name>" + IDS_STOP_SYNTAX "NET STOP <Service name>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "Usage:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "Usage:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Usage:\nNET USER [username [password | *] [options]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\ username {password | *} /ADD [options] [/DOMAIN]\n\ username [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "Usage:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "Usage:\nNET HELP <Command>\n - or -\nNET <Command> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <Command>\n - or -\nNET <Command> /HELP\n\n\ The following commands are available:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -61,7 +130,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "Usage:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -119,9 +188,12 @@ BEGIN IDS_GENERIC_NONE "None" IDS_GENERIC_ALL "All" 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" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command got executed successfully.\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index fe3e6ed276..8c59b5f712 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,55 +5,124 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "Uso:\nNET ACCOUNTS [/FORCELOGOFF:{minutos | NO}] [/MINPWLEN:longitud]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{minutos | NO}] [/MINPWLEN:longitud]\n\ [/MAXPWAGE:{días | UNLIMITED}] [/MINPWAGE:días]\n\ - [/UNIQUEPW:número] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "Uso:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "Uso:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "Uso:\nNET CONTINUE <nombre del servicio>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "Uso:\nNET FILE ..." + [/UNIQUEPW:número] [/DOMAIN]\n\n" + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <nombre del servicio>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "Uso:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "Uso:\nNET HELPMSG <código de error>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <código de error>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Uso:\nNET LOCALGROUP [grupo [/COMMENT:""texto""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [grupo [/COMMENT:""texto""]] [/DOMAIN]\n\ grupo {/ADD [/COMMENT:""texto""] | /DELETE} [/DOMAIN]\n\ grupo nombre [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "Uso:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "Uso:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "Uso:\nNET PAUSE <nombre del servicio>" + IDS_PAUSE_SYNTAX "NET PAUSE <nombre del servicio>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "Uso:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "Uso:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "Uso:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Uso:\nNET START ..." + IDS_START_SYNTAX "NET START ..." IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "Uso:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "Uso:\nNET STOP <nombre del servicio>" + IDS_STOP_SYNTAX "NET STOP <nombre del servicio>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "Uso:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "Uso:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Uso:\nNET USER [usuario [contraseña | *] [opciones]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [usuario [contraseña | *] [opciones]] [/DOMAIN]\n\ usuario {contraseña | *} /ADD [opciones] [/DOMAIN]\n\ usuario [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "Uso:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "Uso:\nNET HELP <comando>\n - o -\nNET <comando> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <comando>\n - o -\nNET <comando> /HELP\n\n\ Éstos son los argumentos de línea de comandos disponibles:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -64,7 +133,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "Uso:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -122,9 +191,12 @@ BEGIN IDS_GENERIC_NONE "Ninguno" IDS_GENERIC_ALL "Todos" 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" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command got executed successfully.\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 674cd0af47..ed6b98b40f 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,55 +8,124 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "Utilizare:\nNET ACCOUNTS [/FORCELOGOFF:{Minute|NO}] [/MINPWLEN:Lungime]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minute|NO}] [/MINPWLEN:Lungime]\n\ [/MAXPWAGE:{Zile|UNLIMITED}] [/MINPWAGE:Zile]\n\ [/UNIQUEPW:Număr] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "Utilizare:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "Utilizare:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "Utilizare:\nNET CONTINUE <nume serviciu>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "Utilizare:\nNET FILE ..." + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <nume serviciu>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "Utilizare:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "Utilizare:\nNET HELPMSG <Error Code>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ nume-de-grup {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "Utilizare:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "Utilizare:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "Utilizare:\nNET PAUSE <nume serviciu>" + IDS_PAUSE_SYNTAX "NET PAUSE <nume serviciu>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "Utilizare:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "Utilizare:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "Utilizare:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Utilizare:\nNET START ..." + IDS_START_SYNTAX "NET START ..." IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "Utilizare:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "Utilizare:\nNET STOP <nume serviciu>" + IDS_STOP_SYNTAX "NET STOP <nume serviciu>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "Utilizare:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "Utilizare:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Utilizare:\nNET USER [nume-utilizator [parolă | *] [opțiuni]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [nume-utilizator [parolă | *] [opțiuni]] [/DOMAIN]\n\ nume-utilizator {parolă | *} /ADD [opțiuni] [/DOMAIN]\n\ nume-utilizator [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "Utilizare:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "Utilizare:\nNET HELP <comandă>\n - sau -\nNET <comandă> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <comandă>\n - sau -\nNET <comandă> /HELP\n\n\ Sunt disponibile următoarele comenzi:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -67,7 +136,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "Utilizare:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -125,9 +194,12 @@ BEGIN IDS_GENERIC_NONE "Nespecificat" IDS_GENERIC_ALL "Toate" IDS_GENERIC_LOCKED "Blocat" + 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 "Opțiunea %s încă nu este admisă.\n" IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n" IDS_ERROR_SYSTEM_ERROR "A survenit eroarea de sistem %d.\n" - IDS_ERROR_NO_ERROR "Comanda a fost executată cu succes.\n" + IDS_ERROR_NO_ERROR "Comanda a fost executată cu succes.\n\n\n" END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 937f79a86d..98db6e612b 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,55 +4,124 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "Использование:\nNET ACCOUNTS [/FORCELOGOFF:{минуты | NO}] [/MINPWLEN:длина]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{минуты | NO}] [/MINPWLEN:длина]\n\ [/MAXPWAGE:{дни | UNLIMITED}] [/MINPWAGE:дни]\n\ [/UNIQUEPW:число] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "Использование:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "Использование:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "Использование:\nNET CONTINUE <имя_службы>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "Использование:\nNET FILE ..." + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <имя_службы>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "Использование:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "Использование:\nNET HELPMSG <Код ошибки>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <Код ошибки>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Использование:\nNET LOCALGROUP [имя_группы [/COMMENT:""текст""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [имя_группы [/COMMENT:""текст""]] [/DOMAIN]\n\ имя_группы {/ADD [/COMMENT:""текст""] | /DELETE} [/DOMAIN]\n\ имя_группы имя [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "Использование:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "Использование:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "Использование:\nNET PAUSE <имя_службы>" + IDS_PAUSE_SYNTAX "NET PAUSE <имя_службы>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "Использование:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "Использование:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "Использование:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Использование:\nNET START ..." + IDS_START_SYNTAX "NET START ..." IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "Использование:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "Использование:\nNET STOP <имя_службы>" + IDS_STOP_SYNTAX "NET STOP <имя_службы>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "Использование:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "Использование:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Использование:\nNET USER [имя_пользователя [пароль | *] [параметры]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [имя_пользователя [пароль | *] [параметры]] [/DOMAIN]\n\ имя_пользователя {пароль | *} /ADD [параметры] [/DOMAIN]\n\ имя_пользователя [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "Использование:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "Использование:\nNET HELP <Команда>\n - или -\nNET <Команда> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <Команда>\n - или -\nNET <Команда> /HELP\n\n\ Доступны следующие команды:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -63,7 +132,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "Использование:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -121,9 +190,12 @@ BEGIN IDS_GENERIC_NONE "Нет" IDS_GENERIC_ALL "Все" 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" IDS_ERROR_SYSTEM_ERROR "Произошла системная ошибка: %d.\n" - IDS_ERROR_NO_ERROR "Команда успешно выполнена.\n" + IDS_ERROR_NO_ERROR "Команда успешно выполнена.\n\n\n" END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 4deb893fd9..ec3ddebc7f 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,55 +4,124 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "Kullanım:\nNET ACCOUNTS [/FORCELOGOFF:{Dakîka|NO}] [/MINPWLEN:Uzunluk]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Dakîka|NO}] [/MINPWLEN:Uzunluk]\n\ [/MAXPWAGE:{Gün|UNLIMITED}] [/MINPWAGE:Gün]\n\ [/UNIQUEPW:Sayı] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "Kullanım:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "Kullanım:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "Kullanım:\nNET CONTINUE <Hizmet Adı>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "Kullanım:\nNET FILE ..." + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <Hizmet Adı>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "Kullanım:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "Kullanım:\nNET HELPMSG <Yanlışlık Kodu>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <Yanlışlık Kodu>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Kullanım:\nNET LOCALGROUP [takım adı [/COMMENT:""metin""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [takım adı [/COMMENT:""metin""]] [/DOMAIN]\n\ takım adı {/ADD [/COMMENT:""metin""] | /DELETE} [/DOMAIN]\n\ takım adı ad [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "Kullanım:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "Kullanım:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "Kullanım:\nNET PAUSE <Hizmet Adı>" + IDS_PAUSE_SYNTAX "NET PAUSE <Hizmet Adı>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "Kullanım:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "Kullanım:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "Kullanım:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Kullanım:\nNET START <Hizmet Adı>" + IDS_START_SYNTAX "NET START <Hizmet Adı>" IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "Kullanım:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "Kullanım:\nNET STOP <Hizmet Adı>" + IDS_STOP_SYNTAX "NET STOP <Hizmet Adı>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "Kullanım:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "Kullanım:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Kullanım:\nNET USER [kullanıcı adı [şifre | *] [seçenekler]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [kullanıcı adı [şifre | *] [seçenekler]] [/DOMAIN]\n\ kullanıcı adı {şifre | *} /ADD [seçenekler] [/DOMAIN]\n\ kullanıcı adı [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "Kullanım:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "Kullanım:\nNET HELP <Komut>\n - ya da -\nNET <Komut> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <Komut>\n - ya da -\nNET <Komut> /HELP\n\n\ Aşağıdaki komutlar kullanılabilir:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -63,7 +132,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "Kullanım:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -121,9 +190,12 @@ BEGIN IDS_GENERIC_NONE "Yok" IDS_GENERIC_ALL "Tümü" 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" IDS_ERROR_SYSTEM_ERROR "%d dizge hatâsı oldu.\n" - IDS_ERROR_NO_ERROR "Komut başarılı bir şekilde çalıştırıldı.\n" + IDS_ERROR_NO_ERROR "Komut başarılı bir şekilde çalıştırıldı.\n\n\n" END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 41c14c3c5b..6b6adab3e2 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,55 +4,124 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "用法:\nNET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ [/UNIQUEPW:Count] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "用法:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "用法:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "用法:\nNET CONTINUE <Service Name>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "用法:\nNET FILE ..." + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <Service Name>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "用法:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "用法:\nNET HELPMSG <Error Code>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "用法:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "用法:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "用法:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "用法:\nNET PAUSE <Service Name>" + IDS_PAUSE_SYNTAX "NET PAUSE <Service Name>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "用法:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "用法:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "用法:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "用法:\nNET START <Service name>" + IDS_START_SYNTAX "NET START <Service name>" IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "用法:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "用法:\nNET STOP <Service name>" + IDS_STOP_SYNTAX "NET STOP <Service name>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "用法:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "用法:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "用法:\nNET USER [username [password | *] [options]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\ username {password | *} /ADD [options] [/DOMAIN]\n\ username [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "用法:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "用法:\nNET HELP <Command>\n - or -\nNET <Command> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <Command>\n - or -\nNET <Command> /HELP\n\n\ 以下命令可用:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -63,7 +132,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "用法:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -121,9 +190,12 @@ BEGIN IDS_GENERIC_NONE "无" IDS_GENERIC_ALL "所有" 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" IDS_ERROR_SYSTEM_ERROR "发生了系统错误 %d。\n" - IDS_ERROR_NO_ERROR "命令执行成功。\n" + IDS_ERROR_NO_ERROR "命令执行成功。\n\n\n" END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 3a6ba77613..df68b2e34c 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,55 +4,124 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "使用方法:\nNET ACCOUNTS [/FORCELOGOFF:{分鐘|NO}] [/MINPWLEN:長度]\n\ + IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{分鐘|NO}] [/MINPWLEN:長度]\n\ [/MAXPWAGE:{天|UNLIMITED}] [/MINPWAGE:天]\n\ - [/UNIQUEPW:計數] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\n..." - IDS_COMPUTER_SYNTAX "使用方法:\nNET COMPUTER ..." - IDS_COMPUTER_HELP "COMPUTER\n..." - IDS_CONFIG_SYNTAX "使用方法:\nNET CONFIG ..." - IDS_CONFIG_HELP "CONFIG\n..." - IDS_CONTINUE_SYNTAX "使用方法:\nNET CONTINUE <服務名稱>" - IDS_CONTINUE_HELP "CONTINUE\n..." - IDS_FILE_SYNTAX "使用方法:\nNET FILE ..." + [/UNIQUEPW:計數] [/DOMAIN]\n\n" + IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ +and logon requirements for all accounts.\n\ +When used without parameters, NET ACCOUNTS displays the current settings for\n\ +passwords, logon limitations, and domain information.\n\n" + IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ +NET ACCOUNTS to take effect.\n\n" + IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ + accounts havebeen set up (user User Manager or the NET USER command).\n\n" + IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ + that verify logon. Net Logon is started autmatically when the\n\ + operating system starts.\n\n" + IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ + being forced to log off when the\n\ + account expires or valid logon hours expire.\n\ + NO, the default, prevents forced logoff.\n" + IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ + a password. The range is 0-14 characters;\n\ + the default is 6 characters.\n" + IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ + password is valid. No limit is specified\n\ + by using UNLIMITED. /MAXPWAGE cannot be less\n\ + than /MINPWAGE. The range is 1-999; the\n\ + default is to leave the value unchanged.\n" + IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ + pass before a user can change a password.\n\ + A value of 0 sets no minimum time. The range\n\ + is 0-999; the default is 0 days. /MINPWAGE\n\ + cannot be more than /MAXPWAGE.\n" + IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ + through the specified number of password\n\ + changes. The maximum value is 24.\n" + IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ + controller of the current domain. Otherwise,\n\ + the operation is performed on the local\n\ + computer.\n\n" + IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" + IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ +command is available only on server operating systems.\n\n" + IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ + the domain.\n\ +/ADD Adds the specified computer to the domain.\n\ +/DEL Removes the specified computer from the domain.\n\n" + IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" + IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ +Server service. When used without the WORKSTATION or SERVER switch,\n\ +it displays a list of configurable services. To get help with\n\ +configuring a service, type NET HELP CONFIG service.\n\n" + IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ + Server service.\n\ +WORKSTATION Displays information about the configuration of the\n\ + Workstation service.\n\n" + IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ + [/HIDDEN:{YES | NO}]\n\n" + IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" + IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ + session can be inactive before it is disconected.\n\ + You can specify -1 to never disconnect. The range\n\ + is -1-65535 minutes; the default is 15.\n" + IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ + screen and with the NET VIEW command.\n\ + Enclose the text in quotation marks.\n" + IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ + appears on displays listings of servers. Note that\n\ + hiding a serverdoes not alter the permissions\n\ + on that server. The default is NO.\n\n" + IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ +type NET CONFIG SERVER without parameters.\n\n" + IDS_CONTINUE_SYNTAX "NET CONTINUE <服務名稱>" + IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" + IDS_CONTINUE_HELP_2 "service Is the paused service\n\ + For example, one of the following:\n\ + NET LOGON\n\ + NT LM SECURITY SUPPORT PROVIDER\n\ + SCHEDULE\n\ + SERVER\n\ + WORKSTATION\n\n" + IDS_FILE_SYNTAX "NET FILE ..." IDS_FILE_HELP "FILE\n..." - IDS_GROUP_SYNTAX "使用方法:\nNET GROUP ..." + IDS_GROUP_SYNTAX "NET GROUP ..." IDS_GROUP_HELP "GROUP\n..." - IDS_HELPMSG_SYNTAX "使用方法:\nNET HELPMSG <錯誤程式碼>" + IDS_HELPMSG_SYNTAX "NET HELPMSG <錯誤程式碼>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "使用方法:\nNET LOCALGROUP [組名 [/COMMENT:""文字""]] [/DOMAIN]\n\ + IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [組名 [/COMMENT:""文字""]] [/DOMAIN]\n\ 組名 {/ADD [/COMMENT:""文字""] | /DELETE} [/DOMAIN]\n\ 組名稱 [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." - IDS_NAME_SYNTAX "使用方法:\nNET NAME ..." + IDS_NAME_SYNTAX "NET NAME ..." IDS_NAME_HELP "NAME\n..." - IDS_PRINT_SYNTAX "使用方法:\nNET PRINT ..." + IDS_PRINT_SYNTAX "NET PRINT ..." IDS_PRINT_HELP "PRINT\n..." - IDS_PAUSE_SYNTAX "使用方法:\nNET PAUSE <服務名稱>" + IDS_PAUSE_SYNTAX "NET PAUSE <服務名稱>" IDS_PAUSE_HELP "PAUSE\n..." - IDS_SEND_SYNTAX "使用方法:\nNET SEND ..." + IDS_SEND_SYNTAX "NET SEND ..." IDS_SEND_HELP "SEND\n..." - IDS_SESSION_SYNTAX "使用方法:\nNET SESSION ..." + IDS_SESSION_SYNTAX "NET SESSION ..." IDS_SESSION_HELP "SESSION\n..." - IDS_SHARE_SYNTAX "使用方法:\nNET SHARE ..." + IDS_SHARE_SYNTAX "NET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "使用方法:\nNET START <服務名稱>" + IDS_START_SYNTAX "NET START <服務名稱>" IDS_START_HELP "START\n..." - IDS_STATISTICS_SYNTAX "使用方法:\nNET STATISTICS ..." + IDS_STATISTICS_SYNTAX "NET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." - IDS_STOP_SYNTAX "使用方法:\nNET STOP <服務名稱>" + IDS_STOP_SYNTAX "NET STOP <服務名稱>" IDS_STOP_HELP "STOP\n..." - IDS_TIME_SYNTAX "使用方法:\nNET TIME ..." + IDS_TIME_SYNTAX "NET TIME ..." IDS_TIME_HELP "TIME\n..." - IDS_USE_SYNTAX "使用方法:\nNET USE ..." + IDS_USE_SYNTAX "NET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "使用方法:\nNET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN]\n\ + IDS_USER_SYNTAX "NET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN]\n\ 使用者名 {密碼 | *} /ADD [選項] [/DOMAIN]\n\ 使用者名 [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." - IDS_VIEW_SYNTAX "使用方法:\nNET VIEW ..." + IDS_VIEW_SYNTAX "NET VIEW ..." IDS_VIEW_HELP "VIEW\n..." - IDS_HELP_SYNTAX "使用方法:\nNET HELP <命令>\n - 或 -\nNET <命令> /HELP\n\n\ + IDS_HELP_SYNTAX "NET HELP <命令>\n - 或 -\nNET <命令> /HELP\n\n\ 以下命令是可用的:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ NET COMPUTER NET HELPMSG NET START\n\ @@ -63,7 +132,7 @@ BEGIN NET FILE NET SEND NET USER\n\ NET GROUP NET SESSION NET VIEW\n\n\ ..." - IDS_NET_SYNTAX "使用方法:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" @@ -121,9 +190,12 @@ BEGIN IDS_GENERIC_NONE "無" IDS_GENERIC_ALL "所有" 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" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command got executed successfully.\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" END diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index ebe658898e..3d00b0da60 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,49 +1,69 @@ #pragma once -#define IDS_ACCOUNTS_SYNTAX 100 -#define IDS_ACCOUNTS_HELP 101 -#define IDS_COMPUTER_SYNTAX 102 -#define IDS_COMPUTER_HELP 103 -#define IDS_CONFIG_SYNTAX 104 -#define IDS_CONFIG_HELP 105 -#define IDS_CONTINUE_SYNTAX 106 -#define IDS_CONTINUE_HELP 107 -#define IDS_FILE_SYNTAX 108 -#define IDS_FILE_HELP 109 -#define IDS_GROUP_SYNTAX 110 -#define IDS_GROUP_HELP 111 -#define IDS_HELPMSG_SYNTAX 112 -#define IDS_HELPMSG_HELP 113 -#define IDS_LOCALGROUP_SYNTAX 114 -#define IDS_LOCALGROUP_HELP 115 -#define IDS_NAME_SYNTAX 116 -#define IDS_NAME_HELP 117 -#define IDS_PAUSE_SYNTAX 118 -#define IDS_PAUSE_HELP 119 -#define IDS_PRINT_SYNTAX 120 -#define IDS_PRINT_HELP 121 -#define IDS_SEND_SYNTAX 122 -#define IDS_SEND_HELP 123 -#define IDS_SESSION_SYNTAX 124 -#define IDS_SESSION_HELP 125 -#define IDS_SHARE_SYNTAX 126 -#define IDS_SHARE_HELP 127 -#define IDS_START_SYNTAX 128 -#define IDS_START_HELP 129 -#define IDS_STATISTICS_SYNTAX 130 -#define IDS_STATISTICS_HELP 131 -#define IDS_STOP_SYNTAX 132 -#define IDS_STOP_HELP 133 -#define IDS_TIME_SYNTAX 134 -#define IDS_TIME_HELP 135 -#define IDS_USE_SYNTAX 136 -#define IDS_USE_HELP 137 -#define IDS_USER_SYNTAX 138 -#define IDS_USER_HELP 139 -#define IDS_VIEW_SYNTAX 140 -#define IDS_VIEW_HELP 141 -#define IDS_HELP_SYNTAX 142 -#define IDS_NET_SYNTAX 143 +#define IDS_ACCOUNTS_SYNTAX 100 +#define IDS_ACCOUNTS_HELP_1 101 +#define IDS_ACCOUNTS_HELP_2 102 +#define IDS_ACCOUNTS_HELP_3 103 +#define IDS_ACCOUNTS_HELP_4 104 +#define IDS_ACCOUNTS_HELP_5 105 +#define IDS_ACCOUNTS_HELP_6 106 +#define IDS_ACCOUNTS_HELP_7 107 +#define IDS_ACCOUNTS_HELP_8 108 +#define IDS_ACCOUNTS_HELP_9 109 +#define IDS_ACCOUNTS_HELP_10 110 +#define IDS_COMPUTER_SYNTAX 111 +#define IDS_COMPUTER_HELP_1 112 +#define IDS_COMPUTER_HELP_2 113 +#define IDS_CONFIG_SYNTAX 114 +#define IDS_CONFIG_HELP_1 115 +#define IDS_CONFIG_HELP_2 116 +#define IDS_CONFIG_SERVER_SYNTAX 117 +#define IDS_CONFIG_SERVER_HELP_1 118 +#define IDS_CONFIG_SERVER_HELP_2 119 +#define IDS_CONFIG_SERVER_HELP_3 120 +#define IDS_CONFIG_SERVER_HELP_4 121 +#define IDS_CONFIG_SERVER_HELP_5 122 +#define IDS_CONTINUE_SYNTAX 123 +#define IDS_CONTINUE_HELP_1 124 +#define IDS_CONTINUE_HELP_2 125 + +#define IDS_FILE_SYNTAX 126 +#define IDS_FILE_HELP 127 + +#define IDS_GROUP_SYNTAX 132 +#define IDS_GROUP_HELP 133 +#define IDS_HELPMSG_SYNTAX 134 +#define IDS_HELPMSG_HELP 135 +#define IDS_LOCALGROUP_SYNTAX 136 +#define IDS_LOCALGROUP_HELP 137 +#define IDS_NAME_SYNTAX 138 +#define IDS_NAME_HELP 139 +#define IDS_PAUSE_SYNTAX 140 +#define IDS_PAUSE_HELP 141 +#define IDS_PRINT_SYNTAX 142 +#define IDS_PRINT_HELP 143 +#define IDS_SEND_SYNTAX 144 +#define IDS_SEND_HELP 145 +#define IDS_SESSION_SYNTAX 146 +#define IDS_SESSION_HELP 147 +#define IDS_SHARE_SYNTAX 148 +#define IDS_SHARE_HELP 149 +#define IDS_START_SYNTAX 150 +#define IDS_START_HELP 151 +#define IDS_STATISTICS_SYNTAX 152 +#define IDS_STATISTICS_HELP 153 +#define IDS_STOP_SYNTAX 154 +#define IDS_STOP_HELP 155 +#define IDS_TIME_SYNTAX 156 +#define IDS_TIME_HELP 157 +#define IDS_USE_SYNTAX 158 +#define IDS_USE_HELP 159 +#define IDS_USER_SYNTAX 160 +#define IDS_USER_HELP 161 +#define IDS_VIEW_SYNTAX 162 +#define IDS_VIEW_HELP 163 +#define IDS_HELP_SYNTAX 164 +#define IDS_NET_SYNTAX 165 #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201 @@ -99,6 +119,9 @@ #define IDS_GENERIC_NONE 603 #define IDS_GENERIC_ALL 604 #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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018