date:20200214

[ros-diffs] [reactos] 01/01: [SHELL32_APITEST] Don't hardcode C:\ReactOS (#2344)

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7a51a0ae08a4c09d051ab34d61bd3bd402c6787

commit e7a51a0ae08a4c09d051ab34d61bd3bd402c6787
Author: Katayama Hirofumi MZ 
AuthorDate: Fri Feb 14 23:04:17 2020 +0900
Commit: GitHub 
CommitDate: Fri Feb 14 23:04:17 2020 +0900

[SHELL32_APITEST] Don't hardcode C:\ReactOS (#2344)

All tests successful.
CORE-14747
---
 .../rostests/apitests/shell32/ShellExecuteW.cpp| 227 -
 1 file changed, 86 insertions(+), 141 deletions(-)

diff --git a/modules/rostests/apitests/shell32/ShellExecuteW.cpp 
b/modules/rostests/apitests/shell32/ShellExecuteW.cpp
index 6c005380bf3..0111783d0e6 100644
--- a/modules/rostests/apitests/shell32/ShellExecuteW.cpp
+++ b/modules/rostests/apitests/shell32/ShellExecuteW.cpp
@@ -2,184 +2,129 @@
  * PROJECT: ReactOS api tests
  * LICENSE: GPLv2+ - See COPYING in the top level directory
  * PURPOSE: Testing ShellExecuteW
- * PROGRAMMER:  Doug Lyons 
+ * PROGRAMMERS: Doug Lyons 
+ *  Katayama Hirofumi MZ 
  */
 
 #include "shelltest.h"
 #include 
 #include 
+#include 
 
-static
-VOID
-TestShellExecuteW()
+#define WAIT_SLEEP 700
+
+// ShellExecuteW(handle, "open", , , NULL, 
SW_SHOWNORMAL);
+
+START_TEST(ShellExecuteW)
 {
+INT ret;
 HINSTANCE hInstance;
-INT retval;
 HWND hWnd;
-const WCHAR *Name = L"ShellExecuteW";
-WCHAR WindowsDirectory[MAX_PATH];
-BOOL IsReactOS;
-
-/* Check if we are running under ReactOS from the SystemRoot directory */
-if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH))
-printf("GetWindowsDirectoryW failed\n");
-
-IsReactOS = !_wcsnicmp([3], L"reactos", 7);
-
-printf("OSVendor %s ReactOS.\n", IsReactOS ? "is" : "is not");
+WCHAR WinDir[MAX_PATH], SysDir[MAX_PATH], SysDrive[MAX_PATH];
 
-//  ShellExecuteW(handle, "open", , 
, NULL, SW_SHOWNORMAL);
+if (!GetWindowsDirectoryW(WinDir, _countof(WinDir)))
+{
+skip("GetWindowsDirectoryW failed\n");
+return;
+}
+if (!GetSystemDirectoryW(SysDir, _countof(SysDir)))
+{
+skip("GetSystemDirectoryW failed\n");
+return;
+}
+if (!GetEnvironmentVariableW(L"SystemDrive", SysDrive, _countof(SysDrive)))
+{
+trace("GetEnvironmentVariableW('SystemDrive') failed\n");
+SysDrive[0] = SysDir[0];
+SysDrive[1] = L':';
+SysDrive[2] = 0;
+}
+PathAddBackslashW(SysDrive);
 
+// TEST #1: Open Control Panel
 hInstance = ShellExecuteW(NULL, L"open", L"rundll32.exe", 
L"shell32.dll,Control_RunDLL desk.cpl",
   NULL, SW_SHOWNORMAL);
-retval = (UINT_PTR) hInstance;
-
-printf("Return Value for Open Control Panel is '%d'.\n", retval);
-
-ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n",
- wine_dbgstr_w(Name), GetLastError());
-
+ret = (INT)(UINT_PTR)hInstance;
+ok(ret > 31, "TEST #1: ret:%d, LastError: %ld\n", ret, GetLastError());
+trace("TEST #1 ret: %d.\n", ret);
 if (hInstance) 
 {
-LPCWSTR lpWinTitle = L"Display Properties";
-Sleep(1000);
-hWnd = FindWindowW(NULL, lpWinTitle);
-PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);  // Terminate Window
+Sleep(WAIT_SLEEP);
+// Terminate Window
+hWnd = FindWindowW(NULL, L"Display Properties");
+PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
 }
-// End of test #1 - Open Control Panel
-
-
-//  ShellExecuteW(handle, "open", , NULL, 
NULL, SW_SHOWNORMAL);
 
+// TEST #2: Open Notepad
 hInstance = ShellExecuteW(NULL, L"open", L"notepad.exe", NULL, NULL, 
SW_SHOWNORMAL);
-retval = (UINT_PTR) hInstance;
-
-printf("Return Value for Open notepad.exe is '%d'.\n", retval);
-
-ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n",
- wine_dbgstr_w(Name), GetLastError());
-
+ret = (INT)(UINT_PTR)hInstance;
+ok(ret > 31, "TEST #2: ret:%d, LastError: %ld\n", ret, GetLastError());
+trace("TEST #2 ret: %d.\n", ret);
 if (hInstance)
 {
-LPCWSTR lpWinClass = L"Notepad";
-LPCWSTR lpWinTitle = L"Untitled - Notepad";
-Sleep(1000);
-hWnd = FindWindowW(lpWinClass, lpWinTitle);
-PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);  // Terminate Window
+Sleep(WAIT_SLEEP);
+// Terminate Window
+hWnd = FindWindowW(L"Notepad", L"Untitled - Notepad");
+PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
 }
-// End of test #2 - Open notepad.exe
-
-
-//  ShellExecuteW(handle, NULL, , NULL, NULL, 
SW_SHOWNORMAL);
-
-if(IsReactOS)
-hInstance = ShellExecuteW(NULL, NULL, L"C:\\ReactOS", NULL,
-  NULL, SW_SHOWNORMAL);
-else
-hInstance = ShellExecuteW(NULL, NULL, L"C:\\Windows", NULL,
-  NULL, SW_SHOWNORMAL);
-
-retval = (UINT_PTR) hInstance;
-
-

[ros-diffs] [reactos] 02/02: [FREELDR] Separate PC and Xbox platform-specific code (#2185)

2020-02-14 Thread Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=571407c7d2bafa1051505f8bb03426c34588b7fe

commit 571407c7d2bafa1051505f8bb03426c34588b7fe
Author: Stanislav Motylkov 
AuthorDate: Fri Dec 27 23:02:38 2019 +0300
Commit: Hermès BÉLUSCA - MAÏTO 
CommitDate: Fri Feb 14 16:02:04 2020 +0100

[FREELDR] Separate PC and Xbox platform-specific code (#2185)

CORE-16216
---
 boot/freeldr/freeldr/CMakeLists.txt   | 41 -
 boot/freeldr/freeldr/arch/i386/archmach.c | 44 ---
 boot/freeldr/freeldr/arch/i386/pc/machpc.c| 12 ++-
 boot/freeldr/freeldr/arch/i386/xbox/machxbox.c| 23 +++-
 boot/freeldr/freeldr/include/arch/amd64/amd64.h   |  1 -
 boot/freeldr/freeldr/include/arch/i386/machxbox.h |  2 --
 boot/freeldr/freeldr/include/arch/pc/machpc.h |  2 --
 7 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/boot/freeldr/freeldr/CMakeLists.txt 
b/boot/freeldr/freeldr/CMakeLists.txt
index 2573130ad02..5b32b2e74eb 100644
--- a/boot/freeldr/freeldr/CMakeLists.txt
+++ b/boot/freeldr/freeldr/CMakeLists.txt
@@ -113,7 +113,6 @@ if(ARCH STREQUAL "i386")
 lib/fs/pxe.c
 arch/i386/halstub.c
 arch/i386/ntoskrnl.c
-arch/i386/archmach.c
 arch/i386/drivemap.c
 arch/i386/hardware.c
 arch/i386/hwacpi.c
@@ -124,22 +123,32 @@ if(ARCH STREQUAL "i386")
 arch/i386/i386idt.c
 arch/i386/i386rtl.c
 arch/i386/i386vid.c
-arch/i386/pc/machpc.c
-arch/i386/pc/pccons.c
-arch/i386/pc/pcdisk.c
-arch/i386/pc/pcmem.c
-arch/i386/pc/pcrtc.c
-arch/i386/pc/pcvideo.c
-arch/i386/xbox/machxbox.c
-arch/i386/xbox/xboxcons.c
-arch/i386/xbox/xboxdisk.c
-arch/i386/xbox/xboxfont.c
-arch/i386/xbox/xboxi2c.c
-arch/i386/xbox/xboxmem.c
-arch/i386/xbox/xboxrtc.c
-arch/i386/xbox/xboxvideo.c
 disk/scsiport.c)
 
+if(SARCH STREQUAL "xbox")
+list(APPEND FREELDR_ARC_SOURCE
+# FIXME: Abstract things better so we don't need to include /pc/* 
here
+arch/i386/pc/machpc.c   # machxbox.c depends on it
+arch/i386/pc/pcdisk.c   # hwdisk.c depends on it
+arch/i386/pc/pcmem.c# hwacpi.c/xboxmem.c depends on it
+arch/i386/xbox/machxbox.c
+arch/i386/xbox/xboxcons.c
+arch/i386/xbox/xboxdisk.c
+arch/i386/xbox/xboxfont.c
+arch/i386/xbox/xboxi2c.c
+arch/i386/xbox/xboxmem.c
+arch/i386/xbox/xboxrtc.c
+arch/i386/xbox/xboxvideo.c)
+else()
+list(APPEND FREELDR_ARC_SOURCE
+arch/i386/pc/machpc.c
+arch/i386/pc/pccons.c
+arch/i386/pc/pcdisk.c
+arch/i386/pc/pcmem.c
+arch/i386/pc/pcrtc.c
+arch/i386/pc/pcvideo.c)
+endif()
+
 elseif(ARCH STREQUAL "amd64")
 list(APPEND FREELDR_COMMON_ASM_SOURCE
 arch/amd64/entry.S
@@ -196,7 +205,7 @@ if(USE_CLANG_CL)
 # We need to reduce the binary size
 add_target_compile_flags(freeldr_common "/Os")
 endif()
-if(NOT MSVC AND ARCH STREQUAL "i386")
+if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox")
   # Prevent a warning when doing a memcmp with address 0
   set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES 
COMPILE_FLAGS "-Wno-nonnull")
 endif()
diff --git a/boot/freeldr/freeldr/arch/i386/archmach.c 
b/boot/freeldr/freeldr/arch/i386/archmach.c
deleted file mode 100644
index 293f9481529..000
--- a/boot/freeldr/freeldr/arch/i386/archmach.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  FreeLoader
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include 
-
-VOID
-MachInit(const char *CmdLine)
-{
-ULONG PciId;
-
-memset(, 0, sizeof(MACHVTBL));
-
-/* Check for Xbox by identifying device at PCI 0:0:0, if it's
- * 0x10de/0x02a5 then we're running on an Xbox */
-WRITE_PORT_ULONG((ULONG*)0xcf8, CONFIG_CMD(0, 0, 0));
-PciId = READ_PORT_ULONG((ULONG*)0xcfc);
-if (PciId == 0x02a510de)
-{
-XboxMachInit(CmdLine);
-}
-else
-{
-PcMachInit(CmdLine);
-}
-
-HalpCalibrateStallExecution();
-}
-
-/* EOF */
diff --git

[ros-diffs] [reactos] 01/02: [FREELDR] Restructure platform-specific code. No code changes.

2020-02-14 Thread Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c4e591ea9fbe5f50d822001cb46225a088b63a7

commit 6c4e591ea9fbe5f50d822001cb46225a088b63a7
Author: Stanislav Motylkov 
AuthorDate: Fri Dec 27 22:44:48 2019 +0300
Commit: Hermès BÉLUSCA - MAÏTO 
CommitDate: Fri Feb 14 16:02:04 2020 +0100

[FREELDR] Restructure platform-specific code. No code changes.
---
 boot/freeldr/freeldr/CMakeLists.txt| 42 +++---
 boot/freeldr/freeldr/arch/i386/{ => pc}/machpc.c   |  0
 boot/freeldr/freeldr/arch/i386/{ => pc}/pccons.c   |  0
 boot/freeldr/freeldr/arch/i386/{ => pc}/pcdisk.c   |  0
 boot/freeldr/freeldr/arch/i386/{ => pc}/pcmem.c|  0
 boot/freeldr/freeldr/arch/i386/{ => pc}/pcrtc.c|  0
 boot/freeldr/freeldr/arch/i386/{ => pc}/pcvideo.c  |  0
 .../freeldr/arch/i386/{ => xbox}/machxbox.c|  0
 .../freeldr/arch/i386/{ => xbox}/xboxcons.c|  0
 .../freeldr/arch/i386/{ => xbox}/xboxdisk.c|  0
 .../freeldr/arch/i386/{ => xbox}/xboxfont.c|  0
 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxi2c.c |  0
 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxmem.c |  0
 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxrtc.c |  0
 .../freeldr/arch/i386/{ => xbox}/xboxvideo.c   |  0
 15 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/boot/freeldr/freeldr/CMakeLists.txt 
b/boot/freeldr/freeldr/CMakeLists.txt
index 784febe1f43..2573130ad02 100644
--- a/boot/freeldr/freeldr/CMakeLists.txt
+++ b/boot/freeldr/freeldr/CMakeLists.txt
@@ -124,20 +124,20 @@ if(ARCH STREQUAL "i386")
 arch/i386/i386idt.c
 arch/i386/i386rtl.c
 arch/i386/i386vid.c
-arch/i386/machpc.c
-arch/i386/pccons.c
-arch/i386/pcdisk.c
-arch/i386/pcmem.c
-arch/i386/pcrtc.c
-arch/i386/pcvideo.c
-arch/i386/machxbox.c
-arch/i386/xboxcons.c
-arch/i386/xboxdisk.c
-arch/i386/xboxfont.c
-arch/i386/xboxi2c.c
-arch/i386/xboxmem.c
-arch/i386/xboxrtc.c
-arch/i386/xboxvideo.c
+arch/i386/pc/machpc.c
+arch/i386/pc/pccons.c
+arch/i386/pc/pcdisk.c
+arch/i386/pc/pcmem.c
+arch/i386/pc/pcrtc.c
+arch/i386/pc/pcvideo.c
+arch/i386/xbox/machxbox.c
+arch/i386/xbox/xboxcons.c
+arch/i386/xbox/xboxdisk.c
+arch/i386/xbox/xboxfont.c
+arch/i386/xbox/xboxi2c.c
+arch/i386/xbox/xboxmem.c
+arch/i386/xbox/xboxrtc.c
+arch/i386/xbox/xboxvideo.c
 disk/scsiport.c)
 
 elseif(ARCH STREQUAL "amd64")
@@ -162,12 +162,12 @@ elseif(ARCH STREQUAL "amd64")
 arch/i386/i386bug.c
 arch/i386/i386rtl.c
 arch/i386/i386vid.c
