Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/06: [VFATFS] Return 'FATX' as FsType for FATX volumes
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b935bfe6cb4b675af10d3… commit b935bfe6cb4b675af10d39835db8bcae7a5d41d8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:15:27 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Return 'FATX' as FsType for FATX volumes CORE-16373 --- drivers/filesystems/vfatfs/volume.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/vfatfs/volume.c b/drivers/filesystems/vfatfs/volume.c index e1eba1fd2a7..d1f10d05646 100644 --- a/drivers/filesystems/vfatfs/volume.c +++ b/drivers/filesystems/vfatfs/volume.c @@ -100,13 +100,14 @@ FsdGetFsAttributeInformation( ASSERT(*BufferLength >= sizeof(FILE_FS_ATTRIBUTE_INFORMATION)); *BufferLength -= FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName); - if (DeviceExt->FatInfo.FatType == FAT32) + switch (DeviceExt->FatInfo.FatType) { - pName = L"FAT32"; - } - else - { - pName = L"FAT"; + case FAT12: pName = L"FAT"; break; + case FAT16: pName = L"FAT"; break; + case FAT32: pName = L"FAT32"; break; + case FATX16: pName = L"FATX"; break; + case FATX32: pName = L"FATX"; break; + default: return STATUS_NOT_SUPPORTED; } Length = wcslen(pName) * sizeof(WCHAR);

1 0

