Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 68001: [NTVDM] Implement XMS functions 10h, 11h and 12h by forwarding them to the VDM DOS memory manager. CORE-9651 CORE-9741 #resolve #comment Fixed in revision 68001.
by aandrejevic＠svn.reactos.org 02 Jun '15

02 Jun '15

Author: aandrejevic Date: Tue Jun 2 21:59:19 2015 New Revision: 68001 URL: http://svn.reactos.org/svn/reactos?rev=68001&view=rev Log: [NTVDM] Implement XMS functions 10h, 11h and 12h by forwarding them to the VDM DOS memory manager. CORE-9651 CORE-9741 #resolve #comment Fixed in revision 68001. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Tue Jun 2 21:59:19 2015 @@ -20,6 +20,7 @@ #include "dos/dem.h" #include "device.h" #include "himem.h" +#include "memory.h" #define XMS_DEVICE_NAME "XMSXXXX0" @@ -564,6 +565,74 @@ break; } + /* Allocate UMB */ + case 0x10: + { + WORD Segment; + WORD MaxAvailable; + BYTE OldAllocStrategy = Sda->AllocStrategy; + BOOLEAN OldLinkState = DosUmbLinked; + + DosLinkUmb(); + Sda->AllocStrategy = DOS_ALLOC_HIGH | DOS_ALLOC_BEST_FIT; + Segment = DosAllocateMemory(getDX(), &MaxAvailable); + + if (Segment) + { + setAX(1); + setBX(Segment); + } + else + { + setAX(0); + setBL(MaxAvailable ? XMS_STATUS_SMALLER_UMB : XMS_STATUS_OUT_OF_UMBS); + setDX(MaxAvailable); + } + + Sda->AllocStrategy = OldAllocStrategy; + if (!OldLinkState) DosUnlinkUmb(); + break; + } + + /* Free UMB */ + case 0x11: + { + if (DosFreeMemory(getDX())) + { + setAX(1); + } + else + { + setAX(0); + setBL(XMS_STATUS_INVALID_UMB); + } + + break; + } + + /* Reallocate UMB */ + case 0x12: + { + WORD Segment; + WORD MaxAvailable; + + Segment = DosResizeMemory(getDX(), getBX(), &MaxAvailable); + + if (Segment) + { + setAX(1); + } + else + { + setAX(0); + setBL(Sda->LastErrorCode == ERROR_INVALID_HANDLE + ? XMS_STATUS_INVALID_UMB : XMS_STATUS_SMALLER_UMB); + setDX(MaxAvailable); + } + + break; + } + default: { DPRINT1("XMS command AH = 0x%02X NOT IMPLEMENTED\n", getAH()); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] Tue Jun 2 21:59:19 2015 @@ -28,6 +28,9 @@ #define XMS_STATUS_LOCKED 0xAB #define XMS_STATUS_LOCK_OVERFLOW 0xAC #define XMS_STATUS_CANNOT_LOCK 0xAD +#define XMS_STATUS_SMALLER_UMB 0xB0 +#define XMS_STATUS_OUT_OF_UMBS 0xB1 +#define XMS_STATUS_INVALID_UMB 0xB2 typedef struct _XMS_HANDLE {

1 0

[ekohl] 68000: [CDFS] Initialize an uninitialized variable.
by ekohl＠svn.reactos.org 02 Jun '15

02 Jun '15

Author: ekohl Date: Tue Jun 2 13:14:33 2015 New Revision: 68000 URL: http://svn.reactos.org/svn/reactos?rev=68000&view=rev Log: [CDFS] Initialize an uninitialized variable. Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Tue Jun 2 13:14:33 2015 @@ -179,7 +179,7 @@ PULONG BufferLength) { PDEVICE_EXTENSION DeviceExt; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("CdfsGetFsFullSizeInformation()\n"); DPRINT("FsSizeInfo = %p\n", FsSizeInfo);

1 0

[ekohl] 67999: [CDFS] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation to CDFS too.
by ekohl＠svn.reactos.org 02 Jun '15

02 Jun '15

Author: ekohl Date: Tue Jun 2 12:37:37 2015 New Revision: 67999 URL: http://svn.reactos.org/svn/reactos?rev=67999&view=rev Log: [CDFS] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation to CDFS too. Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Tue Jun 2 12:37:37 2015 @@ -171,6 +171,38 @@ } +static +NTSTATUS +CdfsGetFsFullSizeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_FULL_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) +{ + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + + DPRINT("CdfsGetFsFullSizeInformation()\n"); + DPRINT("FsSizeInfo = %p\n", FsSizeInfo); + + if (*BufferLength < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + DeviceExt = DeviceObject->DeviceExtension; + + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->CdInfo.VolumeSpaceSize; + FsSizeInfo->CallerAvailableAllocationUnits.QuadPart = 0; + FsSizeInfo->ActualAvailableAllocationUnits.QuadPart = 0; + FsSizeInfo->SectorsPerAllocationUnit = 1; + FsSizeInfo->BytesPerSector = BLOCKSIZE; + + DPRINT("Finished CdfsGetFsFullSizeInformation()\n"); + if (NT_SUCCESS(Status)) + *BufferLength -= sizeof(FILE_FS_FULL_SIZE_INFORMATION); + + return Status; +} + + NTSTATUS NTAPI CdfsQueryVolumeInformation( @@ -216,12 +248,18 @@ Status = CdfsGetFsSizeInformation(DeviceObject, SystemBuffer, &BufferLength); - break; + break; case FileFsDeviceInformation: Status = CdfsGetFsDeviceInformation(DeviceObject, SystemBuffer, &BufferLength); + break; + + case FileFsFullSizeInformation: + Status = CdfsGetFsFullSizeInformation(DeviceObject, + SystemBuffer, + &BufferLength); break; default:

1 0

[ekohl] 67998: [FASTFAT] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation. This fixes a number of ntdll winetests.
by ekohl＠svn.reactos.org 02 Jun '15

02 Jun '15