-arch/i386/machpc.c
-arch/i386/pccons.c
-arch/i386/pcdisk.c
-arch/i386/pcmem.c
-arch/i386/pcrtc.c
-arch/i386/pcvideo.c)
+arch/i386/pc/machpc.c
+arch/i386/pc/pccons.c
+arch/i386/pc/pcdisk.c
+arch/i386/pc/pcmem.c
+arch/i386/pc/pcrtc.c
+arch/i386/pc/pcvideo.c)
 
 elseif(ARCH STREQUAL "arm")
 list(APPEND FREELDR_COMMON_ASM_SOURCE
@@ -198,7 +198,7 @@ if(USE_CLANG_CL)
 endif()
 if(NOT MSVC AND ARCH STREQUAL "i386")
   # Prevent a warning when doing a memcmp with address 0
-  set_source_files_properties(arch/i386/xboxmem.c PROPERTIES COMPILE_FLAGS 
"-Wno-nonnull")
+  set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES 
COMPILE_FLAGS "-Wno-nonnull")
 endif()
 
 set(PCH_SOURCE
diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c 
b/boot/freeldr/freeldr/arch/i386/pc/machpc.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/machpc.c
rename to boot/freeldr/freeldr/arch/i386/pc/machpc.c
diff --git a/boot/freeldr/freeldr/arch/i386/pccons.c 
b/boot/freeldr/freeldr/arch/i386/pc/pccons.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/pccons.c
rename to boot/freeldr/freeldr/arch/i386/pc/pccons.c
diff --git a/boot/freeldr/freeldr/arch/i386/pcdisk.c 
b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/pcdisk.c
rename to boot/freeldr/freeldr/arch/i386/pc/pcdisk.c
diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c 
b/boot/freeldr/freeldr/arch/i386/pc/pcmem.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/pcmem.c
rename to boot/freeldr/freeldr/arch/i386/pc/pcmem.c
diff --git a/boot/freeldr/freeldr/arch/i386/pcrtc.c 
b/boot/freeldr/freeldr/arch/i386/pc/pcrtc.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/pcrtc.c
rename to boot/freeldr/freeldr/arch/i386/pc/pcrtc.c
diff --git a/boot/freeldr/freeldr/arch/i386/pcvideo.c 
b/boot/freeldr/freeldr/arch/i386/pc/pcvideo.c
similarity index 100%
rename from boot/freeldr/freeldr/arch/i386/pcvideo.c
rename to boot/freeldr/freeldr/arch/i386/pc/pcvideo.c
diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c 
b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c
similarity index 100%
rename from

[ros-diffs] [reactos] 01/01: [LOCALSPL] Don't hardcode C:\ReactOS (#2343)

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3b1185cdc743e9dd4392c04f6ebfe9be5d98633

commit f3b1185cdc743e9dd4392c04f6ebfe9be5d98633
Author: Katayama Hirofumi MZ 
AuthorDate: Fri Feb 14 22:53:38 2020 +0900
Commit: GitHub 
CommitDate: Fri Feb 14 22:53:38 2020 +0900

[LOCALSPL] Don't hardcode C:\ReactOS (#2343)

Use static top-level variables wszLocalSplFile and wszPrintUiFile instead 
of static hardcoded literal strings.
CORE-14747
---
 .../printing/providers/localspl/printerdrivers.c   | 59 +++---
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/win32ss/printing/providers/localspl/printerdrivers.c 
b/win32ss/printing/providers/localspl/printerdrivers.c
index 351667cecc8..67dd7a03031 100644
--- a/win32ss/printing/providers/localspl/printerdrivers.c
+++ b/win32ss/printing/providers/localspl/printerdrivers.c
@@ -3,9 +3,37 @@
  * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE: Functions for printer driver information
  * COPYRIGHT:   Copyright 2018 Mark Jansen (mark.jan...@reactos.org)
+ *  Copyright 2020 Katayama Hirofumi MZ 
(katayama.hirofumi...@gmail.com)
  */
 
 #include "precomp.h"
+#include 
+
+static WCHAR wszLocalSplFile[MAX_PATH] = L"";
+static WCHAR wszPrintUiFile[MAX_PATH] = L"";
+
+static BOOL
+DoInitPrinterDriversInternal(void)
+{
+WCHAR szSysDir[MAX_PATH];
+
+if (wszLocalSplFile[0] && wszPrintUiFile[0])
+return TRUE;
+
+if (!GetSystemDirectoryW(szSysDir, _countof(szSysDir)))
+{
+ERR("GetSystemDirectoryW failed\n");
+return FALSE;
+}
+
+StringCbCopyW(wszLocalSplFile, sizeof(wszLocalSplFile), szSysDir);
+StringCbCatW(wszLocalSplFile, sizeof(wszLocalSplFile), L"\\localspl.dll");
+
+StringCbCopyW(wszPrintUiFile, sizeof(wszPrintUiFile), szSysDir);
+StringCbCatW(wszPrintUiFile, sizeof(wszPrintUiFile), L"\\printui.dll");
+
+return TRUE;
+}
 
 // Local Constants
 static DWORD dwDriverInfo1Offsets[] = {
@@ -91,7 +119,6 @@ _LocalGetPrinterDriverLevel1(PLOCAL_PRINTER_HANDLE pHandle, 
PDRIVER_INFO_1W* ppD
 return;
 }
 
-
 // Finally copy the structure and advance to the next one in the output 
buffer.
 *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), 
dwDriverInfo1Offsets, *ppDriverInfoEnd);
 (*ppDriverInfo)++;
@@ -103,12 +130,11 @@ _LocalGetPrinterDriverLevel2(PLOCAL_PRINTER_HANDLE 
pHandle, PDRIVER_INFO_2W* ppD
 DWORD n;
 PCWSTR pwszStrings[5];
 
-/* Clearly these things should not be hardcoded, so when it is needed, 
someone can add meaningfull values here */
 pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver;  // pName
 pwszStrings[1] = wszCurrentEnvironment;  // pEnvironment
-pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll";  // pDriverPath
-pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll";  // pDataFile
-pwszStrings[4] = L"c:\\reactos\\system32\\localspl.dll";  // pConfigFile
+pwszStrings[2] = wszLocalSplFile;// pDriverPath
+pwszStrings[3] = wszLocalSplFile;// pDataFile
+pwszStrings[4] = wszLocalSplFile;// pConfigFile
 
 // Calculate the string lengths.
 if (!ppDriverInfo)
@@ -135,12 +161,11 @@ _LocalGetPrinterDriverLevel3(PLOCAL_PRINTER_HANDLE 
pHandle, PDRIVER_INFO_3W* ppD
 DWORD n;
 PCWSTR pwszStrings[9];
 
-/* Clearly these things should not be hardcoded, so when it is needed, 
someone can add meaningfull values here */
 pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver;  // pName
 pwszStrings[1] = wszCurrentEnvironment;  // pEnvironment
-pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll";  // pDriverPath
-pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll";  // pDataFile
-pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll";   // pConfigFile
+pwszStrings[2] = wszLocalSplFile;// pDriverPath
+pwszStrings[3] = wszLocalSplFile;// pDataFile
+pwszStrings[4] = wszPrintUiFile; // pConfigFile
 pwszStrings[5] = L"";  // pHelpFile
 pwszStrings[6] = L"localspl.dll|printui.dll|";  // pDependentFiles, | is 
separator and terminator!
 pwszStrings[7] = NULL;  // pMonitorName
@@ -176,12 +201,11 @@ _LocalGetPrinterDriverLevel4(PLOCAL_PRINTER_HANDLE 
pHandle, PDRIVER_INFO_4W* ppD
 DWORD n;
 PCWSTR pwszStrings[10];
 
-/* Clearly these things should not be hardcoded, so when it is needed, 
someone can add meaningfull values here */
 pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver;  // pName
 pwszStrings[1] = wszCurrentEnvironment;  // pEnvironment
-pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll";  // pDriverPath
-pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll";  // pDataFile
-pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll";   // pConfigFile
+pwszStrings[2] = wszLocalSplFile;// pDriverPath
+pwszStrings[3] = wszLocalSplFile;// pDataFile
+

[ros-diffs] [reactos] 01/01: [SYSSETUP] Update Russian translation for Product Options page (#2348)

2020-02-14 Thread Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44e9fee23704c57127f7d7a63a4d0888c90d2dd9

commit 44e9fee23704c57127f7d7a63a4d0888c90d2dd9
Author: Oleg Dubinskiy 
AuthorDate: Fri Feb 14 20:22:48 2020 +0200
Commit: GitHub 
CommitDate: Fri Feb 14 19:22:48 2020 +0100

[SYSSETUP] Update Russian translation for Product Options page (#2348)
---
 dll/win32/syssetup/lang/ru-RU.rc | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index f4195575acc..d2d99a5abc0 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -1,4 +1,5 @@
-/* Russian translation by Dmitry Chapyshev, 2007-06-13 */
+/* Russian translation by Dmitry Chapyshev, 2007-06-13
+   Updated by Oleg Dubinskiy, 2020-02-14   */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
@@ -25,20 +26,20 @@ BEGIN
 END
 
 IDD_PRODUCT DIALOGEX 0, 0, 317, 143
-CAPTION "ReactOS Setup"
+CAPTION "Установка ReactOS"
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
 ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
-LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
-LTEXT "Product :", IDC_STATIC, 5, 32, 85, 10
+LTEXT "Пожалуйста, укажите тип продкута:", IDC_STATIC, 35, 7, 230, 12
+LTEXT "&Тип продукта:", IDC_STATIC, 5, 32, 85, 10
 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | 
CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
+GROUPBOX "Информация о продукте", IDC_STATIC, 5, 50, 305, 85
 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
 LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10
 EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL
-LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10
+LTEXT "Описание:", IDC_STATIC, 20, 102, 70, 10
 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | 
ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL
 END
 
@@ -247,10 +248,10 @@ END
 
 STRINGTABLE
 BEGIN
-IDS_PRODUCTTITLE "Product Options"
-IDS_PRODUCTSUBTITLE "You can choose a product option that affects the 
behaviour of the system."
-IDS_PRODUCTSERVERNAME "ReactOS Server"
-IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
-IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private 
folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from 
""My Documents""."
-IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a 
workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" 
are in ""My Documents""."
+IDS_PRODUCTTITLE "Тип продукта"
+IDS_PRODUCTSUBTITLE "Вы можете выбрать тип продукта, который изменяет 
поведение системы."
+IDS_PRODUCTSERVERNAME "Сервер ReactOS"
+IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS (по умолчанию)"
+IDS_PRODUCTSERVERINFO "Система будет распознаваться как сервер. Приватные 
папки ""Мои Изображения"", ""Мои видеозаписи"" и ""Моя музыка"" не будут 
зависеть от папки ""Мои документы""."
+IDS_PRODUCTWORKSTATIONINFO "Система будет разпознаваться как рабочая 
станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя 
музыка"" будут находится в папке ""Мои документы""."
 END

[ros-diffs] [reactos] 01/01: [FREELDR] Separate PC beep routines out into its own file (#2347)

2020-02-14 Thread Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=747d50c52e9f4e28060032513cfbe52be8f48776

commit 747d50c52e9f4e28060032513cfbe52be8f48776
Author: Dmitry Borisov 
AuthorDate: Sat Feb 15 00:22:17 2020 +0600
Commit: GitHub 
CommitDate: Fri Feb 14 19:22:17 2020 +0100

[FREELDR] Separate PC beep routines out into its own file (#2347)

- Remove now unused i386rtl.c (and it doesn't contains RTL functions 
nowadays).
- Separate PC beep routines out into its own file.
- Also use delay function instead of BIOS interrupts.
- Improve as well the accuracy of KeStallExecutionProcessor() by using the 
same HW delay function.
---
 boot/freeldr/freeldr/CMakeLists.txt|   5 +-
 boot/freeldr/freeldr/arch/i386/i386rtl.c   | 117 -
 boot/freeldr/freeldr/arch/i386/ntoskrnl.c  |  46 +---
 boot/freeldr/freeldr/arch/i386/pc/machpc.c |  26 +++
 boot/freeldr/freeldr/arch/i386/pc/pcbeep.c |  39 ++
 5 files changed, 69 insertions(+), 164 deletions(-)

diff --git a/boot/freeldr/freeldr/CMakeLists.txt 
b/boot/freeldr/freeldr/CMakeLists.txt
index 5b32b2e74eb..dd8bc31703e 100644
--- a/boot/freeldr/freeldr/CMakeLists.txt
+++ b/boot/freeldr/freeldr/CMakeLists.txt
@@ -121,7 +121,6 @@ if(ARCH STREQUAL "i386")
 arch/i386/hwpci.c
 arch/i386/i386bug.c
 arch/i386/i386idt.c
-arch/i386/i386rtl.c
 arch/i386/i386vid.c
 disk/scsiport.c)
 
@@ -129,6 +128,7 @@ if(ARCH STREQUAL "i386")
 list(APPEND FREELDR_ARC_SOURCE
 # FIXME: Abstract things better so we don't need to include /pc/* 
here
 arch/i386/pc/machpc.c   # machxbox.c depends on it
+arch/i386/pc/pcbeep.c   # machxbox.c depends on it
 arch/i386/pc/pcdisk.c   # hwdisk.c depends on it
 arch/i386/pc/pcmem.c# hwacpi.c/xboxmem.c depends on it
 arch/i386/xbox/machxbox.c
@@ -142,6 +142,7 @@ if(ARCH STREQUAL "i386")
 else()
 list(APPEND FREELDR_ARC_SOURCE
 arch/i386/pc/machpc.c
+arch/i386/pc/pcbeep.c
 arch/i386/pc/pccons.c
 arch/i386/pc/pcdisk.c
 arch/i386/pc/pcmem.c
@@ -169,9 +170,9 @@ elseif(ARCH STREQUAL "amd64")
 arch/i386/hwdisk.c
 arch/i386/hwpci.c
 arch/i386/i386bug.c
-arch/i386/i386rtl.c
 arch/i386/i386vid.c
 arch/i386/pc/machpc.c
+arch/i386/pc/pcbeep.c
 arch/i386/pc/pccons.c
 arch/i386/pc/pcdisk.c
 arch/i386/pc/pcmem.c
diff --git a/boot/freeldr/freeldr/arch/i386/i386rtl.c 
b/boot/freeldr/freeldr/arch/i386/i386rtl.c
deleted file mode 100644
index e4ef701da52..000
--- a/boot/freeldr/freeldr/arch/i386/i386rtl.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  FreeLoader
- *  Copyright (C) 1998-2003  Brian Palmer  
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include 
-
-void sound(int freq);
-void delay(unsigned msec);
-
-VOID PcBeep(VOID)
-{
-sound(700);
-delay(200);
-sound(0);
-}
-
-void delay(unsigned msec)
-{
-REGSRegs;
-unsignedusec;
-unsignedmsec_this;
-
-// Int 15h AH=86h
-// BIOS - WAIT (AT,PS)
-//
-// AH = 86h
-// CX:DX = interval in microseconds
-// Return:
-// CF clear if successful (wait interval elapsed)
-// CF set on error or AH=83h wait already in progress
-// AH = status (see #00496)
-
-// Note: The resolution of the wait period is 977 microseconds on
-// many systems because many BIOSes use the 1/1024 second fast
-// interrupt from the AT real-time clock chip which is available on INT 70;
-// because newer BIOSes may have much more precise timers available, it is
-// not possible to use this function accurately for very short delays 
unless
-// the precise behavior of the BIOS is known (or found through testing)
-
-while (msec)
-{
-msec_this = msec;
-
-if (msec_this > 4000)
-{
-msec_this = 4000;
-}
-
-usec = msec_this * 1000;
-
-Regs.b.ah = 0x86;
-Regs.w.cx = usec >> 16;
-Regs.w.dx = usec & 0x;
-Int386(0x15, , );
-
-msec -= msec_this;
-}
-}
-
-void sound(int freq)
-{
-int scale;
-
-if (freq

[ros-diffs] [reactos] 01/01: [SHELL32] Better fix for the "Version" string in the About-dialog (#2349)

2020-02-14 Thread Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ce72ba172e69d25e6844244051e467d9d4b1e05

commit 6ce72ba172e69d25e6844244051e467d9d4b1e05
Author: Bișoc George 
AuthorDate: Fri Feb 14 22:17:48 2020 +0100
Commit: GitHub 
CommitDate: Fri Feb 14 22:17:48 2020 +0100

[SHELL32] Better fix for the "Version" string in the About-dialog (#2349)

The version string kernel number and the localized "version" word were too 
near in translation files. The patch fixes the problem introduced by #2276.
Addendum to commit a57f7b50.
---
 dll/win32/shell32/lang/bg-BG.rc   |  6 --
 dll/win32/shell32/lang/ca-ES.rc   |  6 --
 dll/win32/shell32/lang/cs-CZ.rc   |  6 --
 dll/win32/shell32/lang/da-DK.rc   |  6 --
 dll/win32/shell32/lang/de-DE.rc   |  6 --
 dll/win32/shell32/lang/el-GR.rc   |  6 --
 dll/win32/shell32/lang/en-GB.rc   |  6 --
 dll/win32/shell32/lang/en-US.rc   |  6 --
 dll/win32/shell32/lang/es-ES.rc   |  6 --
 dll/win32/shell32/lang/et-EE.rc   |  6 --
 dll/win32/shell32/lang/fi-FI.rc   |  6 --
 dll/win32/shell32/lang/fr-FR.rc   |  6 --
 dll/win32/shell32/lang/he-IL.rc   |  6 --
 dll/win32/shell32/lang/hi-IN.rc   |  6 --
 dll/win32/shell32/lang/hu-HU.rc   |  6 --
 dll/win32/shell32/lang/id-ID.rc   |  6 --
 dll/win32/shell32/lang/it-IT.rc   |  6 --
 dll/win32/shell32/lang/ja-JP.rc   |  6 --
 dll/win32/shell32/lang/ko-KR.rc   |  6 --
 dll/win32/shell32/lang/nl-NL.rc   |  6 --
 dll/win32/shell32/lang/no-NO.rc   |  6 --
 dll/win32/shell32/lang/pl-PL.rc   |  6 --
 dll/win32/shell32/lang/pt-BR.rc   |  6 --
 dll/win32/shell32/lang/pt-PT.rc   |  6 --
 dll/win32/shell32/lang/ro-RO.rc   |  6 --
 dll/win32/shell32/lang/ru-RU.rc   |  6 --
 dll/win32/shell32/lang/sk-SK.rc   |  6 --
 dll/win32/shell32/lang/sl-SI.rc   |  6 --
 dll/win32/shell32/lang/sq-AL.rc   |  6 --
 dll/win32/shell32/lang/sv-SE.rc   |  6 --
 dll/win32/shell32/lang/tr-TR.rc   |  6 --
 dll/win32/shell32/lang/uk-UA.rc   |  6 --
 dll/win32/shell32/lang/zh-CN.rc   |  6 --
 dll/win32/shell32/lang/zh-TW.rc   |  6 --
 dll/win32/shell32/shresdef.h  | 17 +
 dll/win32/shell32/wine/shell32_main.c |  4 +++-
 36 files changed, 148 insertions(+), 77 deletions(-)

diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 8e1f2e298c7..0b71386fcca 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -136,8 +136,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
-LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10
-LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10
+LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
@@ -749,6 +748,9 @@ BEGIN
 IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
 IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and 
helps you add new ones."
 
+/* About shell dialog version string */
+IDS_ABOUT_VERSION_STRING "Версия %S (%S)"
+
 /* context menus */
 IDS_VIEW_LARGE "&Големи значета"
 IDS_VIEW_SMALL "&Малки значета"
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 8d66a2a7ea8..956d0cee138 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
-LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10
-LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10
+LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
@@ -748,6 +747,9 @@ BEGIN
 IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
 IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and 
helps you add new ones."
 
+/* About shell dialog version string */
+IDS_ABOUT_VERSION_STRING "Version %S (%S)"
+
 /* context menus */
 IDS_VIEW_LARGE "Lar Icons"
 IDS_VIEW_SMALL "S Icons"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 909bf5988d6..e07ae178be1 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -141,8 +141,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
-LTEXT "Verze ", IDC_STATIC, 35, 65, 28, 10
-LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10
+

[ros-diffs] [reactos] 01/01: [BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346)

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78f5854348e4b746f7d03deb17af09ad592a50c0

commit 78f5854348e4b746f7d03deb17af09ad592a50c0
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 09:21:41 2020 +0900
Commit: GitHub 
CommitDate: Sat Feb 15 09:21:41 2020 +0900

[BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346)

- Use %WINDIR% instead of C:\ReactOS.
- Quote paths.
CORE-14747
---
 boot/bootdata/bootcdregtest/regtest.cmd | 12 ++--
 boot/bootdata/bootcdregtest/testboot.bat.sample |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/boot/bootdata/bootcdregtest/regtest.cmd 
b/boot/bootdata/bootcdregtest/regtest.cmd
index ec263e13241..1f71cdd98eb 100644
--- a/boot/bootdata/bootcdregtest/regtest.cmd
+++ b/boot/bootdata/bootcdregtest/regtest.cmd
@@ -11,14 +11,14 @@ if "%errorlevel%"=="1" (
 exit 0
 )
 
-move C:\ReactOS\bin\redirtest1.dll C:\ReactOS\bin\kernel32test_versioned.dll
-move C:\ReactOS\bin\testdata\redirtest2.dll 
C:\ReactOS\bin\testdata\kernel32test_versioned.dll
-if exist "C:\ReactOS\bin\AHKAppTests.cmd" (
+move "%WINDIR%\bin\redirtest1.dll" "%WINDIR%\bin\kernel32test_versioned.dll"
+move "%WINDIR%\bin\testdata\redirtest2.dll" 
"%WINDIR%\bin\testdata\kernel32test_versioned.dll"
+if exist "%WINDIR%\bin\AHKAppTests.cmd" (
 dbgprint "Preparing AHK Application testing suite."
-call C:\ReactOS\bin\AHKAppTests.cmd
-del C:\ReactOS\bin\AHKAppTests.cmd
+call "%WINDIR%\bin\AHKAppTests.cmd"
+del "%WINDIR%\bin\AHKAppTests.cmd"
 )
 
 dbgprint --process "ipconfig"
-cd C:\ReactOS\bin
+cd "%WINDIR%\bin"
 start rosautotest /r /s /n
diff --git a/boot/bootdata/bootcdregtest/testboot.bat.sample 
b/boot/bootdata/bootcdregtest/testboot.bat.sample
index 884f265d98c..8cef6e53d69 100644
--- a/boot/bootdata/bootcdregtest/testboot.bat.sample
+++ b/boot/bootdata/bootcdregtest/testboot.bat.sample
@@ -9,7 +9,6 @@ REM ECHO
 REM START /WAIT abiword.exe
 REM start /WAIT dbgprint.exe SYSREG_CHECKPOINT:ABIWORD_INSTALL_COMPLETE
 
-
 REM ECHO
 REM ECHO Installing OpenOffice
 REM ECHO
@@ -19,10 +18,9 @@ REM start /WAIT dbgprint.exe 
SYSREG_CHECKPOINT:OPENOFFICE_INSTALL_COMPLETE
 ECHO 
 ECHO Informing Sysreg that we are done
 ECHO
-START C:\ReactOS\bin\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE  
+START dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE
 
 ECHO
 ECHO Shutting down ReactOS
 ECHO
 START shutdown.exe shutdown
-

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve resource ATTENTION comments 2

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c7ca3024fdded47e3708b70b5811bb1c0428ca

commit b1c7ca3024fdded47e3708b70b5811bb1c0428ca
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 10:15:32 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 10:15:32 2020 +0900

[SYSSETUP] Improve resource ATTENTION comments 2
---
 dll/win32/syssetup/lang/bg-BG.rc | 2 +-
 dll/win32/syssetup/lang/cs-CZ.rc | 2 +-
 dll/win32/syssetup/lang/da-DK.rc | 2 +-
 dll/win32/syssetup/lang/de-DE.rc | 2 +-
 dll/win32/syssetup/lang/el-GR.rc | 2 +-
 dll/win32/syssetup/lang/en-US.rc | 2 +-
 dll/win32/syssetup/lang/es-ES.rc | 2 +-
 dll/win32/syssetup/lang/et-EE.rc | 2 +-
 dll/win32/syssetup/lang/fi-FI.rc | 2 +-
 dll/win32/syssetup/lang/fr-FR.rc | 2 +-
 dll/win32/syssetup/lang/he-IL.rc | 2 +-
 dll/win32/syssetup/lang/hi-IN.rc | 2 +-
 dll/win32/syssetup/lang/hu-HU.rc | 2 +-
 dll/win32/syssetup/lang/id-ID.rc | 2 +-
 dll/win32/syssetup/lang/it-IT.rc | 2 +-
 dll/win32/syssetup/lang/ja-JP.rc | 2 +-
 dll/win32/syssetup/lang/lt-LT.rc | 2 +-
 dll/win32/syssetup/lang/nl-NL.rc | 2 +-
 dll/win32/syssetup/lang/no-NO.rc | 2 +-
 dll/win32/syssetup/lang/pl-PL.rc | 2 +-
 dll/win32/syssetup/lang/pt-BR.rc | 2 +-
 dll/win32/syssetup/lang/pt-PT.rc | 2 +-
 dll/win32/syssetup/lang/ro-RO.rc | 2 +-
 dll/win32/syssetup/lang/ru-RU.rc | 2 +-
 dll/win32/syssetup/lang/sk-SK.rc | 2 +-
 dll/win32/syssetup/lang/sq-AL.rc | 2 +-
 dll/win32/syssetup/lang/sv-SE.rc | 2 +-
 dll/win32/syssetup/lang/th-TH.rc | 2 +-
 dll/win32/syssetup/lang/tr-TR.rc | 2 +-
 dll/win32/syssetup/lang/uk-UA.rc | 2 +-
 dll/win32/syssetup/lang/zh-CN.rc | 2 +-
 dll/win32/syssetup/lang/zh-TW.rc | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index bd45825696e..46ff2c057bb 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Подкарване на устройствата..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 612df4cd96a..066fbcf42c9 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -227,7 +227,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Instaluji zařízení..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index e6a6b4adbf8..f6654bfdceb 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -240,7 +240,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Installing devices..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Programmer"
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index 0b0fdab539a..19f51bb7df9 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Geräte werden installiert..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Programme"
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index d5d49ce27f9..201c1d24229 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Εγκατάσταση συσκευών..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index ec146f004bf..64661844f88 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -241,7 +241,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Installing devices..."
 END
 
-/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
+/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 7a66a88564c..5a98cc09b1a 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -229,7 +229,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV

[ros-diffs] [reactos] 01/01: [BROWSEUI] Improve Japanese translation (IDD_SEARCH_DLG)

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d53078b1eeb4f434dfec4f367e08df517c4adb6

commit 3d53078b1eeb4f434dfec4f367e08df517c4adb6
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 10:28:11 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 10:28:36 2020 +0900

[BROWSEUI] Improve Japanese translation (IDD_SEARCH_DLG)
---
 dll/win32/browseui/lang/ja-JP.rc | 52 
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc
index 43c46bf8c56..d3cb3046e0a 100644
--- a/dll/win32/browseui/lang/ja-JP.rc
+++ b/dll/win32/browseui/lang/ja-JP.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Katayama Hirofumi MZ 
+ * Copyright 2016-2020 Katayama Hirofumi MZ 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -107,21 +107,21 @@ END
 
 IDM_BAND_MENU MENUEX
 BEGIN
-MENUITEM "Sho Title", IDM_BAND_TITLE
-MENUITEM " Toolbar", IDM_BAND_CLOSE
+MENUITEM "タイトルを表示()", IDM_BAND_TITLE
+MENUITEM "ツールバーを閉じる()", IDM_BAND_CLOSE
 END
 
 IDM_POPUPMENU MENUEX DISCARDABLE
 BEGIN
 POPUP ""
 BEGIN
-POPUP "", IDM_VIEW_MENU
+POPUP "表示()", IDM_VIEW_MENU
 BEGIN
-MENUITEM " Icons", IDM_LARGE_ICONS
-MENUITEM " Icons", IDM_SMALL_ICONS
+MENUITEM "大きいアイコン()", IDM_LARGE_ICONS
+MENUITEM "小さいアイコン()", IDM_SMALL_ICONS
 END
-MENUITEM " Folder", IDM_OPEN_FOLDER
-MENUITEM " Text", IDM_SHOW_TEXT
+MENUITEM "フォルダを開く()", IDM_OPEN_FOLDER
+MENUITEM "テキストを表示()", IDM_SHOW_TEXT
 END
 END
 
@@ -152,23 +152,23 @@ END
 
 IDD_SEARCH_DLG DIALOGEX 0, 0, 260, 85
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
WS_DLGFRAME
-FONT 8, "MS Shell Dlg"
+FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
-LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 
2, 120, 20
+LTEXT "以下に指定した検索条件で検索します。", IDC_SEARCH_LABEL, 4, 2, 120, 20
 
-LTEXT "All or part  the file name:", -1, 10, 25, 500, 10
+LTEXT "ファイル名の一部または全部の():", -1, 10, 25, 500, 10
 EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER 
| WS_TABSTOP
 
-LTEXT "A  or phrase in the file:", -1, 10, 50, 500, 10
+LTEXT "ファイル内部の単語またはフレーズ():", -1, 10, 50, 500, 10
 EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | 
WS_TABSTOP
 
-LTEXT " in:", -1, 10, 75, 500, 10
+LTEXT "次のフォルダ内部():", -1, 10, 75, 500, 10
 CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | 
WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | 
CBS_OWNERDRAWFIXED, 10, 85, 200, 200
 
-DEFPUSHBUTTON "Sea", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | 
WS_TABSTOP | WS_VISIBLE
-PUSHBUTTON "", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | 
WS_TABSTOP
+DEFPUSHBUTTON "検索()", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | 
WS_TABSTOP | WS_VISIBLE
+PUSHBUTTON "停止()", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | 
WS_TABSTOP
 
-AUTOCHECKBOX "Search Hidden Files and Folders",
+AUTOCHECKBOX "隠しファイル・隠しフォルダを検索",
  IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | 
WS_TABSTOP
 
 CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 
10, 155, 200, 8
@@ -338,18 +338,18 @@ END
 
 STRINGTABLE
 BEGIN
-IDS_BROWSEFORNEWTOOLAR "Choose a folder"
-IDS_TOOLBAR_ERR_TITLE "Toolbar"
-IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
+IDS_BROWSEFORNEWTOOLAR "フォルダを選ぶ"
+IDS_TOOLBAR_ERR_TITLE "ツールバー"
+IDS_TOOLBAR_ERR_TEXT "ツールバーを作成できません。"
 END
 
 STRINGTABLE
 BEGIN
-IDS_SEARCHINVALID "'%1' is not a valid folder."
-IDS_SEARCH_FOLDER "Searching %s"
-IDS_SEARCH_FILES_FOUND "%u files found"
-IDS_SEARCH_OPEN_FOLDER "Open Containing "
-IDS_COL_NAME "Name"
-IDS_COL_LOCATION "In Folder"
-IDS_COL_RELEVANCE "Relevance"
+IDS_SEARCHINVALID "'%1' は有効なフォルダではありません。"
+IDS_SEARCH_FOLDER "%s を検索中"
+IDS_SEARCH_FILES_FOUND "%u 個のファイルが見つかりました"
+IDS_SEARCH_OPEN_FOLDER "この場所のフォルダを開く()"
+IDS_COL_NAME "名前"
+IDS_COL_LOCATION "場所"
+IDS_COL_RELEVANCE "関連"
 END

[ros-diffs] [reactos] 01/01: [CPL][ACCESS] Improve Japanese translation

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd4a6502fc10455641df422d003294ed446a71d

commit ddd4a6502fc10455641df422d003294ed446a71d
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 10:57:49 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 10:57:49 2020 +0900

[CPL][ACCESS] Improve Japanese translation
---
 dll/cpl/access/lang/ja-JP.rc | 168 +--
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/dll/cpl/access/lang/ja-JP.rc b/dll/cpl/access/lang/ja-JP.rc
index e8e1aba8dc8..4c7a76a654f 100644
--- a/dll/cpl/access/lang/ja-JP.rc
+++ b/dll/cpl/access/lang/ja-JP.rc
@@ -10,10 +10,10 @@ BEGIN
   -1, 12, 20, 222, 29
 AUTOCHECKBOX "固定キー機能を使う()", IDC_STICKY_BOX, 12, 49, 126, 14
 PUSHBUTTON "設定()", IDC_STICKY_BUTTON, 144, 49, 90, 14
-GROUPBOX "フィルタ キー機能", -1, 6, 79, 234, 67
-LTEXT "フィルタ キー機能を使うと、速いキー入力や繰り返されたキー入力を無視したり、繰り返し入力の間隔を長くしたりすることができます。",
+GROUPBOX "フィルタキー機能", -1, 6, 79, 234, 67
+LTEXT "フィルタキー機能を使うと、速いキー入力や繰り返されたキー入力を無視したり、繰り返し入力の間隔を長くしたりすることができます。",
   -1, 12, 89, 222, 29
-AUTOCHECKBOX "フィルタ キー機能を使う()", IDC_FILTER_BOX, 12, 121, 126, 14
+AUTOCHECKBOX "フィルタキー機能を使う()", IDC_FILTER_BOX, 12, 121, 126, 14
 PUSHBUTTON "設定()", IDC_FILTER_BUTTON, 144, 121, 90, 14
 GROUPBOX "切り替えキー機能", -1, 6, 148, 234, 62
 LTEXT "切り替えキー機能を使うと、CapsLock、NumLock、ScrollLock キーを押したときに音を鳴らします。",
@@ -52,17 +52,17 @@ BEGIN
   -1, 12, 20, 222, 29
 AUTOCHECKBOX "ハイコントラストを使う()", IDC_CONTRAST_BOX, 12, 49, 126, 14
 PUSHBUTTON "設定()", IDC_CONTRAST_BUTTON, 144, 49, 90, 14
-GROUPBOX "Cursor options", -1, 6, 79, 234, 115
-LTEXT "Use the track bars to modify the blinking speed of the cursor and 
its width.",
+GROUPBOX "カーソル オプション", -1, 6, 79, 234, 115
+LTEXT "カーソルの点滅速度と幅を変更するのにこれらのトラックバーをお使い下さい。",
   -1, 12, 88, 222, 20
-CTEXT "Blinking speed:", -1, 12, 115, 222, 11
-LTEXT "None", -1, 18, 130, 36, 11
-LTEXT "Fast", -1, 192, 130, 36, 11
+CTEXT "点滅速度:", -1, 12, 115, 222, 11
+LTEXT "なし", -1, 18, 130, 36, 11
+LTEXT "速い", -1, 192, 130, 36, 11
 CONTROL "", IDC_CURSOR_BLINK_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | 
WS_TABSTOP,
 60, 124, 126, 20
-CTEXT "Cursor width:", -1, 12, 151, 222, 11
-LTEXT "Narrow", -1, 18, 171, 36, 11
-LTEXT "Wide", -1, 192, 171, 36, 11
+CTEXT "カーソル幅:", -1, 12, 151, 222, 11
+LTEXT "狭い", -1, 18, 171, 36, 11
+LTEXT "広い", -1, 192, 171, 36, 11
 CONTROL "", IDC_CURSOR_WIDTH_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | 
WS_TABSTOP,
 60, 169, 126, 20
 LTEXT "", IDC_CURSOR_WIDTH_TEXT, 18, 142, 24, 16
@@ -109,129 +109,129 @@ END
 
 IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sticky Keys Settings"
+CAPTION "スティッキーキー設定"
 FONT 9, "MS UI Gothic"
 BEGIN
-GROUPBOX "Keys", -1, 6, 11, 234, 62
-LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys 
feature.",
+GROUPBOX "キー", -1, 6, 11, 234, 62
+LTEXT "スティッキーキー機能を有効にするにはShiftキーを5回押して下さい。",
   -1, 12, 20, 222, 29
-AUTOCHECKBOX "A sticky keys", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 
222, 14
-GROUPBOX "Options", -1, 6, 83, 234, 44
-AUTOCHECKBOX " modifier key twice to lock", IDC_STICKY_LOCK_CHECK,
+AUTOCHECKBOX "スティッキーキーを有効にする()", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 222, 
14
+GROUPBOX "オプション", -1, 6, 83, 234, 44
+AUTOCHECKBOX "修飾キーを2回押すとロックする()", IDC_STICKY_LOCK_CHECK,
  12, 94, 222, 14
-AUTOCHECKBOX " StickyKeys off if two keys are pressed at once", 
IDC_STICKY_UNLOCK_CHECK,
+AUTOCHECKBOX "一度に2つのキーが押されたらスティッキーをオフにする()", IDC_STICKY_UNLOCK_CHECK,
  12, 106, 222, 14
-GROUPBOX "Notifications", -1, 6, 133, 234, 44
-AUTOCHECKBOX " sounds when the modifier key is pressed", 
IDC_STICKY_SOUND_CHECK,
+GROUPBOX "通知", -1, 6, 133, 234, 44
+AUTOCHECKBOX "修飾キーが押されたら音を鳴らす()", IDC_STICKY_SOUND_CHECK,
  12, 148, 222, 14
-AUTOCHECKBOX " StickyKeys status on screen", IDC_STICKY_STATUS_CHECK,
+AUTOCHECKBOX "スティッキーの状態をスクリーンに表示()", IDC_STICKY_STATUS_CHECK,
  12, 160, 222, 14
 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14
-PUSHBUTTON "Cancel", IDCANCEL, 189, 207, 50, 14
+PUSHBUTTON "キャンセル", IDCANCEL, 189, 207, 50, 14
 END
 
 IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Filter Keys Settings"
+CAPTION "フィルタキー設定"
 FONT 9, "MS UI Gothic"
 BEGIN
-GROUPBOX "Keyboard shortcut", -1, 6, 11, 234, 62
-LTEXT "The shortcut for FilterKeys is:  \nHold down  for 
eight seconds.",
+GROUPBOX "キーボード ショートカット", -1, 6, 11, 234, 62
+LTEXT "フィルタキーのショートカットは:  \n<右Shift>を8秒間押し続ける。",
   -1, 12, 20, 222, 29
 AUTOCHECKBOX " shortcut", IDC_FILTER_ACTIVATE_CHECK, 12, 49, 126, 14
-GROUPBOX "Filter options", -1, 6, 79, 234,

[ros-diffs] [reactos] 01/01: [SYSSETUP] Small fix in Japanese translation

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d51716f1313efd9dd8988702c37b9da8c414c0ed

commit d51716f1313efd9dd8988702c37b9da8c414c0ed
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 11:04:48 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 11:04:48 2020 +0900

[SYSSETUP] Small fix in Japanese translation
---
 dll/win32/syssetup/lang/ja-JP.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index dd460d51a11..c0ca05645a3 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -249,6 +249,6 @@ BEGIN
 IDS_PRODUCTSUBTITLE "システムのふるまいに影響する製品オプションを選べます。"
 IDS_PRODUCTSERVERNAME "ReactOS Server"
 IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (既定)"
-IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイ ピクチャ"", ""マイ ビデオ"" 
and ""マイ ミュージック"" は ""マイ ドキュメント"" から独立しています。"
-IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイ ピクチャ"", 
""マイ ビデオ"" and ""マイ ミュージック"" は、""マイ ドキュメント"" の中にあります。"
+IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイ ピクチャ""、""マイ 
ビデオ""、""マイ ミュージック"" は ""マイ ドキュメント"" から独立しています。"
+IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイ 
ピクチャ""、""マイ ビデオ""、""マイ ミュージック"" は、""マイ ドキュメント"" の中にあります。"
 END

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve Japanese translation

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aec7a2bf5be636bd887f8d2886a851331c7002ea

commit aec7a2bf5be636bd887f8d2886a851331c7002ea
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 09:41:46 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 09:41:46 2020 +0900

[SYSSETUP] Improve Japanese translation
---
 dll/win32/syssetup/lang/ja-JP.rc | 44 
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 466d0ed94dd..3c67332a409 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -23,20 +23,20 @@ BEGIN
 END
 
 IDD_PRODUCT DIALOGEX 0, 0, 317, 143
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS セットアップ"
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
-FONT 8, "MS Shell Dlg"
+FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
 ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
-LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
-LTEXT "Product :", IDC_STATIC, 5, 32, 85, 10
+LTEXT "製品オプションをお選び下さい:", IDC_STATIC, 35, 7, 230, 12
+LTEXT "製品オプション():", IDC_STATIC, 5, 32, 85, 10
 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | 
CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
+GROUPBOX "製品情報", IDC_STATIC, 5, 50, 305, 85
 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
 LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10
 EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL
-LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10
+LTEXT "説明:", IDC_STATIC, 20, 102, 70, 10
 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | 
ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL
 END
 
@@ -150,20 +150,20 @@ END
 
 IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Settings"
+CAPTION "高度な設定"
 FONT 8, "MS Shell Dlg"
 BEGIN
-RTEXT " Rate:", -1, 27, 35, 90, 8
-LTEXT "reports per second", -1, 169, 35, 76, 8
+RTEXT "サンプルレート():", -1, 27, 35, 90, 8
+LTEXT "報告/秒", -1, 169, 35, 76, 8
 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | 
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
-RTEXT " Detection:", -1, 27, 55, 90, 8
+RTEXT "ホイール検出():", -1, 27, 55, 90, 8
 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | 
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
-RTEXT " buffer length:", -1, 27, 75, 90, 8
-LTEXT "packets", -1, 169, 75, 26, 8
+RTEXT "入力バッファの長さ():", -1, 27, 75, 90, 8
+LTEXT "パケット", -1, 169, 75, 26, 8
 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | 
ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER
 CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | 
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 
70, 10, 14
-AUTOCHECKBOX " Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
-PUSHBUTTON "", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14
+AUTOCHECKBOX "高速初期化()", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
+PUSHBUTTON "既定()", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14
 END
 
 STRINGTABLE
@@ -230,9 +230,9 @@ END
 
 STRINGTABLE
 BEGIN
-IDS_DETECTIONDISABLED "Detection disabled"
-IDS_LOOKFORWHEEL "Look for wheel"
-IDS_ASSUMEPRESENT "Assume wheel is present"
+IDS_DETECTIONDISABLED "検出は無効です"
+IDS_LOOKFORWHEEL "ホイールを探す"
+IDS_ASSUMEPRESENT "ホイールの存在を仮定"
 END
 
 STRINGTABLE
@@ -245,10 +245,10 @@ END
 
 STRINGTABLE
 BEGIN
-IDS_PRODUCTTITLE "Product Options"
-IDS_PRODUCTSUBTITLE "You can choose a product option that affects the 
behaviour of the system."
+IDS_PRODUCTTITLE "製品オプション"
+IDS_PRODUCTSUBTITLE "システムのふるまいに影響する製品オプションを選べます。"
 IDS_PRODUCTSERVERNAME "ReactOS Server"
-IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
-IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private 
folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from 
""My Documents""."
-IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a 
workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" 
are in ""My Documents""."
+IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (既定)"
+IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイ ピクチャ"", ""マイ ビデオ"" 
and ""マイ ミュージック"" は ""マイ ドキュメント"" から独立しています。"
+IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイ ピクチャ"", 
""マイ ビデオ"" and ""マイ ミュージック"" は、""マイ ドキュメント"" の中にあります。"
 END

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve resource ATTENTION comments

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba17d87636aae02273abfd784a22b5c0aa2fecf9

commit ba17d87636aae02273abfd784a22b5c0aa2fecf9
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 09:52:58 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 09:52:58 2020 +0900

[SYSSETUP] Improve resource ATTENTION comments
---
 dll/win32/syssetup/lang/bg-BG.rc | 2 +-
 dll/win32/syssetup/lang/cs-CZ.rc | 2 +-
 dll/win32/syssetup/lang/da-DK.rc | 2 +-
 dll/win32/syssetup/lang/de-DE.rc | 2 +-
 dll/win32/syssetup/lang/el-GR.rc | 2 +-
 dll/win32/syssetup/lang/en-US.rc | 2 +-
 dll/win32/syssetup/lang/es-ES.rc | 2 +-
 dll/win32/syssetup/lang/et-EE.rc | 2 +-
 dll/win32/syssetup/lang/fi-FI.rc | 2 +-
 dll/win32/syssetup/lang/fr-FR.rc | 2 +-
 dll/win32/syssetup/lang/he-IL.rc | 2 +-
 dll/win32/syssetup/lang/hi-IN.rc | 2 +-
 dll/win32/syssetup/lang/hu-HU.rc | 2 +-
 dll/win32/syssetup/lang/id-ID.rc | 2 +-
 dll/win32/syssetup/lang/it-IT.rc | 2 +-
 dll/win32/syssetup/lang/ja-JP.rc | 2 +-
 dll/win32/syssetup/lang/lt-LT.rc | 2 +-
 dll/win32/syssetup/lang/nl-NL.rc | 2 +-
 dll/win32/syssetup/lang/no-NO.rc | 2 +-
 dll/win32/syssetup/lang/pl-PL.rc | 2 +-
 dll/win32/syssetup/lang/pt-BR.rc | 2 +-
 dll/win32/syssetup/lang/pt-PT.rc | 2 +-
 dll/win32/syssetup/lang/ro-RO.rc | 2 +-
 dll/win32/syssetup/lang/ru-RU.rc | 2 +-
 dll/win32/syssetup/lang/sk-SK.rc | 2 +-
 dll/win32/syssetup/lang/sq-AL.rc | 2 +-
 dll/win32/syssetup/lang/sv-SE.rc | 2 +-
 dll/win32/syssetup/lang/th-TH.rc | 2 +-
 dll/win32/syssetup/lang/tr-TR.rc | 2 +-
 dll/win32/syssetup/lang/uk-UA.rc | 2 +-
 dll/win32/syssetup/lang/zh-CN.rc | 2 +-
 dll/win32/syssetup/lang/zh-TW.rc | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 81818e58615..bd45825696e 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Подкарване на устройствата..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 0f6f313dfc2..612df4cd96a 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -227,7 +227,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Instaluji zařízení..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index bb8ae55b40d..e6a6b4adbf8 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -240,7 +240,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Installing devices..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Programmer"
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index 49311538f63..0b0fdab539a 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Geräte werden installiert..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Programme"
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index da95c35a699..d5d49ce27f9 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -221,7 +221,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Εγκατάσταση συσκευών..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index fa52280a237..ec146f004bf 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -241,7 +241,7 @@ BEGIN
 IDS_STATUS_INSTALL_DEV "Installing devices..."
 END
 
-/* ATTENTION: Synchronize the translation of these strings with shell32 */
+/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */
 STRINGTABLE
 BEGIN
 IDS_PROGRAMFILES "%SystemDrive%\\Program Files"
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 2e72c99934f..7a66a88564c 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -229,7 +229,7 @@ BEGIN

[ros-diffs] [reactos] 01/01: [CPL][ACCESS] Japanese translation more

2020-02-14 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9da842a6472218463fd47c76802b7abb1f6cd8ae

commit 9da842a6472218463fd47c76802b7abb1f6cd8ae
Author: Katayama Hirofumi MZ 
AuthorDate: Sat Feb 15 11:08:56 2020 +0900
Commit: Katayama Hirofumi MZ 
CommitDate: Sat Feb 15 11:09:04 2020 +0900

[CPL][ACCESS] Japanese translation more
---
 dll/cpl/access/lang/ja-JP.rc | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dll/cpl/access/lang/ja-JP.rc b/dll/cpl/access/lang/ja-JP.rc
index 4c7a76a654f..98ea2b8bbe1 100644
--- a/dll/cpl/access/lang/ja-JP.rc
+++ b/dll/cpl/access/lang/ja-JP.rc
@@ -109,22 +109,22 @@ END
 
 IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "スティッキーキー設定"
+CAPTION "固定キー設定"
 FONT 9, "MS UI Gothic"
 BEGIN
 GROUPBOX "キー", -1, 6, 11, 234, 62
-LTEXT "スティッキーキー機能を有効にするにはShiftキーを5回押して下さい。",
+LTEXT "固定キー機能を有効にするにはShiftキーを5回押して下さい。",
   -1, 12, 20, 222, 29
-AUTOCHECKBOX "スティッキーキーを有効にする()", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 222, 
14
+AUTOCHECKBOX "固定キーを有効にする()", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 222, 14
 GROUPBOX "オプション", -1, 6, 83, 234, 44
 AUTOCHECKBOX "修飾キーを2回押すとロックする()", IDC_STICKY_LOCK_CHECK,
  12, 94, 222, 14
-AUTOCHECKBOX "一度に2つのキーが押されたらスティッキーをオフにする()", IDC_STICKY_UNLOCK_CHECK,
+AUTOCHECKBOX "一度に2つのキーが押されたら固定キーをオフにする()", IDC_STICKY_UNLOCK_CHECK,
  12, 106, 222, 14
 GROUPBOX "通知", -1, 6, 133, 234, 44
 AUTOCHECKBOX "修飾キーが押されたら音を鳴らす()", IDC_STICKY_SOUND_CHECK,
  12, 148, 222, 14
-AUTOCHECKBOX "スティッキーの状態をスクリーンに表示()", IDC_STICKY_STATUS_CHECK,
+AUTOCHECKBOX "固定キーの状態をスクリーンに表示()", IDC_STICKY_STATUS_CHECK,
  12, 160, 222, 14
 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14
 PUSHBUTTON "キャンセル", IDCANCEL, 189, 207, 50, 14
@@ -198,12 +198,12 @@ BEGIN
 AUTOCHECKBOX " shortcut", IDC_MOUSEKEYS_ACTIVATE_CHECK,
  12, 49, 222, 14
 GROUPBOX "ポインタ速度", -1, 6, 83, 234, 83
-LTEXT " speed:", -1, 12, 96, 48, 11
+LTEXT "最高速度():", -1, 12, 96, 48, 11
 LTEXT "低い", -1, 66, 96, 18, 11
 CONTROL "", IDC_MOUSEKEYS_SPEED_TRACK, "msctls_trackbar32", TBS_AUTOTICKS 
| WS_TABSTOP,
 90, 94, 114, 20
 LTEXT "高い", -1, 204, 96, 18, 11
-LTEXT ":", -1, 12, 123, 48, 11
+LTEXT "加速():", -1, 12, 123, 48, 11
 LTEXT "遅い", -1, 66, 123, 18, 11
 CONTROL "", IDC_MOUSEKEYS_ACCEL_TRACK, "msctls_trackbar32", TBS_AUTOTICKS 
| WS_TABSTOP,
 90, 121, 114, 20

[ros-diffs] [reactos] 01/01: [SHELL32_APITEST] Don't hardcode C:\ReactOS (#2344)

[ros-diffs] [reactos] 02/02: [FREELDR] Separate PC and Xbox platform-specific code (#2185)

[ros-diffs] [reactos] 01/02: [FREELDR] Restructure platform-specific code. No code changes.

[ros-diffs] [reactos] 01/01: [LOCALSPL] Don't hardcode C:\ReactOS (#2343)

[ros-diffs] [reactos] 01/01: [SYSSETUP] Update Russian translation for Product Options page (#2348)

[ros-diffs] [reactos] 01/01: [FREELDR] Separate PC beep routines out into its own file (#2347)

[ros-diffs] [reactos] 01/01: [SHELL32] Better fix for the "Version" string in the About-dialog (#2349)

[ros-diffs] [reactos] 01/01: [BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346)

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve resource ATTENTION comments 2

[ros-diffs] [reactos] 01/01: [BROWSEUI] Improve Japanese translation (IDD_SEARCH_DLG)

[ros-diffs] [reactos] 01/01: [CPL][ACCESS] Improve Japanese translation

[ros-diffs] [reactos] 01/01: [SYSSETUP] Small fix in Japanese translation

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve Japanese translation

[ros-diffs] [reactos] 01/01: [SYSSETUP] Improve resource ATTENTION comments

[ros-diffs] [reactos] 01/01: [CPL][ACCESS] Japanese translation more

15 matches

Site Navigation

Mail list logo

Footer information