[reactos] 02/06: [VFATFS] Use device name FatX, to not collide with fastfat.sys
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15ea99777455b66042d70… commit 15ea99777455b66042d708ea0eb794891eb536a9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 22:37:04 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Use device name FatX, to not collide with fastfat.sys CORE-16373 --- drivers/filesystems/vfatfs/iface.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/filesystems/vfatfs/iface.c b/drivers/filesystems/vfatfs/iface.c index d09365d09f5..6ed08d0ab1f 100644 --- a/drivers/filesystems/vfatfs/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -52,7 +52,7 @@ DriverEntry( IN PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\FatX"); NTSTATUS Status; UNREFERENCED_PARAMETER(RegistryPath); @@ -64,20 +64,6 @@ DriverEntry( 0, FALSE, &DeviceObject); - if (Status == STATUS_OBJECT_NAME_EXISTS || - Status == STATUS_OBJECT_NAME_COLLISION) - { - /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ - RtlInitUnicodeString(&DeviceName, L"\\RosFat"); - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - } - if (!NT_SUCCESS(Status)) { return Status;

1 0

[reactos] 01/06: [VFATFS] Add it back to build on XBOX, with the name vfatfs.sys
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14c39362513da8bd064a4… commit 14c39362513da8bd064a4816cb1fe5209398a881 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 22:31:22 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Add it back to build on XBOX, with the name vfatfs.sys Adapt some comments to new name. CORE-16373 --- drivers/filesystems/CMakeLists.txt | 2 +- drivers/filesystems/fastfat/CMakeLists.txt | 35 -------------------- drivers/filesystems/vfatfs/CMakeLists.txt | 38 ++++++++++++++++++++++ drivers/filesystems/{fastfat => vfatfs}/blockdev.c | 0 drivers/filesystems/{fastfat => vfatfs}/cleanup.c | 0 drivers/filesystems/{fastfat => vfatfs}/close.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/create.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/dir.c | 0 drivers/filesystems/{fastfat => vfatfs}/direntry.c | 0 drivers/filesystems/{fastfat => vfatfs}/dirwr.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/ea.c | 0 drivers/filesystems/{fastfat => vfatfs}/fastio.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/fat.c | 4 +-- drivers/filesystems/{fastfat => vfatfs}/fcb.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/finfo.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/flush.c | 0 drivers/filesystems/{fastfat => vfatfs}/fsctl.c | 0 drivers/filesystems/{fastfat => vfatfs}/iface.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/kdbg.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/misc.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/pnp.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/rw.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/shutdown.c | 0 drivers/filesystems/{fastfat => vfatfs}/string.c | 0 drivers/filesystems/{fastfat => vfatfs}/vfat.h | 6 ++-- .../filesystems/{fastfat => vfatfs}/vfat005.1st | 0 .../filesystems/{fastfat => vfatfs}/vfat_fr.txt | 0 drivers/filesystems/{fastfat => vfatfs}/vfatfs.rc | 0 drivers/filesystems/vfatfs/vfatfs_reg.inf | 7 ++++ drivers/filesystems/{fastfat => vfatfs}/volume.c | 0 30 files changed, 62 insertions(+), 52 deletions(-) diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt index 471a7d873f5..05add682ad3 100644 --- a/drivers/filesystems/CMakeLists.txt +++ b/drivers/filesystems/CMakeLists.txt @@ -2,7 +2,6 @@ add_subdirectory(btrfs) add_subdirectory(cdfs) add_subdirectory(ext2) -#add_subdirectory(fastfat) add_subdirectory(fastfat_new) add_subdirectory(fs_rec) add_subdirectory(msfs) @@ -11,3 +10,4 @@ add_subdirectory(nfs) add_subdirectory(npfs) add_subdirectory(ntfs) add_subdirectory(udfs) +add_subdirectory(vfatfs) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt deleted file mode 100644 index 4eb78bf29a6..00000000000 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -list(APPEND SOURCE - blockdev.c - cleanup.c - close.c - create.c - dir.c - direntry.c - dirwr.c - ea.c - fat.c - fastio.c - fcb.c - finfo.c - flush.c - fsctl.c - iface.c - kdbg.c - misc.c - pnp.c - rw.c - shutdown.c - string.c - volume.c - vfat.h) - -if(KDBG) - add_definitions(-DKDBG) -endif() -add_library(fastfat MODULE ${SOURCE} vfatfs.rc) -set_module_type(fastfat kernelmodedriver) -target_link_libraries(fastfat ${PSEH_LIB}) -add_importlibs(fastfat ntoskrnl hal) -add_pch(fastfat vfat.h SOURCE) -add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/filesystems/vfatfs/CMakeLists.txt b/drivers/filesystems/vfatfs/CMakeLists.txt new file mode 100644 index 00000000000..7e0c7d56ee4 --- /dev/null +++ b/drivers/filesystems/vfatfs/CMakeLists.txt @@ -0,0 +1,38 @@ + +list(APPEND SOURCE + blockdev.c + cleanup.c + close.c + create.c + dir.c + direntry.c + dirwr.c + ea.c + fat.c + fastio.c + fcb.c + finfo.c + flush.c + fsctl.c + iface.c + kdbg.c + misc.c + pnp.c + rw.c + shutdown.c + string.c + volume.c + vfat.h) + +if(KDBG) + add_definitions(-DKDBG) +endif() +add_library(vfatfs MODULE ${SOURCE} vfatfs.rc) +set_module_type(vfatfs kernelmodedriver) +target_link_libraries(vfatfs ${PSEH_LIB}) +add_importlibs(vfatfs ntoskrnl hal) +add_pch(vfatfs vfat.h SOURCE) +if(SARCH STREQUAL "xbox") + add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) + add_registry_inf(vfatfs_reg.inf) +endif() diff --git a/drivers/filesystems/fastfat/blockdev.c b/drivers/filesystems/vfatfs/blockdev.c similarity index 100% rename from drivers/filesystems/fastfat/blockdev.c rename to drivers/filesystems/vfatfs/blockdev.c diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/vfatfs/cleanup.c similarity index 100% rename from drivers/filesystems/fastfat/cleanup.c rename to drivers/filesystems/vfatfs/cleanup.c diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/vfatfs/close.c similarity index 99% rename from drivers/filesystems/fastfat/close.c rename to drivers/filesystems/vfatfs/close.c index 57efdad97a6..aa19c1ed505 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/vfatfs/close.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/close.c + * FILE: drivers/filesystems/vfatfs/close.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/vfatfs/create.c similarity index 99% rename from drivers/filesystems/fastfat/create.c rename to drivers/filesystems/vfatfs/create.c index 0de08a9dd78..32c39f11361 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/vfatfs/create.c @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/create.c + * FILE: drivers/filesystems/vfatfs/create.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/vfatfs/dir.c similarity index 100% rename from drivers/filesystems/fastfat/dir.c rename to drivers/filesystems/vfatfs/dir.c diff --git a/drivers/filesystems/fastfat/direntry.c b/drivers/filesystems/vfatfs/direntry.c similarity index 100% rename from drivers/filesystems/fastfat/direntry.c rename to drivers/filesystems/vfatfs/direntry.c diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/vfatfs/dirwr.c similarity index 99% rename from drivers/filesystems/fastfat/dirwr.c rename to drivers/filesystems/vfatfs/dirwr.c index e7a260422ce..99d4f8946a0 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/vfatfs/dirwr.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/dirwr.c + * FILE: drivers/filesystems/vfatfs/dirwr.c * PURPOSE: VFAT Filesystem : write in directory * PROGRAMMER: Rex Jolliff (rex(a)lvcablemodem.com) * Herve Poussineau (reactos(a)poussine.freesurf.fr) diff --git a/drivers/filesystems/fastfat/ea.c b/drivers/filesystems/vfatfs/ea.c similarity index 100% rename from drivers/filesystems/fastfat/ea.c rename to drivers/filesystems/vfatfs/ea.c diff --git a/drivers/filesystems/fastfat/fastio.c b/drivers/filesystems/vfatfs/fastio.c similarity index 99% rename from drivers/filesystems/fastfat/fastio.c rename to drivers/filesystems/vfatfs/fastio.c index 6404ab448ae..5db742b3a7c 100644 --- a/drivers/filesystems/fastfat/fastio.c +++ b/drivers/filesystems/vfatfs/fastio.c @@ -1,5 +1,5 @@ /* - * FILE: drivers/filesystems/fastfat/fastio.c + * FILE: drivers/filesystems/vfatfs/fastio.c * PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/vfatfs/fat.c similarity index 99% rename from drivers/filesystems/fastfat/fat.c rename to drivers/filesystems/vfatfs/fat.c index b6e62c68fcc..e32f279991f 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/vfatfs/fat.c @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/fat.c - * PURPOSE: FastFAT Filesystem + * FILE: drivers/filesystems/vfatfs/fat.c + * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) * diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/vfatfs/fcb.c similarity index 99% rename from drivers/filesystems/fastfat/fcb.c rename to drivers/filesystems/vfatfs/fcb.c index a791c27a40d..6fd76071678 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -1,5 +1,5 @@ /* -* FILE: drivers/filesystems/fastfat/fcb.c +* FILE: drivers/filesystems/vfatfs/fcb.c * PURPOSE: Routines to manipulate FCBs. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/vfatfs/finfo.c similarity index 99% rename from drivers/filesystems/fastfat/finfo.c rename to drivers/filesystems/vfatfs/finfo.c index ab5591e4b12..a4ddc72f6bb 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/vfatfs/finfo.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/finfo.c + * FILE: drivers/filesystems/vfatfs/finfo.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Herve Poussineau (reactos(a)poussine.freesurf.fr) diff --git a/drivers/filesystems/fastfat/flush.c b/drivers/filesystems/vfatfs/flush.c similarity index 100% rename from drivers/filesystems/fastfat/flush.c rename to drivers/filesystems/vfatfs/flush.c diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/vfatfs/fsctl.c similarity index 100% rename from drivers/filesystems/fastfat/fsctl.c rename to drivers/filesystems/vfatfs/fsctl.c diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/vfatfs/iface.c similarity index 98% rename from drivers/filesystems/fastfat/iface.c rename to drivers/filesystems/vfatfs/iface.c index 9b3294211f3..d09365d09f5 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -154,7 +154,7 @@ DriverEntry( BOOLEAN Registered; Registered = KdRosRegisterCliCallback(vfatKdbgHandler); - DPRINT1("FastFAT KDBG extension registered: %s\n", (Registered ? "yes" : "no")); + DPRINT1("VFATFS KDBG extension registered: %s\n", (Registered ? "yes" : "no")); } #endif diff --git a/drivers/filesystems/fastfat/kdbg.c b/drivers/filesystems/vfatfs/kdbg.c similarity index 98% rename from drivers/filesystems/fastfat/kdbg.c rename to drivers/filesystems/vfatfs/kdbg.c index ef2ded50de4..3582c7dcdae 100644 --- a/drivers/filesystems/fastfat/kdbg.c +++ b/drivers/filesystems/vfatfs/kdbg.c @@ -1,5 +1,5 @@ /* -* FILE: drivers/filesystems/fastfat/kdbg.c +* FILE: drivers/filesystems/vfatfs/kdbg.c * PURPOSE: KDBG extension. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/vfatfs/misc.c similarity index 99% rename from drivers/filesystems/fastfat/misc.c rename to drivers/filesystems/vfatfs/misc.c index 76b17f1db36..127851ba9bf 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/vfatfs/misc.c @@ -518,7 +518,7 @@ VfatCheckForDismount( * It seems to be related to the fact that the volume root directory as * well as auxiliary data stream(s) are still opened, and only these are * allowed to be opened at that moment. After analysis it appears that for - * the ReactOS' fastfat, this number is equal to "2". + * the ReactOS' vfatfs, this number is equal to "2". */ UnCleanCount = 2; diff --git a/drivers/filesystems/fastfat/pnp.c b/drivers/filesystems/vfatfs/pnp.c similarity index 95% rename from drivers/filesystems/fastfat/pnp.c rename to drivers/filesystems/vfatfs/pnp.c index afc02f9c89a..6a07e7e90a2 100644 --- a/drivers/filesystems/fastfat/pnp.c +++ b/drivers/filesystems/vfatfs/pnp.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/pnp.c + * FILE: drivers/filesystems/vfatfs/pnp.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Pierre Schweitzer * diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/vfatfs/rw.c similarity index 99% rename from drivers/filesystems/fastfat/rw.c rename to drivers/filesystems/vfatfs/rw.c index 0afebafe893..66caebdc850 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/vfatfs/rw.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/rw.c + * FILE: drivers/filesystems/vfatfs/rw.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/vfatfs/shutdown.c similarity index 100% rename from drivers/filesystems/fastfat/shutdown.c rename to drivers/filesystems/vfatfs/shutdown.c diff --git a/drivers/filesystems/fastfat/string.c b/drivers/filesystems/vfatfs/string.c similarity index 100% rename from drivers/filesystems/fastfat/string.c rename to drivers/filesystems/vfatfs/string.c diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/vfatfs/vfat.h similarity index 99% rename from drivers/filesystems/fastfat/vfat.h rename to drivers/filesystems/vfatfs/vfat.h index 4e51b5ce34a..a40fcd82cf3 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/vfatfs/vfat.h @@ -1,5 +1,5 @@ -#ifndef _FASTFAT_PCH_ -#define _FASTFAT_PCH_ +#ifndef _VFATFS_PCH_ +#define _VFATFS_PCH_ #include <ntifs.h> #include <ntdddisk.h> @@ -1241,4 +1241,4 @@ NTSTATUS VfatSetVolumeInformation( PVFAT_IRP_CONTEXT IrpContext); -#endif /* _FASTFAT_PCH_ */ +#endif /* _VFATFS_PCH_ */ diff --git a/drivers/filesystems/fastfat/vfat005.1st b/drivers/filesystems/vfatfs/vfat005.1st similarity index 100% rename from drivers/filesystems/fastfat/vfat005.1st rename to drivers/filesystems/vfatfs/vfat005.1st diff --git a/drivers/filesystems/fastfat/vfat_fr.txt b/drivers/filesystems/vfatfs/vfat_fr.txt similarity index 100% rename from drivers/filesystems/fastfat/vfat_fr.txt rename to drivers/filesystems/vfatfs/vfat_fr.txt diff --git a/drivers/filesystems/fastfat/vfatfs.rc b/drivers/filesystems/vfatfs/vfatfs.rc similarity index 100% rename from drivers/filesystems/fastfat/vfatfs.rc rename to drivers/filesystems/vfatfs/vfatfs.rc diff --git a/drivers/filesystems/vfatfs/vfatfs_reg.inf b/drivers/filesystems/vfatfs/vfatfs_reg.inf new file mode 100644 index 00000000000..ffa46498522 --- /dev/null +++ b/drivers/filesystems/vfatfs/vfatfs_reg.inf @@ -0,0 +1,7 @@ +; Virtual FATX filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ImagePath",0x00020000,"system32\drivers\vfatfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Type",0x00010001,0x00000002 diff --git a/drivers/filesystems/fastfat/volume.c b/drivers/filesystems/vfatfs/volume.c similarity index 100% rename from drivers/filesystems/fastfat/volume.c rename to drivers/filesystems/vfatfs/volume.c

1 0

[reactos] 01/01: [CPL][OPENGLCFG] Add Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=555bec6a49dffd2594257… commit 555bec6a49dffd2594257604269c7a08e3058cf0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:15:51 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:15:51 2022 +0900 [CPL][OPENGLCFG] Add Japanese translation (ja-JP) --- dll/cpl/openglcfg/lang/ja-JP.rc | 28 ++++++++++++++++++++++++++++ dll/cpl/openglcfg/openglcfg.rc | 3 +++ 2 files changed, 31 insertions(+) diff --git a/dll/cpl/openglcfg/lang/ja-JP.rc b/dll/cpl/openglcfg/lang/ja-JP.rc new file mode 100644 index 00000000000..c4b4d950aa5 --- /dev/null +++ b/dll/cpl/openglcfg/lang/ja-JP.rc @@ -0,0 +1,28 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "��ʐݒ�" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "��_��[�ݒ�", -1, 5, 25, 230, 90 + LTEXT "��_��[(&R):", -1, 15, 42, 37, 10 + COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "��ɂ��A�O��t�B�b�N �h��C�o�[�̃f�t�H��g�ݒ肪�㏑��܂��B�u�f�t�H��g�v��I��ƁA��̐ݒ�ɖ߂�܂��B", -1, 15, 60, 210, 40 + GROUPBOX "�f�o�b�O", -1, 5, 125, 230, 90 + LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 + COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "opengl32 ��̃f�o�b�O�o�͂�L��/��ɂ��܂��B\n\n�x��: �u�ݒ�v�܂��́u�N��A�v��I��ƁADEBUGCHANNEL ��ϐ��̓�e��㏑��܂��B", -1, 15, 165, 210, 40 +END + +STRINGTABLE +BEGIN + IDS_RENDERER_DEFAULT "�V�X�e�� f�t�H��g" + IDS_RENDERER_RSWR "ReactOS �\�t�g�E�F�A��" + IDS_CPLNAME "OpenGL �ݒ�" + IDS_CPLDESCRIPTION "OpenGL ��_��[�̐ݒ��ύX��܂�" + IDS_DEBUG_SET "�ݒ�" + IDS_DEBUG_CLEAR "�N��A" + IDS_DEBUG_DNM "�ύX��Ȃ�" +END diff --git a/dll/cpl/openglcfg/openglcfg.rc b/dll/cpl/openglcfg/openglcfg.rc index 4e2b1292b98..01d9ac887cd 100644 --- a/dll/cpl/openglcfg/openglcfg.rc +++ b/dll/cpl/openglcfg/openglcfg.rc @@ -30,6 +30,9 @@ IDI_CPLICON ICON "resources/openglcfg.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [CPL][MMSYS] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b77b7919a123a0667e687… commit b77b7919a123a0667e687a8b1824c37b981a6932 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:12:08 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:12:08 2022 +0900 [CPL][MMSYS] Improve Japanese translation (ja-JP) --- dll/cpl/mmsys/lang/ja-JP.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index cedeb2a05fb..55b6bbea673 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -234,13 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "コンピューターの音声スキームを変更するか、スピーカーと録音デバイスの設定を変更します。" IDS_NO_SOUND "(なし)" IDS_NO_DEVICES "デバイスがありません" - IDS_SPEAKER_VOLUME "Speaker Volume" - IDS_SPEAKER_LEFT "&Left:" - IDS_SPEAKER_RIGHT "&Right:" - IDS_SPEAKER_CENTER "&Center:" - IDS_SPEAKER_BACK_LEFT "&Back left:" - IDS_SPEAKER_BACK_RIGHT "B&ack right:" - IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" + IDS_SPEAKER_VOLUME "スピーカー音量" + IDS_SPEAKER_LEFT "左(&L):" + IDS_SPEAKER_RIGHT "右(&R):" + IDS_SPEAKER_CENTER "中央(&C):" + IDS_SPEAKER_BACK_LEFT "左後ろ(&B):" + IDS_SPEAKER_BACK_RIGHT "右後ろ(&A):" + IDS_SPEAKER_LOW_FREQUENCY "低周波数(&F):" 5825 "プログラムエラー" 5826 "プログラムを閉じる" 5827 "重大なバッテリー警告音" @@ -271,6 +271,6 @@ BEGIN IDS_REACTOS_LOGOFF "ReactOSログオフ" IDS_REACTOS_LOGON "ReactOSログオン" 5854 "ReactOSエクスプローラー" - IDS_BROWSE_FOR_SOUND "Search for new sounds" - IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" + IDS_BROWSE_FOR_SOUND "新しい音声を探す" + IDS_WAVE_FILES_FILTER "音声ファイル (*.wav)|*.wav|" END

1 0

[reactos] 01/01: [CPL][LICCPA] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ee308d700b1b793d9b6a… commit 8ee308d700b1b793d9b6a720b2bf18b842ae378c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:09:12 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:09:12 2022 +0900 [CPL][LICCPA] Improve Japanese translation (ja-JP) --- dll/cpl/liccpa/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/liccpa/lang/ja-JP.rc b/dll/cpl/liccpa/lang/ja-JP.rc index 72e5fef8d55..08eec4db16d 100644 --- a/dll/cpl/liccpa/lang/ja-JP.rc +++ b/dll/cpl/liccpa/lang/ja-JP.rc @@ -23,5 +23,5 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "ライセンスマネージャ" IDS_CPLDESCRIPTION_1 "ライセンスマネージャ" - IDS_REACTOS "ReactOS - FreeSoftware" + IDS_REACTOS "ReactOS - フリーソフト" END

1 0

[reactos] 01/01: [HOTPLUG] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48141d2eb69b491948e94… commit 48141d2eb69b491948e94f17f180d8000b1e1e43 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:07:03 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:07:03 2022 +0900 [HOTPLUG] Improve Japanese translation (ja-JP) --- dll/cpl/hotplug/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc index 25baa56a559..c2a9c356d50 100644 --- a/dll/cpl/hotplug/lang/ja-JP.rc +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 CAPTION "" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 LTEXT "取り外したいデバイスを選択して停止をクリックして下さい。デバイスが安全に取り外せるようになったら ReactOS があなたに通知します。", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -35,5 +35,5 @@ END STRINGTABLE BEGIN IDS_CPLNAME "安全なハードウェアの取り外し" - IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_CPLDESCRIPTION "コンピュータからデバイスを安全に取り外しできます。" END

1 0

[reactos] 01/01: [JOY] Add Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a509f9a30d15260963275… commit a509f9a30d152609632754e26ed2c469f0c7ffab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:03:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:03:59 2022 +0900 [JOY] Add Japanese translation (ja-JP) --- dll/cpl/joy/joy.rc | 3 ++ dll/cpl/joy/lang/ja-JP.rc | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dll/cpl/joy/joy.rc b/dll/cpl/joy/joy.rc index 8368fe7e2d9..c8eea60a3bc 100644 --- a/dll/cpl/joy/joy.rc +++ b/dll/cpl/joy/joy.rc @@ -48,6 +48,9 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/cpl/joy/lang/ja-JP.rc b/dll/cpl/joy/lang/ja-JP.rc new file mode 100644 index 00000000000..e66087d3744 --- /dev/null +++ b/dll/cpl/joy/lang/ja-JP.rc @@ -0,0 +1,85 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ゲームコントローラ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "これらの設定は、コンピューターにインストールされているゲームコントローラを構成するのに役立ちます。", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "インストール済みコントローラ(&N)", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "追加(&A)...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "削除(&R)", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "プロパティ(&P)", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "詳細設定(&D)...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "ﾄﾗﾌﾞﾙｼｭｰﾃｨﾝｸﾞ(&T)...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ゲームコントローラの追加" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "以下のリストからゲームコントローラを選択し、[OK] をクリックして下さい。ゲームコントローラが一覧にない場合は、[カスタム] をクリックして下さい。", -1, 35, 7, 210, 33 + LTEXT "コントローラ(&G):", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "ゲームポート(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "カスタム(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "カスタムゲームコントローラ" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "特性", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "ジョイスティック(&J)", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "フライトヨークまたはフライトスティック(&F)", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "ゲームパット(&G)", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "レースカーコントローラ(&R)", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "軸(&A)", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "ラダー/ペダル", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z 軸", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "ボタン(&B)", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "視点コントロールを含む(&P)", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "コントローラ名(&O):", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "詳細設定" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 163, 65, 50, 14 + LTEXT "古いプログラムで使用するデバイスを選択して下さい。", -1, 7, 7, 208, 10 + LTEXT "好ましいデバイス(&P):", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ゲームコントローラ" + IDS_CPLSYSTEMDESCRIPTION "ジョイスティックやゲームパッドなどのゲームコントローラハードウェアを追加、削除または構成します。" + IDS_CONTROLLER "コントローラ" + IDS_STATUS "状態" + IDS_NONE "(なし)" +END

1 0

[reactos] 01/01: [SHIMGVW] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f1c77c8752e135af8809… commit 7f1c77c8752e135af88095e985b46d35bcc5031c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 12:33:22 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 12:33:22 2022 +0900 [SHIMGVW] Improve Japanese translation (ja-JP) --- dll/win32/shimgvw/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/shimgvw/lang/ja-JP.rc b/dll/win32/shimgvw/lang/ja-JP.rc index 46c024fb7d2..5f3cd2dbc45 100644 --- a/dll/win32/shimgvw/lang/ja-JP.rc +++ b/dll/win32/shimgvw/lang/ja-JP.rc @@ -9,9 +9,9 @@ BEGIN /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "次の画像" IDS_TOOLTIP_PREV_PIC "前の画像" - IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl+B)" - IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl+A)" - IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_BEST_FIT "ウィンドウに合わせる (Ctrl+B)" + IDS_TOOLTIP_REAL_SIZE "実寸大 (Ctrl+A)" + IDS_TOOLTIP_SLIDE_SHOW "スライドショーの開始 (F11)" IDS_TOOLTIP_ZOOM_IN "ズームイン (+)" IDS_TOOLTIP_ZOOM_OUT "ズームアウト (-)" IDS_TOOLTIP_ROT_CLOCKW "時計回りに回転 (Ctrl+K)" @@ -19,8 +19,8 @@ BEGIN IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "印刷 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "名前を付けて保存... (Ctrl+S)" - IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" - IDS_TOOLTIP_HELP_TOC "Help topics (F1)" + IDS_TOOLTIP_MODIFY "変更 (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "ヘルプトピックス (F1)" END STRINGTABLE

1 0

[reactos] 01/01: [SHELL32] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b73da2c410437b11ba46… commit 7b73da2c410437b11ba46ee0bfdae839bb5c35dd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 12:30:41 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 12:31:07 2022 +0900 [SHELL32] Improve Japanese translation (ja-JP) --- dll/win32/shell32/lang/ja-JP.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index ff6eb6994a1..c4c87a5709c 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -498,11 +498,11 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 180, 2, 32, 26 - PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "ユーザー切り替え(&S)", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP PUSHBUTTON "ログオフ(&L)", IDC_LOG_OFF_BUTTON, 134, 46, 19, 19, BS_OWNERDRAW PUSHBUTTON "キャンセル", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "ReactOS のログオフ", IDC_LOG_OFF_TEXT_STATIC, 4, 9, 130, 20 - CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "ユーザー切り替え", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 CTEXT "ログオフ", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 END @@ -802,8 +802,8 @@ BEGIN IDS_COPYERRORSAME "コピーできません '%s': コピー元とコピー先のファイル名が同じです。" IDS_MOVEERRORSUBFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" IDS_COPYERRORSUBFOLDER "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" - IDS_MOVEERROR "Cannot move '%s': %s" - IDS_COPYERROR "Cannot copy '%s': %s" + IDS_MOVEERROR "移動できません '%s': %s" + IDS_COPYERROR "コピーできません '%s': %s" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" @@ -839,8 +839,8 @@ BEGIN IDS_FORMAT_COMPLETE "フォーマット完了。" /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "ボリュームをフォーマットできません" + IDS_NO_FORMAT "このボリュームをフォーマットできません! ReactOS を実行するための重要なシステムファイルが含まれています。" /* Run File dialog */ IDS_RUNDLG_ERROR "「ファイルの実行」ダイアログを表示できませんでした (内部エラー)" @@ -948,7 +948,7 @@ BEGIN IDS_EDIT_VERB "編集" IDS_FIND_VERB "検索" IDS_PRINT_VERB "印刷" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "ここでコマンドプロンプトを開く" IDS_FILE_FOLDER "%u 個のファイル、 %u 個のフォルダ" IDS_PRINTERS "プリンタ" @@ -1023,11 +1023,11 @@ BEGIN IDS_MOVEITEMS "項目の移動先" IDS_MOVEBUTTON "移動" - IDS_SYSTEMFOLDER "System Folder" + IDS_SYSTEMFOLDER "システムフォルダ" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "プログラムを終了し、ReactOS セッションを終了します。" + IDS_SWITCH_USER_DESC "プログラムとファイルを開いたまま、別のユーザーがログオンできるようにします。\r\n\r\n(Win+L を押して、ユーザーを切り替えることもできます)" IDS_LOG_OFF_TITLE "ログオフ" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_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