Author: ekohl Date: Tue Jun 2 09:08:33 2015 New Revision: 67998 URL: http://svn.reactos.org/svn/reactos?rev=67998&view=rev Log: [FASTFAT] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation. This fixes a number of ntdll winetests. Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Tue Jun 2 09:08:33 2015 @@ -177,6 +177,38 @@ DPRINT("BufferLength %lu\n", *BufferLength); return STATUS_SUCCESS; +} + + +static +NTSTATUS +FsdGetFsFullSizeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_FULL_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) +{ + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + + DPRINT("FsdGetFsFullSizeInformation()\n"); + DPRINT("FsSizeInfo = %p\n", FsSizeInfo); + + if (*BufferLength < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + DeviceExt = DeviceObject->DeviceExtension; + Status = CountAvailableClusters(DeviceExt, &FsSizeInfo->CallerAvailableAllocationUnits); + + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->FatInfo.NumberOfClusters; + FsSizeInfo->ActualAvailableAllocationUnits.QuadPart = FsSizeInfo->CallerAvailableAllocationUnits.QuadPart; + FsSizeInfo->SectorsPerAllocationUnit = DeviceExt->FatInfo.SectorsPerCluster; + FsSizeInfo->BytesPerSector = DeviceExt->FatInfo.BytesPerSector; + + DPRINT("Finished FsdGetFsFullSizeInformation()\n"); + if (NT_SUCCESS(Status)) + *BufferLength -= sizeof(FILE_FS_FULL_SIZE_INFORMATION); + + return Status; } @@ -401,6 +433,12 @@ &BufferLength); break; + case FileFsFullSizeInformation: + RC = FsdGetFsFullSizeInformation(IrpContext->DeviceObject, + SystemBuffer, + &BufferLength); + break; + default: RC = STATUS_NOT_SUPPORTED; }

1 0

[ekohl] 67997: [CDFS] Finally queue IRP_MJ_CREATE IRPs too.
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 19:22:42 2015 New Revision: 67997 URL: http://svn.reactos.org/svn/reactos?rev=67997&view=rev Log: [CDFS] Finally queue IRP_MJ_CREATE IRPs too. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Mon Jun 1 19:22:42 2015 @@ -81,7 +81,7 @@ DeviceObject->Flags = DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = CdfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 1 19:22:42 2015 @@ -319,12 +319,10 @@ /* create.c */ -DRIVER_DISPATCH CdfsCreate; - -NTSTATUS -NTAPI -CdfsCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsCreate( + PCDFS_IRP_CONTEXT IrpContext); /* devctrl.c */ Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Mon Jun 1 19:22:42 2015 @@ -247,26 +247,30 @@ * fail immediately */ Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; - Irp->IoStatus.Status = Status; return Status; } NTSTATUS NTAPI -CdfsCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsCreate( + PCDFS_IRP_CONTEXT IrpContext) +{ + PDEVICE_OBJECT DeviceObject; PDEVICE_EXTENSION DeviceExt; NTSTATUS Status; + DPRINT("CdfsCreate()\n"); + + ASSERT(IrpContext); + + DeviceObject = IrpContext->DeviceObject; if (DeviceObject == CdfsGlobalData->DeviceObject) { /* DeviceObject represents FileSystem instead of logical volume */ DPRINT("Opening file system\n"); - Irp->IoStatus.Information = FILE_OPENED; - Status = STATUS_SUCCESS; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = FILE_OPENED; + return STATUS_SUCCESS; } DeviceExt = DeviceObject->DeviceExtension; @@ -275,15 +279,10 @@ ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); Status = CdfsCreateFile(DeviceObject, - Irp); + IrpContext->Irp); ExReleaseResourceLite(&DeviceExt->DirResource); KeLeaveCriticalRegion(); -ByeBye: - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, - NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT); - return Status; } Modified: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Mon Jun 1 19:22:42 2015 @@ -105,7 +105,7 @@ break; case IRP_MJ_CREATE: -// Status = CdfsCreate(IrpContext); + Status = CdfsCreate(IrpContext); break; case IRP_MJ_CLEANUP:

1 0

[akhaldi] 67996: [KERNEL32] Apply Wine commit debd62c by Daniel Jelinski: Improved stub for GetCalendarInfo's CAL_SCALNAME. CORE-9246
by akhaldi＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: akhaldi Date: Mon Jun 1 18:53:24 2015 New Revision: 67996 URL: http://svn.reactos.org/svn/reactos?rev=67996&view=rev Log: [KERNEL32] Apply Wine commit debd62c by Daniel Jelinski: Improved stub for GetCalendarInfo's CAL_SCALNAME. CORE-9246 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Mon Jun 1 18:53:24 2015 @@ -2144,7 +2144,8 @@ return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return 0; + if (lpCalData) *lpCalData = 0; + return 1; case CAL_IYEAROFFSETRANGE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); return 0;

1 0

[akhaldi] 67995: [CRT][LIBCNTPR] Adopt strtoul() from Wine Staging 1.7.37. Fixes a msvcrt:string test. CORE-9246
by akhaldi＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: akhaldi Date: Mon Jun 1 18:49:52 2015 New Revision: 67995 URL: http://svn.reactos.org/svn/reactos?rev=67995&view=rev Log: [CRT][LIBCNTPR] Adopt strtoul() from Wine Staging 1.7.37. Fixes a msvcrt:string test. CORE-9246 Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] Mon Jun 1 18:49:52 2015 @@ -1,75 +1,110 @@ #include <precomp.h> -#include <ctype.h> -/* - * Convert a string to an unsigned long integer. +/* Based on Wine Staging 1.7.37 - dlls/msvcrt/string.c */ + +/********************************************************************* + * _strtoi64_l (MSVCRT.@) * - * Ignores `locale' stuff. Assumes that the upper and lower case - * alphabets and digits are each contiguous. - * - * @implemented + * FIXME: locale parameter is ignored */ -unsigned long -strtoul(const char *nptr, char **endptr, int base) +__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) { - const char *s = nptr; - unsigned long acc; - int c; - unsigned long cutoff; - int neg = 0, any, cutlim; + BOOL negative = FALSE; + __int64 ret = 0; - /* - * See strtol for comments as to the logic used. - */ - do { - c = *s++; - } while (isspace(c)); - if (c == '-') - { - neg = 1; - c = *s++; - } - else if (c == '+') - c = *s++; - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) - { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; - cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; - for (acc = 0, any = 0;; c = *s++) - { - if (isdigit(c)) - c -= '0'; - else if (isalpha(c)) - c -= isupper(c) ? 'A' - 10 : 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; +#ifndef _LIBCNT_ + TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); +#endif + + if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; + if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + + while(isspace(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolower(*(nptr+1))=='x') { + base = 16; + nptr += 2; } - } - if (any < 0) - { - acc = ULONG_MAX; + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolower(*nptr); + int v; + + if(isdigit(cur)) { + if(cur >= '0'+base) + break; + v = cur-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + if(negative) + v = -v; + + nptr++; + + if(!negative && (ret>_I64_MAX/base || ret*base>_I64_MAX-v)) { + ret = _I64_MAX; #ifndef _LIBCNT_ - _set_errno(ERANGE); + *_errno() = ERANGE; #endif - } - else if (neg) - acc = 0-acc; - if (endptr != 0) - *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); - return acc; + } else if(negative && (ret<_I64_MIN/base || ret*base<_I64_MIN-v)) { + ret = _I64_MIN; +#ifndef _LIBCNT_ + *_errno() = ERANGE; +#endif + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (char*)nptr; + + return ret; } + +/****************************************************************** + * _strtoul_l (MSVCRT.@) + */ +unsigned long CDECL strtoul_l(const char* nptr, char** end, int base, _locale_t locale) +{ + __int64 ret = strtoi64_l(nptr, end, base, locale); + + if(ret > ULONG_MAX) { + ret = ULONG_MAX; +#ifndef _LIBCNT_ + *_errno() = ERANGE; +#endif + }else if(ret < -(__int64)ULONG_MAX) { + ret = 1; +#ifndef _LIBCNT_ + *_errno() = ERANGE; +#endif + } + + return ret; +} + +/****************************************************************** + * strtoul (MSVCRT.@) + */ +unsigned long CDECL strtoul(const char* nptr, char** end, int base) +{ + return strtoul_l(nptr, end, base, NULL); +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jun 1 18:49:52 2015 @@ -286,6 +286,7 @@ reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 + reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130

1 0

[ekohl] 67994: [CDFS] Queue IRP_MJ_READ, IRP_MJ_WRITE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP IRPs.
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 17:15:11 2015 New Revision: 67994 URL: http://svn.reactos.org/svn/reactos?rev=67994&view=rev Log: [CDFS] Queue IRP_MJ_READ, IRP_MJ_WRITE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP IRPs. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/dispatch.c trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -79,11 +79,11 @@ /* Initialize driver data */ DeviceObject->Flags = DO_DIRECT_IO; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsCleanup; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsCreate; - DriverObject->MajorFunction[IRP_MJ_READ] = CdfsRead; - DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsWrite; + DriverObject->MajorFunction[IRP_MJ_READ] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = CdfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -281,22 +281,18 @@ /* cleanup.c */ -DRIVER_DISPATCH CdfsCleanup; - -NTSTATUS -NTAPI -CdfsCleanup(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsCleanup( + PCDFS_IRP_CONTEXT IrpContext); /* close.c */ -DRIVER_DISPATCH CdfsClose; - -NTSTATUS -NTAPI -CdfsClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsClose( + PCDFS_IRP_CONTEXT IrpContext); NTSTATUS CdfsCloseFile(PDEVICE_EXTENSION DeviceExt, @@ -488,19 +484,15 @@ /* rw.c */ -DRIVER_DISPATCH CdfsRead; - -NTSTATUS -NTAPI -CdfsRead(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -DRIVER_DISPATCH CdfsWrite; - -NTSTATUS -NTAPI -CdfsWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsRead( + PCDFS_IRP_CONTEXT IrpContext); + +NTSTATUS +NTAPI +CdfsWrite( + PCDFS_IRP_CONTEXT IrpContext); /* volinfo.c */ Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -68,15 +68,23 @@ } NTSTATUS NTAPI -CdfsCleanup(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsCleanup( + PCDFS_IRP_CONTEXT IrpContext) { + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PDEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status; DPRINT("CdfsCleanup() called\n"); + + ASSERT(IrpContext); + + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + Stack = IrpContext->Stack; if (DeviceObject == CdfsGlobalData->DeviceObject) { @@ -85,7 +93,6 @@ goto ByeBye; } - Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; DeviceExtension = DeviceObject->DeviceExtension; @@ -97,12 +104,9 @@ ExReleaseResourceLite(&DeviceExtension->DirResource); KeLeaveCriticalRegion(); - ByeBye: - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return(Status); } Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -76,15 +76,23 @@ NTSTATUS NTAPI -CdfsClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsClose( + PCDFS_IRP_CONTEXT IrpContext) { + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PDEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status; DPRINT("CdfsClose() called\n"); + + ASSERT(IrpContext); + + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + Stack = IrpContext->Stack; if (DeviceObject == CdfsGlobalData->DeviceObject) { @@ -93,17 +101,14 @@ goto ByeBye; } - Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; DeviceExtension = DeviceObject->DeviceExtension; Status = CdfsCloseFile(DeviceExtension,FileObject); ByeBye: - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return(Status); } Modified: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -89,7 +89,7 @@ break; case IRP_MJ_READ: -// Status = CdfsRead(IrpContext); + Status = CdfsRead(IrpContext); break; case IRP_MJ_DEVICE_CONTROL: @@ -97,15 +97,19 @@ break; case IRP_MJ_WRITE: -// Status = CdfsWrite(IrpContext); + Status = CdfsWrite(IrpContext); break; case IRP_MJ_CLOSE: -// Status = CdfsClose(IrpContext); + Status = CdfsClose(IrpContext); break; case IRP_MJ_CREATE: // Status = CdfsCreate(IrpContext); + break; + + case IRP_MJ_CLEANUP: + Status = CdfsCleanup(IrpContext); break; case IRP_MJ_FILE_SYSTEM_CONTROL: Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Mon Jun 1 17:15:11 2015 @@ -175,9 +175,11 @@ NTSTATUS NTAPI -CdfsRead(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsRead( + PCDFS_IRP_CONTEXT IrpContext) { + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PDEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; @@ -187,10 +189,15 @@ ULONG ReturnedReadLength = 0; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("CdfsRead(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT("CdfsRead(%p)\n", IrpContext); + + ASSERT(IrpContext); + + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + Stack = IrpContext->Stack; DeviceExt = DeviceObject->DeviceExtension; - Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; ReadLength = Stack->Parameters.Read.Length; @@ -218,19 +225,21 @@ Irp->IoStatus.Information = 0; } - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp,IO_NO_INCREMENT); - return(Status); } NTSTATUS NTAPI -CdfsWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsWrite( + PCDFS_IRP_CONTEXT IrpContext) { - DPRINT("CdfsWrite(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - + PIRP Irp; + + DPRINT("CdfsWrite(%p)\n", IrpContext); + + ASSERT(IrpContext); + + Irp = IrpContext->Irp; Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; return(STATUS_NOT_SUPPORTED);

1 0

[dreimer] 67993: [TRANSLATIONS] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #resolve #comment Trunk patch applied, thx ^^ See issue 9003 for more details.
by dreimer＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: dreimer Date: Mon Jun 1 17:13:53 2015 New Revision: 67993 URL: http://svn.reactos.org/svn/reactos?rev=67993&view=rev Log: [TRANSLATIONS] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #resolve #comment Trunk patch applied, thx ^^ See issue 9003 for more details. Added: trunk/reactos/base/applications/osk/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/telephon/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/zh-CN.rc (with props) trunk/reactos/dll/win32/aclui/lang/zh-CN.rc (with props) trunk/reactos/dll/win32/browseui/lang/zh-CN.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/osk/rsrc.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/telephon/telephon.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/browseui/browseui.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -18,13 +18,13 @@ GROUPBOX "ç¿»ç", -1, 7, 7, 90, 40 AUTORADIOBUTTON "ç¿»ä¸å¼ (&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "ç¿»ä¸å¼ (&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - GROUPBOX "Scoring", -1, 100, 7, 75, 53 - AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 - AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10 + GROUPBOX "å¾å", -1, 100, 7, 75, 53 + AUTORADIOBUTTON "æ å(&S)", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ç»´å æ¯(&V)", IDC_OPT_VEGAS, 107, 32, 60, 10 + AUTORADIOBUTTON "æ (&N)", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "è®¡æ¶(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP AUTOCHECKBOX "ç¶ææ (&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + AUTOCHECKBOX "ä¿çå¾å(&K)", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP DEFPUSHBUTTON "ç¡®å®", IDOK, 35, 97, 50, 14 PUSHBUTTON "åæ¶", IDCANCEL, 101, 97, 50, 14 END @@ -59,8 +59,8 @@ IDS_SOL_QUIT "éåºå½åæ¸¸æ?" IDS_SOL_WIN "æåä½ ï¼ä½ èµ¢äº!!" IDS_SOL_DEAL "åç©ä¸æ¬¡?" - IDS_SOL_SCORE "Score: %d" - IDS_SOL_TIME "Time: %d" + IDS_SOL_SCORE "å¾å: %d" + IDS_SOL_TIME "æ¶é´: %d" END /* Menus */ Added: trunk/reactos/base/applications/osk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/osk/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,130 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/osk/lang/en-US.rc + * PURPOSE: On screen keyboard (American resources). + * PROGRAMMERS: Denis ROBERT + */ + +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +CAPTION "å±å¹é®ç" +FONT 8, "MS Shell Dlg" +EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 + PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Caps",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Scroll",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 +END + +/* EOF */ Propchange: trunk/reactos/base/applications/osk/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/osk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/rsrc… ============================================================================== --- trunk/reactos/base/applications/osk/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/rsrc.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -79,4 +79,7 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif /* EOF */ Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -1,3 +1,4 @@ + /* Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -68,12 +69,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "éæ©(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨åºåå é¤å®è£ç¨åº(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ä»£çæå¡å¨", -1, 4, 116, 240, 76 + CONTROL "ç³»ç»ä»£çè®¾ç½®", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ç´æ¥ ï¼æ ä»£çï¼", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ä»£çæå¡å¨", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "æ²¡æä»£ç", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "ç¡®å®", IDOK, 116, 195, 60, 14 @@ -169,7 +170,7 @@ IDS_CAT_FINANCE "ç»æµ" IDS_CAT_GAMES "æ¸¸æä¸å¨±ä¹" IDS_CAT_GRAPHICS "å¾å½¢" - IDS_CAT_INTERNET "Internet ä¸ç½ç»" + IDS_CAT_INTERNET "äºèç½ä¸ç½ç»" IDS_CAT_LIBS "åº" IDS_CAT_OFFICE "åå¬" IDS_CAT_OTHER "å¶ä»" @@ -197,6 +198,6 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨éæ©çæä»¶å¤¹ä¸åå¨ãåå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¡®å®è¦ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®åï¼" IDS_INFORMATION "ä¿¡æ¯" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "æ æ³ä¸è½½è¯¥è½¯ä»¶å ï¼æ¾ä¸å°ç½ç»çå°å ï¼" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -68,12 +68,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "éæ©(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨åºåå é¤å®è£ç¨åº(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ä»£çæå¡å¨", -1, 4, 116, 240, 76 + CONTROL "ç³»ç»ä»£çè®¾ç½®", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ç´æ¥ ï¼æ ä»£çï¼", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ä»£çæå¡å¨", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "æ²¡æä»£ç", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "ç¡®å®", IDOK, 116, 195, 60, 14 @@ -169,7 +169,7 @@ IDS_CAT_FINANCE "ç»æµ" IDS_CAT_GAMES "æ¸¸æä¸å¨±ä¹" IDS_CAT_GRAPHICS "å¾å½¢" - IDS_CAT_INTERNET "Internet ä¸ç½ç»" + IDS_CAT_INTERNET "äºèç½ä¸ç½ç»" IDS_CAT_LIBS "åº" IDS_CAT_OFFICE "åå¬" IDS_CAT_OTHER "å¶ä»" @@ -197,6 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨éæ©çæä»¶å¤¹ä¸åå¨ãåå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¡®å®è¦ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®åï¼" IDS_INFORMATION "ä¿¡æ¯" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "æ æ³ä¸è½½è¯¥è½¯ä»¶å ï¼æ¾ä¸å°ç½ç»çå°å ï¼" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" END Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -52,7 +52,7 @@ MENUITEM "å±å (&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT END - POPUP "å³æº(%U)" + POPUP "å³æº(&U)" BEGIN MENUITEM "å¾æº(&B)", ID_SHUTDOWN_STANDBY MENUITEM "ä¼ç (&H)", ID_SHUTDOWN_HIBERNATE Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -90,6 +90,9 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #define WINE_FILENAME_STR "inetcpl.cpl" #define WINE_FILEDESCRIPTION_STR "Internet Control Panel" Added: trunk/reactos/dll/cpl/inetcpl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/zh-CN… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/inetcpl/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,114 @@ +/* + * English resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * 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 + * + */ + +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_CPL_NAME "äºèç½è®¾ç½®" + IDS_CPL_INFO "éç½®Wineäºèç½æµè§å¨åç¸å³çè®¾ç½®" + IDS_SEC_SETTINGS "åºåçå®å¨è®¾ç½®: " + IDS_SEC_LEVEL0 "èªå®ä¹" + IDS_SEC_LEVEL1 "éå¸¸ä½" + IDS_SEC_LEVEL2 "ä½" + IDS_SEC_LEVEL3 "ä¸ç" + IDS_SEC_LEVEL4 "å¢å¤§" + IDS_SEC_LEVEL5 "é«" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "å¸¸è§" +BEGIN + + GROUPBOX "ä¸»é¡µ", IDC_STATIC, 4, 4, 312, 56 + LTEXT "æ¨å¯ä»¥éæ©å°ç¨ä½æ¨çä¸»é¡µå°åã", + IDC_STATIC, 10, 14, 300, 10 + EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "å½åé¡µ(&C)", IDC_HOME_CURRENT, 58, 42, 80, 14 + PUSHBUTTON "é»è®¤é¡µ(&D)", IDC_HOME_DEFAULT, 144, 42, 80, 14 + PUSHBUTTON "ç©ºç½é¡µ(&B)", IDC_HOME_BLANK, 230, 42, 80, 14 + GROUPBOX "æµè§åå²è®°å½", IDC_STATIC, 4, 66, 312, 42 + LTEXT "æ¨å¯ä»¥å é¤ç¼åçé¡µé¢ã å°åæåæªæ¡åå¶ä»æ°æ®ã", + IDC_STATIC, 10, 76, 300, 10 + PUSHBUTTON "å é¤æä»¶...(&F)", IDC_HISTORY_DELETE, 144, 90, 80, 14 + PUSHBUTTON "è®¾ç½®...(&S)", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "å é¤æµè§åå²è®°å½" +BEGIN + + AUTOCHECKBOX "äºèç½ä¸´æ¶æä»¶\nç¼åçç½ç«é¡µé¢ã å¾ååè¯ä¹¦çå¯æ¬ã", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "å°åæåæªæ¡\néè¿ç½ç«å¨æ¨çè®¡ç®æºä¸ä¿åæä»¶åå¨ç¨æ·é¦éé¡¹åç»å½ä¿¡æ¯ã", + IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "åå²è®°å½\næ¨è¿å¥çç½ç«çåè¡¨ã", + IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "è¡¨åæ°æ®\næ¨å·²è¿å¥å½¢å¼çç¨æ·ååå¶ä»ä¿¡æ¯ã", + IDC_DELETE_FORM_DATA, 10, 128, 230, 40, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "å¯ç \nä¿åå¨çªä½ä¸è¾å¥çå¯ç ã", + IDC_DELETE_PASSWORDS, 10, 168, 230, 40, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "åæ¶", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "å é¤", IDOK, 120, 230, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "å®å¨" +BEGIN + + CONTROL "", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Content" +BEGIN + + GROUPBOX "è¯ä¹¦", IDC_STATIC, 4, 4, 312, 50 + LTEXT "ä¸ºæ¨çä¸ªäººèº«ä»½ï¼ç¡®å®è¯ä¹¦é¢åæºæååºçåä½¿ç¨è¯ä¹¦ã", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "è¯ä¹¦...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "åºçè...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END Propchange: trunk/reactos/dll/cpl/inetcpl/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/zh-C… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,9 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "çµè¯åè°å¶è§£è°å¨éé¡¹" + IDS_CPLSYSTEMDESCRIPTION "éç½®æ¨ççµè¯æ¨å·è§ååè°å¶è§£è°å¨è®¾ç½®ã" +END Propchange: trunk/reactos/dll/cpl/telephon/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -71,3 +71,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,215 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +/* Dialogs */ + +IDD_USERS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ç¨æ·" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "æ·»å ...(&D)", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "å é¤(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "å±æ§(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "å¨ç³»ç»å¯å¨æ¶éè¦ç¨æ·ååå¯ç ã", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "éç½®å¯ç ", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED +END + +IDD_GROUPS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å°ç»" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "æ·»å ...(&D)", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "å é¤(&R)", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "å±æ§(&O)", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 +END + +IDD_EXTRA DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é¢å¤" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "è¿ä¸ªç©ºé´æ¯ææçç©º", IDC_STATIC, 66, 90, 112, 8 +END + +IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "å¨å:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME, 77, 43, 168, 13, ES_AUTOHSCROLL + LTEXT "æè¿°:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION, 77, 61, 168, 13, ES_AUTOHSCROLL + AUTOCHECKBOX "ç¨æ·å¿é¡»æ´æ¹åé¦æ¬¡ç»å½å¯ç ", IDC_USER_GENERAL_FORCE_CHANGE, 7, 82, 210, 10 + AUTOCHECKBOX "ç¨æ·ä¸è½æ´æ¹å¯ç ", IDC_USER_GENERAL_CANNOT_CHANGE, 7, 95, 210, 10 + AUTOCHECKBOX "å¯ç æ°¸ä¸è¿æ", IDC_USER_GENERAL_NEVER_EXPIRES, 7, 108, 210, 10 + AUTOCHECKBOX "å¸æ·å·²è¢«ç¦ç¨", IDC_USER_GENERAL_DISABLED, 7, 121, 210, 10 + AUTOCHECKBOX "å¸æ·å·²éå®", IDC_USER_GENERAL_LOCKED, 7, 134, 210, 10 +END + +IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¼å" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æå:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "æ·»å ...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "åé¤", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "éç½®æä»¶" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ç¨æ·éç½®æä»¶", -1, 7, 7, 238, 54 + LTEXT "éç½®æä»¶è·¯å¾:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "ç»å½èæ¬:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + GROUPBOX "ä¸»åå½", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "æ¬å°è·¯å¾:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "è¿æ¥:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "å°:", -1, 112, 101, 12, 8 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL +END + +IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "æè¿°:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION, 65, 42, 180, 13, ES_AUTOHSCROLL + LTEXT "æå:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "æ·»å ...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "åé¤", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "æ´æ¢å¯ç " +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "æ°å¯ç :", -1, 7, 10, 96, 8 + EDITTEXT IDC_EDIT_PASSWORD2, 107, 25, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "éå¤å¯ç :", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "ç¡®å®", IDOK, 156, 53, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_NEW DIALOGEX 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "æ°ç¨æ·" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "ç¨æ·åç§°:", -1, 7, 10, 96, 8 + EDITTEXT IDC_USER_NEW_FULL_NAME, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "å®æ´çç¨æ·åç§°:", -1, 7, 28, 96, 8 + EDITTEXT IDC_USER_NEW_DESCRIPTION, 107, 43, 153, 14, ES_AUTOHSCROLL + RTEXT "æè¿°:", -1, 7, 46, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD1, 107, 67, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "å¯ç :", -1, 7, 70, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "éå¤å¯ç :", -1, 7, 88, 96, 8 + AUTOCHECKBOX "ç¨æ·å¿é¡»æ´æ¹åé¦æ¬¡ç»å½å¯ç ", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 + AUTOCHECKBOX "ç¨æ·ä¸è½æ´æ¹å¯ç ", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED + AUTOCHECKBOX "å¯ç æ°¸ä¸è¿æ", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED + AUTOCHECKBOX "å¸æ·å·²è¢«ç¦ç¨", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 + DEFPUSHBUTTON "ç¡®å®", IDOK, 156, 179, 50, 14, WS_DISABLED + PUSHBUTTON "åæ¶", IDCANCEL, 210, 179, 50, 14 +END + +IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "æ°ç»" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "ç»å:", -1, 7, 10, 96, 8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "æè¿°:", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "ç¡®å®", IDOK, 156, 53, 50, 14, WS_DISABLED + PUSHBUTTON "åæ¶", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "ç»æåèº«ä»½" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æå:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "ç¡®å®", IDOK, 141, 197, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 195, 197, 50, 14 +END + +/* Menus */ + +IDM_POPUP_GROUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "æ°ç»...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "æ·»å æå", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "å é¤", IDM_GROUP_DELETE + MENUITEM "éå½å", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "å±æ§", IDM_GROUP_PROPERTIES + END +END + +IDM_POPUP_USER MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "æ°ç¨æ·...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "æ´æ¢å¯ç ", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "åé¤", IDM_USER_DELETE + MENUITEM "éå½å", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "å±æ§", IDM_USER_PROPERTIES + END +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "ç¨æ·å¸æ·" + IDS_CPLDESCRIPTION "ç®¡çç¨æ·åç»ã" +END + +STRINGTABLE +BEGIN + IDS_NAME "åç§°" + IDS_FULLNAME "å¨å" + IDS_DESCRIPTION "æè¿°" +END Propchange: trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -57,3 +57,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/reactos/dll/cpl/wined3dcfg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/zh… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,39 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "çè²å¨", -1, 5, 25, 230, 80 + LTEXT "å¯ç¨ GLSL:", -1, 15, 42, 120, 10 + COMBOBOX IDC_GLSL, 135, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æé« GS æ°´å¹³:", -1, 15, 57, 120, 10 + COMBOBOX IDC_GSLEVEL, 135, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æé« PS æ°´å¹³:", -1, 15, 72, 120, 10 + COMBOBOX IDC_PSLEVEL, 135, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æé« VS æ°´å¹³:", -1, 15, 87, 120, 10 + COMBOBOX IDC_VSLEVEL, 135, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "æ¸²æ", -1, 5, 110, 230, 110 + LTEXT "å¤çº§éæ ·:", -1, 15, 127, 120, 10 + COMBOBOX IDC_MULTISAMPLING, 135, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "ä¸¥æ ¼ç»æ¬¡åº:", -1, 15, 142, 120, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 135, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "å±å¹å¤æ¸²æ:", -1, 15, 157, 120, 10 + COMBOBOX IDC_OFFSCREEN, 135, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æ»æ¯å±å¹å¤:", -1, 15, 172, 120, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 135, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "è§é¢ååå¤§å°:", -1, 15, 187, 120, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 135, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw æ¸²æå¨:", -1, 15, 202, 120, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 135, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "WineD3D éé¡¹" + IDS_CPLDESCRIPTION "éç½® WineD3D è¿è¡æ¶è®¾ç½®ã" +END Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -48,3 +48,6 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -83,3 +83,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/reactos/dll/win32/aclui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/zh-CN… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/zh-CN.rc (added) +++ trunk/reactos/dll/win32/aclui/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,33 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "å®å¨" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ç»æç¨æ·åç§°(&G):", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "ææè(&O):", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + PUSHBUTTON "æ·»å ...(&D)", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "å é¤(&R)", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "åè®¸", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "æç»", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "å¯¹äºç¹æ®æéæé«çº§è®¾ç½®ï¼è¯·åå»é«çº§ã", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "é«çº§(&V)", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE +BEGIN + IDS_PSP_TITLE "%1 ççæé" + IDS_UNKNOWN "æªç¥" + IDS_SPECIAL_PERMISSIONS "ç¹æ®æé" + IDS_PERMISSIONS_FOR "%1 ççæé" + IDS_PERMISSIONS "æé" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +END Propchange: trunk/reactos/dll/win32/aclui/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -91,3 +91,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc (added) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:13:53 2015 @@ -0,0 +1,294 @@ +/* + * Copyright 2009 Andrew Hill + * + * 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 + */ + +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +/* Menus */ + +IDM_CABINET_CONTEXTMENU MENUEX +BEGIN + POPUP "", 264,MFT_STRING,MFS_ENABLED + BEGIN + MENUITEM "æ åæé®(&S)", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED + MENUITEM "å°åæ (&A)", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "é¾æ¥(&L)", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "éå®å·¥å·æ (&B)", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED + MENUITEM "èªå®ä¹...(&C)", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "ææ¬æ ç¾(&T)", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED + MENUITEM "è½¬å°æé®(&G)", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED + END +END + +IDM_CABINET_MAINMENU MENUEX +BEGIN + POPUP "æä»¶(&F)", FCIDM_MENU_FILE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "å³é(&C)", IDM_FILE_CLOSE + END + POPUP "ç¼è¾(&E)", FCIDM_MENU_EDIT + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + POPUP "è§å¾(&V)", FCIDM_MENU_VIEW + BEGIN + POPUP "å·¥å·æ (&T)", IDM_VIEW_TOOLBARS + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "ç¶ææ (&B)", IDM_VIEW_STATUSBAR + POPUP "æµè§å¨æ (&E)", IDM_VIEW_EXPLORERBAR + BEGIN + MENUITEM "æç´¢(&S)\tCtrl+E", IDM_EXPLORERBAR_SEARCH + MENUITEM "æ¶èå¤¹(&F)\tCtrl+I", IDM_EXPLORERBAR_FAVORITES + MENUITEM "åªä½(&M)", IDM_EXPLORERBAR_MEDIA + MENUITEM "åå²(&H)\tCtrl+H", IDM_EXPLORERBAR_HISTORY + MENUITEM "æä»¶å¤¹(&O)", IDM_EXPLORERBAR_FOLDERS + MENUITEM "", IDM_EXPLORERBAR_SEPARATOR + END + MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR + POPUP "è½¬å°(&O)", FCIDM_MENU_EXPLORE + BEGIN + MENUITEM "åé(&B)\tAlt+Left Arrow", IDM_GOTO_BACK + MENUITEM "åè¿(&F)\tAlt+Right Arrow", IDM_GOTO_FORWARD + MENUITEM "ä¸ç§»ä¸çº§(&U)", IDM_GOTO_UPONELEVEL + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ä¸»é¡µ(&H)\tAlt+Home", IDM_GOTO_HOMEPAGE + END + MENUITEM "å·æ°(&R)", IDM_VIEW_REFRESH + END + POPUP "æ¶èå¤¹(&A)", FCIDM_MENU_FAVORITES + BEGIN + MENUITEM "æ·»å å°æ¶èå¤¹...(&A)", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "æ´çæ¶èå¤¹...(&O)", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "(ç©º)", IDM_FAVORITES_EMPTY + END + POPUP "å·¥å·(&T)", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "æ å°ç½ç»ç£ç...(&N)", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "æå¼ç½ç»ç£ç...(&D)", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "åæ¥...(&S)", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "æä»¶å¤¹éé¡¹...(&O)", IDM_TOOLS_FOLDEROPTIONS + END + POPUP "å¸®å©(&H)", FCIDM_MENU_HELP + BEGIN + MENUITEM "æ¤å¯æ¬ç ReactOS æ¯åæ³çåï¼(&L)", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "å³äº ReactOS(&A)", IDM_HELP_ABOUT + END +END + +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "å·¥å·æ (&T)", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "æ¡é¢(&D)", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "å¿«éå¯å¨(&Q)", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "æ°çå·¥å·æ ...(&N)", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + +/* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "åæ¶", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + +IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "ææ¬éé¡¹(&X):", -1, 4, 2, 48, 15 + COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "å¾æ éé¡¹(&N):", -1, 4, 20, 48, 15 + COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +/* Accelerators */ + +IDR_ACCELERATORS ACCELERATORS +BEGIN + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT + "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT + "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT + VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT + VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY + "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT + "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT + "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT + "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "æ£å¨åæ¶..." + IDS_REMAINING "å©ä½" +END + +STRINGTABLE +BEGIN + 800 "åå«ç¨äºå¤çæéçé¡¹ç®çå½ä»¤ã" +END + +STRINGTABLE +BEGIN + 864 "åå«ç¼è¾å½ä»¤ã" +END + +STRINGTABLE +BEGIN + 928 "åå«æä½è§å¾çå½ä»¤ã" +END + +STRINGTABLE +BEGIN + 992 "åå«å·¥å·å½ä»¤ã" +END + +STRINGTABLE +BEGIN + 1056 "åå«æ¾ç¤ºå¸®å©çå½ä»¤ã" +END + +STRINGTABLE +BEGIN + 9025 "å³éçªå£ã" + 9026 "åä¸ä¸ä¸ªçº§å«ã" +END + +STRINGTABLE +BEGIN + 9121 "è¿æ¥å°ç½ç»ç£çã" + 9122 "ä»ç½ç»ç£çæå¼è¿æ¥ã" +END + +STRINGTABLE +BEGIN + 9250 "æ¾ç¤ºç¨åºä¿¡æ¯ã çæ¬å·åçæä¿¡æ¯ã" + 9252 "æ¾ç¤ºè°è¯ä¿¡æ¯ã" +END + +STRINGTABLE +BEGIN + 9281 "è½¬å°åä¸é¡µã" + 9282 "è½¬å°ä¸ä¸ä¸ªé¡µé¢ã" + 9283 "ä½¿æ¨è½å¤æ´æ¹è®¾ç½®ã" + 9285 "è½¬å°æ¨çä¸»é¡µã" +END + +STRINGTABLE +BEGIN + 9362 "æå¼æ¶èå¤¹æä»¶å¤¹ã" + 9363 "å°å½åé¡µæ·»å å°æ¨çæ¶èå¤¹åè¡¨ã" +END + +STRINGTABLE +BEGIN + 9505 "æ¾ç¤ºæéèå·¥å·æ ã" + 9506 "æ¾ç¤ºæéèç¶ææ ã" + 9508 "æ¾ç¤ºæ åæé®å·¥å·æ ã" + 9509 "æ¾ç¤ºå°åæ ã" + 9510 "æ¾ç¤ºå¿«éé¾æ¥æ ã" + 9516 "éå®çå¤§å°åä½ç½®çå·¥å·æ ã" +END + +STRINGTABLE +BEGIN + 9533 "èªå®ä¹å·¥å·æ ã" +END + +STRINGTABLE +BEGIN + 9552 "æ¾ç¤ºæéèä¸ä¸ªæµè§å¨æ ã" + 9553 "æ¾ç¤ºæç´¢æ ã" + 9554 "æ¾ç¤ºæ¶èå¤¹æ ã" + 9555 "æ¾ç¤ºåå²è®°å½æ ã" + 9557 "æ¾ç¤ºæä»¶å¤¹æ ã" + 9559 "æ¾ç¤ºåªä½æ ã" +END + +STRINGTABLE +BEGIN + IDS_SMALLICONS "å°å¾æ " + IDS_LARGEICONS "å¤§å¾æ " + IDS_SHOWTEXTLABELS "æ¾ç¤ºææ¬æ ç¾" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "æ²¡æææ¬æ ç¾" + IDS_SELECTIVETEXTONRIGHT "å³ä¾§éæ©æ§ææ¬" +END + +STRINGTABLE +BEGIN + IDS_GOBUTTONLABEL "|å»||" + IDS_GOBUTTONTIPTEMPLATE "è½¬å° ""%s""" +END + +STRINGTABLE +BEGIN + IDS_SEARCHLABEL "æç´¢" + IDS_ADDRESSBANDLABEL "å°å(&D)" +END + +STRINGTABLE +BEGIN + IDS_FOLDERSLABEL "æä»¶å¤¹" +END + +STRINGTABLE +BEGIN + IDS_HISTORYTEXT "åå²(&H)\tCtrl+H" +END + +STRINGTABLE +BEGIN + IDS_UP "åä¸" +END + +STRINGTABLE +BEGIN + IDS_BACK "åé" + IDS_FORWARD "åè¿" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|åé|åè¿|åä¸|æç´¢|æä»¶å¤¹|ç§»å¨å°|å¤å¶å°|å é¤|æ¤æ¶|è§å¾|åæ¢|å·æ°|é¦é¡µ|æ å°ç£ç|æå¼è¿æ¥|æ¶èå¤¹|åå²|å¨å±å¹|å±æ§|åªä¸|å¤å¶|è´´ä¸|æä»¶å¤¹éé¡¹||" +END Propchange: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67992: [ROSAPPS] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #comment ROSApps patch applied
by dreimer＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: dreimer Date: Mon Jun 1 17:11:00 2015 New Revision: 67992 URL: http://svn.reactos.org/svn/reactos?rev=67992&view=rev Log: [ROSAPPS] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #comment ROSApps patch applied Added: trunk/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/circles/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/matrix/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc (with props) trunk/rosapps/applications/screensavers/starfield/lang/zh-CN.rc (with props) Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/maze.rc trunk/rosapps/applications/screensavers/ssstars/resource.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc Added: trunk/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,9 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ç©ºç½å±å¹" + IDS_TEXT "æ²¡æéæ©éè¦ä¸ºå¶è®¾ç½®ã" +END Propchange: trunk/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -53,3 +53,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,36 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è´è¶å±å¹ä¿æ¤ç¨åºè®¾ç½®" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ç¡®å®",IDOK,7,35,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,61,35,50,14 + CONTROL "æè½¬è´è¶",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "å³äº",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "å³äº" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ç¡®å®",IDOK,48,58,56,14 + CTEXT "è´è¶å±å¹ä¿æ¤ç¨åº",IDC_STATIC,7,7,135,9 + CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "è´è¶å±å¹ä¿æ¤ç¨åº" +END Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -36,3 +36,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -42,3 +42,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/circles/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,9 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "åå" + IDS_TEXT "æ²¡æéæ©éè¦ä¸ºå¶è®¾ç½®ã" +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -54,3 +54,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,10 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "åçå½¢" + IDS_TITLE "å³äº" + IDS_TEXT "åçå½¢ by unC0Rr.\nSpecial for ReactOS." +END Propchange: trunk/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/matrix/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/matrix/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,55 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +#include "resource.h" + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_CONFIG DIALOGEX DISCARDABLE 0, 0, 340, 183 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix å±å¹ä¿æ¤ç¨åºéç½®" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "è§£ç éåº¦(&S)",IDC_STATIC,7,7,128,36 + LTEXT "è¾æ¢",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "è¾å¿«",IDC_STATIC,104,24,20,8 + GROUPBOX "Cypher å¯åº¦(&D)",IDC_STATIC,7,50,128,36 + LTEXT "è¾å°",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "è¾å¤",IDC_STATIC,104,67,23,8 + GROUPBOX "æ¶æ¯æ¾ç¤ºéåº¦(&M)",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "è¾æ¢",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "è¾å¿«",IDC_STATIC,104,110,22,8 + GROUPBOX "åä½å¤§å°(&F)",IDC_STATIC,7,137,127,36 + LTEXT "è¾å°",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "è¾å¤§",IDC_STATIC,104,153,25,8 + GROUPBOX "ç¼ç çæ¶æ¯(&C)",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "æ·»å (&A)",IDC_ADD,280,41,44,18 + PUSHBUTTON "å é¤(&R)",IDC_REMOVE,280,66,44,18 + CONTROL "éæºæ¶æ¯(&N)",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "ç¡®å®",IDOK,222,162,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,283,162,50,14 + LTEXT "åä½åç§°(&F):",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "å ç²åä½(&B)",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Matrix å±å¹ä¿æ¤ www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix å±å¹ä¿æ¤" +END Propchange: trunk/rosapps/applications/screensavers/matrix/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -51,3 +51,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,47 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¿·å®«å±å¹ä¿æ¤ç¨åºè®¾ç½®" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "è¿·å®«å¤§å°ï¼",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12 + CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "åè§£å³å»¶è¿ï¼",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE + CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12 + CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "åè§£å³å»¶è¿ï¼",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE + CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12 + CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "è§£å³å»¶è¿ï¼",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE + CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12 + CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + DEFPUSHBUTTON "ç¡®å®",IDOK,59,91,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,113,91,50,14 + PUSHBUTTON "å³äº",IDABOUT,167,91,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 229, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "å³äº" +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "è¿·å®«çå±å¹ä¿æ¤ç¨åº 1.0",IDC_STATIC,7,7,215,9 + LTEXT "[06-21-85] Martin Weiss - åå§ä»£ç ",IDC_STATIC,7,20,215,8 + LTEXT "[01-29-88] Dave Lemke - Hacked for X11",IDC_STATIC,7,29,215,8 + LTEXT "[10-04-88] Richard Hess - UnHacked for X11",IDC_STATIC,7,38,215,8 + LTEXT "[03-03-93] Jim Randell - UnHacked for X11",IDC_STATIC,7,47,215,8 + LTEXT "[03-07-93] Jamie Zawinski - æ¸çåä»£ç çæ´æ´",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - ç§»æ¤å° Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - ç§»æ¤å° ReactOS",IDC_STATIC,7,74,215,8 + CTEXT "æ¿ä½ å®æ¯ Ge van Geldorp, æä»¬æ³å¿µä½ ï¼",IDC_STATIC,7,87,215,10,SS_SUNKEN + DEFPUSHBUTTON "ç¡®å®",IDOK,87,100,56,14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "è¿·å®«çå±å¹ä¿æ¤ç¨åº" +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -27,3 +27,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,54 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +// Dialog + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 292, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "è®¾ç½®" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "éé¡¹",IDC_STATIC,16,100,260,76 + RTEXT "æææ°ç®:",IDC_STATIC,24,116,68,12, + SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_NUM_OF_STARS,"msctls_trackbar32", + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,96,116,140,12 + CTEXT "Static",IDC_TEXT_NUM_OF_STARS,240,116,24,12, + SS_CENTERIMAGE,WS_EX_STATICEDGE + RTEXT "éåº¦:",IDC_STATIC,24,137,68,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SPEED,"msctls_trackbar32",TBS_BOTH | + TBS_NOTICKS | WS_TABSTOP,96,137,140,12 + CTEXT "Static",IDC_TEXT_SPEED,240,137,24,12,SS_CENTERIMAGE, + WS_EX_STATICEDGE + RTEXT "æè½¬:",IDC_STATIC,24,156,68,12,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_ROTATION,100,156,80,60,CBS_DROPDOWNLIST | + WS_TABSTOP + CONTROL "",IDC_IMAGE_COSMOS,"Static",SS_BITMAP | SS_CENTERIMAGE, + 4,4,284,92 + GROUPBOX "é«çº§",IDC_STATIC,16,180,260,72 + CONTROL "å¯ç¨èæ¯æ··å",IDC_CHECK_DOBLENDING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 + CONTROL "å¯ç¨åç¡®çè§åº¦æ ¡æ£", + IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,24,208,160,10 + CONTROL "å¯ç¨çº¹çè¿æ»¤",IDC_CHECK_FILTERING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 + CONTROL "å¯ç¨åæ»çè²",IDC_CHECK_SHADING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 + PUSHBUTTON "ç¡®å®",IDOK,60,260,52,16 + PUSHBUTTON "åæ¶",IDCANCEL,120,260,52,16 + PUSHBUTTON "å³äº",IDC_BUTTON_ABOUT,179,260,52,16 +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "æç©º" + IDS_ROTATION_NONE "æ " + IDS_ROTATION_LINEAR "çº¿æ§" + IDS_ROTATION_PERIODIC "å®æ" + IDS_LICENSE "æç©ºæ¯ GNU GPL è®¸å¯è¯ä¸åå¸çåè´¹è½¯ä»¶ã" + IDS_AUTHOR "å¼åèï¼Carlo Bramini" +END Propchange: trunk/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/ssstars/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -63,3 +63,6 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Added: trunk/rosapps/applications/screensavers/starfield/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/screensavers/starfield/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -0,0 +1,10 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "æç©ºå±å¹ä¿æ¤ç¨åº" + IDS_TITLE "å³äº" + IDS_TEXT "æ²¡æéæ©éè¦ä¸ºå¶è®¾ç½®ã" +END Propchange: trunk/rosapps/applications/screensavers/starfield/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] Mon Jun 1 17:11:00 2015 @@ -54,3 +54,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs