Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 31743: - Activate all languages
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 20:41:59 2008 New Revision: 31743 URL: http://svn.reactos.org/svn/reactos?rev=31743&view=rev Log: - Activate all languages Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Jan 12 20:41:59 2008 @@ -100,23 +100,23 @@ [Language] 00000402 = "Bulgarian" -;00000403 = "Catalan" -;00000406 = "Danish" -;00000813 = "Dutch" +00000403 = "Catalan" +00000406 = "Danish" +00000413 = "Dutch" 00000409 = "English" -;0000040B = "Finnish" +0000040B = "Finnish" 0000040C = "French" 00000407 = "German" 00000408 = "Greek" -;0000040D = "Hebrew" -;0000040E = "Hungarian" +0000040D = "Hebrew" +0000040E = "Hungarian" 00000410 = "Italian" -;00000411 = "Japanese" -;00000414 = "Norwegian" +00000411 = "Japanese" +00000414 = "Norwegian" 00000415 = "Polish" -;00000816 = "Portuguese" +00000816 = "Portuguese" 00000419 = "Russian" -;0000041B = "Slovak" +0000041B = "Slovak" 0000040A = "Spanish" 0000041D = "Swedish" 00000422 = "Ukrainian"

1 0

[dchapyshev] 31742: - Add more languages (not translated)
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 20:40:38 2008 New Revision: 31742 URL: http://svn.reactos.org/svn/reactos?rev=31742&view=rev Log: - Add more languages (not translated) Added: trunk/reactos/base/setup/usetup/lang/ca-ES.h (with props) trunk/reactos/base/setup/usetup/lang/da-DK.h (with props) trunk/reactos/base/setup/usetup/lang/fi-FI.h (with props) trunk/reactos/base/setup/usetup/lang/he-IL.h (with props) trunk/reactos/base/setup/usetup/lang/hu-HU.h (with props) trunk/reactos/base/setup/usetup/lang/ja-JP.h (with props) trunk/reactos/base/setup/usetup/lang/nb-NO.h (with props) trunk/reactos/base/setup/usetup/lang/nl-NL.h (with props) trunk/reactos/base/setup/usetup/lang/pt-PT.h (with props) trunk/reactos/base/setup/usetup/lang/sk-SK.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/setup/usetup/lang/ca-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ca-… Added: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… Added: trunk/reactos/base/setup/usetup/lang/fi-FI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fi-… Added: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… Added: trunk/reactos/base/setup/usetup/lang/hu-HU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/hu-… Added: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… Added: trunk/reactos/base/setup/usetup/lang/nb-NO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nb-… Added: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… Added: trunk/reactos/base/setup/usetup/lang/pt-PT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… Added: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re…

1 0

[hpoussin] 31740: [FORMATTING] Fix indentation
by hpoussin＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: hpoussin Date: Sat Jan 12 20:20:11 2008 New Revision: 31740 URL: http://svn.reactos.org/svn/reactos?rev=31740&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/vfat/cleanup.c Sat Jan 12 20:20:11 2008 @@ -13,145 +13,146 @@ /* FUNCTIONS ****************************************************************/ -static NTSTATUS -VfatCleanupFile(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Cleans up after a file has been closed. */ +static NTSTATUS +VfatCleanupFile(PVFAT_IRP_CONTEXT IrpContext) { - PVFATFCB pFcb; - PFILE_OBJECT FileObject = IrpContext->FileObject; + PVFATFCB pFcb; + PFILE_OBJECT FileObject = IrpContext->FileObject; - DPRINT("VfatCleanupFile(DeviceExt %p, FileObject %p)\n", - IrpContext->DeviceExt, FileObject); + DPRINT("VfatCleanupFile(DeviceExt %p, FileObject %p)\n", + IrpContext->DeviceExt, FileObject); - /* FIXME: handle file/directory deletion here */ - pFcb = (PVFATFCB) FileObject->FsContext; - if (pFcb) + /* FIXME: handle file/directory deletion here */ + pFcb = (PVFATFCB) FileObject->FsContext; + if (!pFcb) + return STATUS_SUCCESS; + + if (pFcb->Flags & FCB_IS_VOLUME) { - if (pFcb->Flags & FCB_IS_VOLUME) + pFcb->OpenHandleCount--; + + if (pFcb->OpenHandleCount != 0) { - pFcb->OpenHandleCount--; + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + } + else + { + if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + return STATUS_PENDING; + } + if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + ExReleaseResourceLite (&pFcb->MainResource); + return STATUS_PENDING; + } - if (pFcb->OpenHandleCount != 0) + pFcb->OpenHandleCount--; + + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) + { + /* remove all locks this process have on this file */ + FsRtlFastUnlockAll(&pFcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } + + if (pFcb->Flags & FCB_IS_DIRTY) + { + VfatUpdateEntry (pFcb); + } + + if (pFcb->Flags & FCB_DELETE_PENDING && + pFcb->OpenHandleCount == 1) + { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFcb->FileObject; + if (tmpFileObject != NULL) { - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); - } - } - else - { - if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - return STATUS_PENDING; - } - if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - ExReleaseResourceLite (&pFcb->MainResource); - return STATUS_PENDING; - } - - pFcb->OpenHandleCount--; - - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && - FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) - { - /* remove all locks this process have on this file */ - FsRtlFastUnlockAll(&pFcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } - - if (pFcb->Flags & FCB_IS_DIRTY) - { - VfatUpdateEntry (pFcb); - } - - if (pFcb->Flags & FCB_DELETE_PENDING && - pFcb->OpenHandleCount == 1) - { - PFILE_OBJECT tmpFileObject; - tmpFileObject = pFcb->FileObject; - if (tmpFileObject != NULL) - { - pFcb->FileObject = NULL; + pFcb->FileObject = NULL; #ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(tmpFileObject); + CcRosReleaseFileCache(tmpFileObject); #else - CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); #endif - ObDereferenceObject(tmpFileObject); + ObDereferenceObject(tmpFileObject); } #if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ - CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); + /* FIXME: + * CcPurgeCacheSection is unimplemented. + */ + CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); #endif - } - /* Uninitialize file cache if. */ + } + /* Uninitialize file cache if. */ #ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); + CcRosReleaseFileCache (FileObject); #else - if (FileObject->SectionObjectPointer->SharedCacheMap) - { - CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); - } + if (FileObject->SectionObjectPointer->SharedCacheMap) + { + CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + } #endif - if (pFcb->OpenHandleCount != 0) - { - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); - } + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } - FileObject->Flags |= FO_CLEANUP_COMPLETE; + FileObject->Flags |= FO_CLEANUP_COMPLETE; - ExReleaseResourceLite (&pFcb->PagingIoResource); - ExReleaseResourceLite (&pFcb->MainResource); - } + ExReleaseResourceLite (&pFcb->PagingIoResource); + ExReleaseResourceLite (&pFcb->MainResource); } - return STATUS_SUCCESS; + + return STATUS_SUCCESS; } -NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Cleans up after a file has been closed. */ +NTSTATUS VfatCleanup(PVFAT_IRP_CONTEXT IrpContext) { - NTSTATUS Status; + NTSTATUS Status; - DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); - if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) - { - Status = STATUS_SUCCESS; - goto ByeBye; - } + if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) + { + Status = STATUS_SUCCESS; + goto ByeBye; + } - if (!ExAcquireResourceExclusiveLite (&IrpContext->DeviceExt->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - return VfatQueueRequest (IrpContext); - } + if (!ExAcquireResourceExclusiveLite (&IrpContext->DeviceExt->DirResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + return VfatQueueRequest (IrpContext); + } - Status = VfatCleanupFile(IrpContext); + Status = VfatCleanupFile(IrpContext); - ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); + ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); - if (Status == STATUS_PENDING) - { - return VfatQueueRequest(IrpContext); - } + if (Status == STATUS_PENDING) + { + return VfatQueueRequest(IrpContext); + } ByeBye: - IrpContext->Irp->IoStatus.Status = Status; - IrpContext->Irp->IoStatus.Information = 0; + IrpContext->Irp->IoStatus.Status = Status; + IrpContext->Irp->IoStatus.Information = 0; - IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return (Status); + IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); + VfatFreeIrpContext(IrpContext); + return (Status); } /* EOF */

1 0

[akorotaev] 31739: - Call ObReferenceObjectByHandle with AccessMode == KernelMode - The branch now seems to be fully merged with trunk, and works as it did for 0.3.1
by akorotaev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: akorotaev Date: Sat Jan 12 19:12:42 2008 New Revision: 31739 URL: http://svn.reactos.org/svn/reactos?rev=31739&view=rev Log: - Call ObReferenceObjectByHandle with AccessMode == KernelMode - The branch now seems to be fully merged with trunk, and works as it did for 0.3.1 Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jan 12 19:12:42 2008 @@ -6105,7 +6105,7 @@ Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, - UserMode, + KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status))

1 0

[fireball] 31738: - Fix build.
by fireball＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: fireball Date: Sat Jan 12 18:38:35 2008 New Revision: 31738 URL: http://svn.reactos.org/svn/reactos?rev=31738&view=rev Log: - Fix build. Modified: trunk/reactos/drivers/filesystems/vfat/misc.c Modified: trunk/reactos/drivers/filesystems/vfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/m… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/misc.c (original) +++ trunk/reactos/drivers/filesystems/vfat/misc.c Sat Jan 12 18:38:35 2008 @@ -158,7 +158,7 @@ { if (KeGetCurrentIrql() > PASSIVE_LEVEL) { - DPRINT1("Vfat is entered at irql = %d\n", Irql); + DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql()); } FsRtlEnterFileSystem();

1 0

[dchapyshev] 31737: - Activate Bulgarian translation for usetup - Fix formatting
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 18:26:57 2008 New Revision: 31737 URL: http://svn.reactos.org/svn/reactos?rev=31737&view=rev Log: - Activate Bulgarian translation for usetup - Fix formatting Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Jan 12 18:26:57 2008 @@ -98,27 +98,28 @@ [Keyboard] Default = "XT-, AT- or extended keyboard (83-105 keys)" -[Language] -;00000403 = "Catalan" -;00000406 = "Danish" -;00000813 = "Dutch" -00000409 = "English" -;0000040B = "Finnish" -0000040C = "French" -00000407 = "German" +[Language] +00000402 = "Bulgarian" +;00000403 = "Catalan" +;00000406 = "Danish" +;00000813 = "Dutch" +00000409 = "English" +;0000040B = "Finnish" +0000040C = "French" +00000407 = "German" 00000408 = "Greek" -;0000040D = "Hebrew" -;0000040E = "Hungarian" -00000410 = "Italian" -;00000411 = "Japanese" -;00000414 = "Norwegian" -00000415 = "Polish" -;00000816 = "Portuguese" +;0000040D = "Hebrew" +;0000040E = "Hungarian" +00000410 = "Italian" +;00000411 = "Japanese" +;00000414 = "Norwegian" +00000415 = "Polish" +;00000816 = "Portuguese" 00000419 = "Russian" -;0000041B = "Slovak" -0000040A = "Spanish" +;0000041B = "Slovak" +0000040A = "Spanish" 0000041D = "Swedish" -00000422 = "Ukrainian" +00000422 = "Ukrainian" [KeyboardLayout]

1 0

[fireball] 31736: - Add missing critical region acquiring to the VfatShutdown routine. - Remove that irql <= PASSIVE_LEVEL check, always entering the critical region. And for vfat calls with an unusual high irql leave a DPRINT.
by fireball＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: fireball Date: Sat Jan 12 18:20:22 2008 New Revision: 31736 URL: http://svn.reactos.org/svn/reactos?rev=31736&view=rev Log: - Add missing critical region acquiring to the VfatShutdown routine. - Remove that irql <= PASSIVE_LEVEL check, always entering the critical region. And for vfat calls with an unusual high irql leave a DPRINT. Modified: trunk/reactos/drivers/filesystems/vfat/misc.c trunk/reactos/drivers/filesystems/vfat/shutdown.c Modified: trunk/reactos/drivers/filesystems/vfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/m… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/misc.c (original) +++ trunk/reactos/drivers/filesystems/vfat/misc.c Sat Jan 12 18:20:22 2008 @@ -142,7 +142,6 @@ { NTSTATUS Status; PVFAT_IRP_CONTEXT IrpContext; - KIRQL Irql; DPRINT ("VfatBuildRequest (DeviceObject %p, Irp %p)\n", DeviceObject, Irp); @@ -157,22 +156,14 @@ } else { - Irql = KeGetCurrentIrql(); - if (Irql <= PASSIVE_LEVEL) - { - FsRtlEnterFileSystem(); - } - else + if (KeGetCurrentIrql() > PASSIVE_LEVEL) { DPRINT1("Vfat is entered at irql = %d\n", Irql); } + + FsRtlEnterFileSystem(); Status = VfatDispatchRequest (IrpContext); - - if (Irql <= PASSIVE_LEVEL) - { - FsRtlExitFileSystem(); - } - + FsRtlExitFileSystem(); } return Status; } Modified: trunk/reactos/drivers/filesystems/vfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/s… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/shutdown.c (original) +++ trunk/reactos/drivers/filesystems/vfat/shutdown.c Sat Jan 12 18:20:22 2008 @@ -50,6 +50,8 @@ ULONG eocMark; DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n",DeviceObject, Irp); + + FsRtlEnterFileSystem(); /* FIXME: block new mount requests */ @@ -108,6 +110,8 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + FsRtlExitFileSystem(); + return(Status); }

1 0

[dchapyshev] 31735: - Fix formatting
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 18:14:54 2008 New Revision: 31735 URL: http://svn.reactos.org/svn/reactos?rev=31735&view=rev Log: - Fix formatting Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=31… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sat Jan 12 18:14:54 2008 @@ -31,30 +31,6 @@ HWND hLanguageList; -/*struct LangAndLayout -{ - TCHAR Lang; - TCHAR Layout; - TCHAR SubLayout; -} VarLang[133]; - -char *SubLang[133] = {} - -VOID CreateLangStruct(VOID) -{ - UINT Count; - TCHAR Layout[256]; - - for(Count = 0; Count < END_LAYOUT - BEGIN_LAYOUT; Count++) - { - LoadString(hApplet, - Count, - Layout, - sizeof(Layout) / sizeof(TCHAR)); - strcpy(VarLang[Count].Layout,Layout); - } -}*/ - /* Language enumerate procedure */ BOOL CALLBACK @@ -85,7 +61,6 @@ VOID CreateLanguagesList(HWND hWnd) { - //TCHAR LangSel[256]; hLanguageList = hWnd; EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); Modified: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (original) +++ trunk/reactos/dll/cpl/input/advanced.c Sat Jan 12 18:14:54 2008 @@ -74,7 +74,7 @@ dwValue = 0x1; else dwValue = 0x0; - RegSetValueEx(hKey, + RegSetValueEx(hKey, L"Disable Thread Input Manager", 0, REG_DWORD, @@ -117,12 +117,12 @@ if (SendDlgItemMessage(hwndDlg, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED) { EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),FALSE); } else { EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),TRUE); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sat Jan 12 18:14:54 2008 @@ -262,8 +262,8 @@ case WM_INITDIALOG: { InitLangList(hwndDlg); - EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); } break; case WM_NOTIFY: @@ -285,7 +285,7 @@ break; } } - break; + break; case WM_COMMAND: switch (LOWORD(wParam)) {

1 0

[dchapyshev] 31734: - Add "Computer Name Changes" and "DNS Suffix and NetBIOS Computer Name" dialogs - Add more strings - Add more icons
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 18:11:44 2008 New Revision: 31734 URL: http://svn.reactos.org/svn/reactos?rev=31734&view=rev Log: - Add "Computer Name Changes" and "DNS Suffix and NetBIOS Computer Name" dialogs - Add more strings - Add more icons Added: trunk/reactos/dll/win32/netid/res/101.ico (with props) trunk/reactos/dll/win32/netid/res/102.ico (with props) trunk/reactos/dll/win32/netid/rsrc.rc (with props) Removed: trunk/reactos/dll/win32/netid/res/netid.ico Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/el-GR.rc trunk/reactos/dll/win32/netid/lang/en-US.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/id-ID.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/netid/lang/uk-UA.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/netid/resource.h Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc Sat Jan 12 18:11:44 2008 @@ -28,3 +28,55 @@ LTEXT "Bitte beachten: Nur Administratoren können die Identifikation dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/netid/lang/el-GR.rc Sat Jan 12 18:11:44 2008 @@ -20,3 +20,55 @@ LTEXT "Óçìåßùóç: Ìüíï ïé äéá÷åéñéóôÝò óõóôÞìáôïò ìðïñïýí íá áëëÜîïõí ôï áíáãíùñéóôéêü áõôïý ôïõ õðïëïãéóôÞ.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/netid/lang/en-US.rc Sat Jan 12 18:11:44 2008 @@ -3,7 +3,7 @@ IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Computer Name" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS uses the following information to identify your computer on the network.", IDC_STATIC, 40, 5, 204, 20 @@ -20,3 +20,55 @@ LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/netid/lang/es-ES.rc Sat Jan 12 18:11:44 2008 @@ -25,3 +25,55 @@ LTEXT "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc Sat Jan 12 18:11:44 2008 @@ -19,3 +19,56 @@ PUSHBUTTON "&Changer...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "Note: Seuls les administrateurs peyvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 300, 9 END + +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/id-ID… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/netid/lang/id-ID.rc Sat Jan 12 18:11:44 2008 @@ -20,3 +20,55 @@ LTEXT "Catatan: Hanya Administrator yang bisa mengubah identifikasi komputer ini.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/netid/lang/it-IT.rc Sat Jan 12 18:11:44 2008 @@ -21,3 +21,55 @@ LTEXT "Nota: Solo gli amministratori possono cambiare il nome di questo computer.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc Sat Jan 12 18:11:44 2008 @@ -24,3 +24,56 @@ PUSHBUTTON "Z&mieñ...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "Uwaga: Tylko administratorzy mog¹ zmieniæ identyfikator tego komputera.", IDC_STATIC, 6, 179, 300, 9 END + +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/netid/lang/ru-RU.rc Sat Jan 12 18:11:44 2008 @@ -13,11 +13,62 @@ LTEXT "(Ïî óìîë÷àíèþ)", IDC_COMPUTERNAME, 98, 68, 144, 11 LTEXT "Ðàáî÷àÿ ãðóïïà:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 LTEXT "(ïóñòî)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 - LTEXT "×òîáû âûçâàòü ìàñòåð ñåòåâîé èäåíòèôèêàöèè äëÿ ïðèñîåäèíåíèÿ êîìïüþòåðà ê äîìåíó, íàæìèòå êíîïêó ""Èäåíòèôèêàöèÿ"".", IDC_STATIC, 6, 108, 172, 24 + LTEXT "×òîáû âûçâàòü ìàñòåð ñåòåâîé èäåíòèôèêàöèè äëÿ ïðèñîåäèíåíèÿ êîìïüþòåðà ê äîìåíó, íàæìèòå êíîïêó ""Èäåíòèôèêàöèÿ"".", IDC_STATIC, 6, 113, 172, 24 PUSHBUTTON "&Èäåíòèôèêàöèÿ...", IDC_NETWORK_ID, 180, 114, 72, 15 LTEXT "×òîáû èçìåíèòü èìÿ êîìïüþòåðà èëè äîìåíà íàæìèòå ""Èçìåíèòü"".", IDC_STATIC, 6, 149, 170, 17 PUSHBUTTON "È&çìåíèòü...",IDC_NETWORK_PROPERTY, 180, 149, 72, 15 - LTEXT "Ïðèìå÷àíèå: Òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíÿòü ýòè ïàðàìåòðû.", IDC_STATIC, 6, 179, 300, 9 + LTEXT "Ïðèìå÷àíèå: Òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíÿòü ýòè ïàðàìåòðû.", IDC_STATIC, 6, 179, 245, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Èçìåíåíèå èìåíè êîìïüþòåðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Èìÿ êîìïüþòåðà:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Ïîëíîå èìÿ êîìïüþòåðà:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&Äîïîëíèòåëüíî...", 1003, 150, 102, 75, 14 + GROUPBOX "ßâëÿåòñÿ ÷ëåíîì", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "äî&ìåíà:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "ðàáî÷åé &ãðóïïû:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Ïîèñê äîìåíà", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Îòìåíà", 2, 176, 203, 50, 14 +END +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS-ñóôôèêñ è NetBIOS-èìÿ êîìïüþòåðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Îñíîâíîé DNS-ñóôôèêñ ýòîãî êîìïüþòåðà:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Ñìåíèòü îñíîâíîé DNS-ñóôôèêñ ïðè ñìåíå ÷ëåíñòâà â äîìåíå", 115, 11, 39, 250, 10 + LTEXT "NetBIOS-èìÿ &êîìïüþòåðà:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 209, 104, 50, 14 + LTEXT "Ýòî èìÿ èñïîëüçóåòñÿ äëÿ âçàèìîäåéñòâèÿ ñî ñòàðûìè êîìïüþòåðàìè è ñëóæáàìè.", 13, 7, 86, 253, 17 +END + +STRINGTABLE +BEGIN + 1 "* íåò äàííûõ *" + 2 "WORKGROUP" + 3 "Ïðè ïîïûòêå ÷òåíèÿ äàííûõ î ÷ëåíñòâå â äîìåíå ïðîèçîøëà ñëåäóþùàÿ îøèáêà:" + 4 "Èçìåíåíèå èìåíè êîìïüþòåðà" + 5 "Ðàáî÷àÿ ãðóïïà:" + 6 "Äîìåí:" + 22 "Äîáðî ïîæàëîâàòü â ðàáî÷óþ ãðóïïó %1." + 23 "Äîáðî ïîæàëîâàòü â äîìåí %1." + 24 "Íåîáõîäèìî ïåðåçàïóñòèòü êîìïüþòåð äëÿ òîãî, ÷òîáû ýòè èçìåíåíèÿ âñòóïèëè â ñèëó." + 1021 "Ïðèìå÷àíèå: òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíèòü èäåíòèôèêàöèþ ýòîãî êîìïüþòåðà." + 1022 "Ïðèìå÷àíèå: èäåíòèôèêàöèÿ ýòîãî êîìïüþòåðà íå ìîæåò áûòü èçìåíåíà, ïîòîìó ÷òî:" + 3210 "&Ïîäðîáíî >>" + 3220 "<< &Ïîäðîáíî" +END Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/netid/lang/sk-SK.rc Sat Jan 12 18:11:44 2008 @@ -26,3 +26,56 @@ PUSHBUTTON "Z&meni...",IDC_NETWORK_PROPERTY, 176, 149, 72, 15 LTEXT "Poznámka: Identifikáciu poèítaèa môu zmeni len správcovia poèítaèa.", IDC_STATIC, 6, 179, 244, 9 END + +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/netid/lang/uk-UA.rc Sat Jan 12 18:11:44 2008 @@ -28,3 +28,55 @@ LTEXT "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè.", IDC_STATIC, 6, 179, 300, 9 END +IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computer Name Changes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computer name:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 + GROUPBOX "Member of", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Unknown *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "Workgroup:" + 6 "Domain:" + 22 "Welcome to the %1 workgroup." + 23 "Welcome to the %1 domain." + 24 "You must restart this computer for the changes to take effect." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 3210 "&Details >>" + 3220 "<< &Details" +END Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Sat Jan 12 18:11:44 2008 @@ -8,16 +8,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netid.dll\0" #include <reactos/version.rc> -IDI_COMPNAME ICON "res/netid.ico" +#include "rsrc.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/de-DE.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +IDI_COMPNAME ICON "res/101.ico" +IDI_WARNINGICO ICON "res/102.ico" Added: trunk/reactos/dll/win32/netid/res/101.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/101.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/netid/res/101.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/netid/res/102.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/102.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/netid/res/102.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/reactos/dll/win32/netid/res/netid.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/netid.… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/netid/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/resource.h… ============================================================================== --- trunk/reactos/dll/win32/netid/resource.h (original) +++ trunk/reactos/dll/win32/netid/resource.h Sat Jan 12 18:11:44 2008 @@ -5,9 +5,12 @@ #define IDC_STATIC -1 #endif -#define IDI_COMPNAME 50 +#define IDI_COMPNAME 101 +#define IDI_WARNINGICO 102 -#define IDD_PROPPAGECOMPUTER 200 +#define IDD_PROPPAGECOMPNAMECHENGE 103 +#define IDD_PROPPAGEDNSANDNETBIOS 104 +#define IDD_PROPPAGECOMPUTER 112 #define IDC_COMPDESC 201 #define IDC_COMPUTERNAME 202 Added: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… ============================================================================== --- trunk/reactos/dll/win32/netid/rsrc.rc (added) +++ trunk/reactos/dll/win32/netid/rsrc.rc Sat Jan 12 18:11:44 2008 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Propchange: trunk/reactos/dll/win32/netid/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 31733: - Fix Russian translation
by dchapyshev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dchapyshev Date: Sat Jan 12 18:07:14 2008 New Revision: 31733 URL: http://svn.reactos.org/svn/reactos?rev=31733&view=rev Log: - Fix Russian translation Modified: trunk/rosapps/magnify/lang/ru-RU.rc Modified: trunk/rosapps/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/ru-RU.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/ru-RU.rc (original) +++ trunk/rosapps/magnify/lang/ru-RU.rc Sat Jan 12 18:07:14 2008 @@ -2,12 +2,12 @@ IDC_MAGNIFIER MENU BEGIN - POPUP "&????" + POPUP "&Ôàéë" BEGIN - MENUITEM "&?????", IDM_EXIT - MENUITEM "&?????????", IDM_OPTIONS + MENUITEM "&Âûõîä", IDM_EXIT + MENUITEM "&Ïàðàìåòðû", IDM_OPTIONS MENUITEM SEPARATOR - MENUITEM "&? ?????????...", IDM_ABOUT + MENUITEM "&Î ïðîãðàììå...", IDM_ABOUT END END @@ -19,46 +19,46 @@ IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU -CAPTION "? ?????????" +CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_ICON,IDC_MYICON,14,9,20,20 - LTEXT "???????? ????. ?????? 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "????????? ????? (C) 2007 ???? ??????? (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,130,25 - PUSHBUTTON "OK",IDOK,162,53,50,14 + LTEXT "Ýêðàííàÿ ëóïà. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Àâòîðñêèå ïðàâà (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,150,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 END -IDD_DIALOGOPTIONS DIALOGEX 0, 0, 182, 182 +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 185, 182 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "????????? ???????? ????" +CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "?????",IDOK,96,161,50,14 - PUSHBUTTON "??????",IDOK,38,161,50,14 - LTEXT "??????????:",IDC_STATIC,6,8,80,8 - COMBOBOX IDC_ZOOM,92,6,81,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "????????",IDC_STATIC,7,25,165,59 - GROUPBOX "?????????????",IDC_STATIC,7,88,165,57 - CONTROL "????????? ?? ?????????? ????",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,146,10 - CONTROL "????????? ?? ??????? ?????",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,148,10 - CONTROL "????????? ?? ??????????????? ??????",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,152,10 - CONTROL "????????????? ?????",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,122,10 - CONTROL "????????? ? ????????? ????",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,128,10 - CONTROL "?????????? ???? ????",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,131,10 + DEFPUSHBUTTON "Â&ûõîä",IDOK,94,158,50,14 + PUSHBUTTON "&Ñïðàâêà",IDOK,34,158,50,14 + LTEXT "Óâåëè÷åíèå:",IDC_STATIC,6,8,68,8 + COMBOBOX IDC_ZOOM,92,6,85,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Ñëåæåíèå",IDC_STATIC,7,25,170,59 + GROUPBOX "Ïðåäñòàâëåíèå",IDC_STATIC,7,87,170,57 + CONTROL "Ñëåäîâàòü çà óê&àçàòåëåì ìûøè",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,155,10 + CONTROL "Ñëåäîâàòü çà ô&îêóñîì ââîäà",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,155,10 + CONTROL "Ñëåäîâàòü çà ð&åäàêòèðîâàíèåì òåêñòà",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,155,10 + CONTROL "Î&áðàòèòü öâåòà",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,150,10 + CONTROL "&Çàïóñêàòü â ñâåðíóòîì âèäå",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,150,10 + CONTROL "Î&òîáðàæàòü îêíî ýêðàííîé ëóïû",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,150,10 END IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "???????? ???? ReactOS" +CAPTION "Ýêðàííàÿ ëóïà" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT """???????? ????"" ???????????? ???? ????????? ??????? ???????????? ??? ????? ? ?????? ???????. ????????????? ? ???????? ??????????? ?????? ????? ????????? ??????????? ????????? ? ????? ???????? ?????????????.",IDC_STATIC,36,7,207,33 - CONTROL "?? ?????????? ? ??????????",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 + LTEXT """Ýêðàííàÿ ëóïà"" îáåñïå÷èâàåò ëèøü íà÷àëüíûé óðîâåíü âîçìîæíîñòåé äëÿ ëþäåé ñ ïëîõèì çðåíèåì. Ïîëüçîâàòåëÿì ñ ñèëüíûìè íàðóøåíèÿìè çðåíèÿ ëó÷øå ïðèìåíÿòü ñïåöèàëüíûå ïðîãðàììû ñ áîëåå øèðîêèìè âîçìîæíîñòÿìè.",IDC_STATIC,36,7,207,33 + CONTROL "Íå âûâîäèòü ýòî ñîîáùåíèå â äàëüíåéøåì",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,58,230,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "???????? ????" + IDS_APP_TITLE "Ýêðàííàÿ ëóïà" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs