https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183566ee584efbe6377c7…
commit 183566ee584efbe6377c79e68bfe24b2d1f940ae
Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua>
AuthorDate: Sun Aug 15 17:06:56 2021 +0300
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sat Sep 11 01:58:03 2021 +0300
[DSOUND] Don't force status to failure by default in primarybuffer_SetFormat (#3911)
Don't force HRESULT status to DSERR_BUFFERLOST by default in primarybuffer_SetFormat function.
Assign to it S_OK instead, as done in current Wine:
https://source.winehq.org/git/wine.git/blob/a8583acae9548e6340d8400ec771013…
That variable is already set to failure in other appropriate place, when this is indeed needed:
https://git.reactos.org/?p=reactos.git;a=blob;h=b04a526929e4e817ff63aa65253…
The assigned failure status caused executing failure handling code even when the fail actually didn't happen.
In particular, DSOUND_ReopenDevice failed on waveOutOpen call when calling this was not needed.
After my changes, it's called only when needed, i. e., only when the actual failure happens
Otherwise, if all goes good, that code is not called, so the data is transfered successfully and the function is working correctly.
It fixes non-working playback in QMMP 0.11.1 (via DirectSound ouput plugin) and AIMP 3.10 and newer versions.
Also it improves the DirectSound test results from MS DxDiag: now all 4 available tests are passing successfully, instead of only 2.
Other dsound issues also might be fixed as well.
CORE-10907 CORE-14783
---
dll/directx/wine/dsound/primary.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dll/directx/wine/dsound/primary.c b/dll/directx/wine/dsound/primary.c
index b04a526929e..9f8ecf8e593 100644
--- a/dll/directx/wine/dsound/primary.c
+++ b/dll/directx/wine/dsound/primary.c
@@ -459,7 +459,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex)
HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex)
{
- HRESULT err = DSERR_BUFFERLOST;
+ HRESULT err = S_OK;
int i;
DWORD nSamplesPerSec, bpp, chans;
LPWAVEFORMATEX oldpwfx;
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce7ac73f89ec136c44a7c…
commit ce7ac73f89ec136c44a7c0d8c732b8a3aeae9356
Author: PopuriAO29 <36154203+PopuriAO29(a)users.noreply.github.com>
AuthorDate: Fri Sep 10 18:10:25 2021 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Sep 10 14:10:25 2021 +0300
[SYSSETUP] Fix en-US translation. Add en-GB translation (#3950)
The British language wasn't included here, so I have corrected some texts that were in American English.
Also fixed one string that uses British English language.
---
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/el-GR.rc | 2 +-
dll/win32/syssetup/lang/{fi-FI.rc => en-GB.rc} | 46 ++++++++------------------
dll/win32/syssetup/lang/en-US.rc | 2 +-
dll/win32/syssetup/lang/et-EE.rc | 2 +-
dll/win32/syssetup/lang/fi-FI.rc | 2 +-
dll/win32/syssetup/lang/he-IL.rc | 2 +-
dll/win32/syssetup/lang/hi-IN.rc | 2 +-
dll/win32/syssetup/lang/it-IT.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/pt-BR.rc | 2 +-
dll/win32/syssetup/lang/ro-RO.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/zh-CN.rc | 2 +-
dll/win32/syssetup/lang/zh-TW.rc | 2 +-
dll/win32/syssetup/syssetup.rc | 3 ++
23 files changed, 38 insertions(+), 53 deletions(-)
diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 19cfc38c22e..80095dae23c 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index c088501a01e..cfa8de1ba10 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -250,7 +250,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index 7159b92d21b..e28cb72f45a 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 170abdeaf9e..3c3a7fdf9f5 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/en-GB.rc
similarity index 88%
copy from dll/win32/syssetup/lang/fi-FI.rc
copy to dll/win32/syssetup/lang/en-GB.rc
index ff3861bb9e2..6eb39517643 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/en-GB.rc
@@ -1,23 +1,4 @@
-/*
- * Copyright (C) 2004 Filip Navara
- * Copyright (C) 2004 Eric Kohl
- *
- * 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.
- */
-
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
@@ -61,10 +42,10 @@ CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20
- LTEXT "Type your full name and the name of your company or organization.", IDC_STATIC, 54, 7, 242, 21
+ LTEXT "Type your full name and the name of your company or organisation.", IDC_STATIC, 54, 7, 242, 21
LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8
EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
- LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8
+ LTEXT "&Organisation:", IDC_STATIC, 54, 57, 44, 8
EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
END
@@ -94,12 +75,12 @@ BEGIN
ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
LTEXT "The system locale should match the language of the applications you want to use. The user locale controls how numbers, currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20
LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
- LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8
- PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
+ LTEXT "To change system or user locale settings, click Customise.", IDC_STATIC, 53, 60, 196, 8
+ PUSHBUTTON "&Customise...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
- LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8
- PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
+ LTEXT "To change the keyboard layout, click Customise.", IDC_STATIC, 53, 126, 184, 8
+ PUSHBUTTON "C&ustomise...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
END
IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143
@@ -179,7 +160,7 @@ BEGIN
LTEXT "packets", -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 "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
+ AUTOCHECKBOX "&Fast Initialisation", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14
END
@@ -187,18 +168,19 @@ STRINGTABLE
BEGIN
IDS_ACKTITLE "Acknowledgements"
IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information"
- IDS_OWNERTITLE "Personalize your Software"
- IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalize ReactOS."
+ IDS_OWNERTITLE "Personalise your Software"
+ IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalise ReactOS."
IDS_COMPUTERTITLE "Computer Name and Administrator Password"
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer."
IDS_LOCALETITLE "Regional settings"
- IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages."
+ IDS_LOCALESUBTITLE "You can customise ReactOS for different regions and languages."
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
IDS_PROCESSSUBTITLE "Please wait..."
IDS_THEMESELECTIONTITLE "Appearance"
IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer."
+
END
STRINGTABLE
@@ -266,7 +248,7 @@ BEGIN
IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
- 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_PRODUCTSERVERINFO "The system will be recognised as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
+ IDS_PRODUCTWORKSTATIONINFO "The system will be recognised as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""."
IDS_DEFAULT "(Default)"
END
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index 0660c4c41c4..c13f9fb9a8e 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -264,7 +264,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index 78e709380ae..ba0990719c1 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index ff3861bb9e2..5012886106f 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index 07ebe207ed9..908c2f0019b 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index d84f00b7b24..149cb0752db 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -252,7 +252,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index e7eab20fbf4..85d6b2ce29a 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index 86823b22672..9a7723ea847 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index f636b1d9b5c..9d0fb04e0dd 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index 292971ee1a5..ac48f213528 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index 38ebaefcf07..c518171efac 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -244,7 +244,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 9bdeac2c74d..53eec42c5e4 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -253,7 +253,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index a6e03a142b2..d301830e352 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -250,7 +250,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index a62635f8b5a..328684089b5 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index acbbd0cd301..45f0ae6d611 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 211ecb24712..2a81ce914b2 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -263,7 +263,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index 513adaefc56..1c2c5e36d12 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -249,7 +249,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "Product Options"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index bd8311b1796..5859023605b 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -274,7 +274,7 @@ END
STRINGTABLE
BEGIN
IDS_PRODUCTTITLE "產品選擇"
- IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system."
+ IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system."
IDS_PRODUCTSERVERNAME "ReactOS Server"
IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""."
diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc
index ce7f4a460a9..1b15003d918 100644
--- a/dll/win32/syssetup/syssetup.rc
+++ b/dll/win32/syssetup/syssetup.rc
@@ -62,6 +62,9 @@ IDR_GPL RT_TEXT "COPYING"
#ifdef LANGUAGE_EL_GR
#include "lang/el-GR.rc"
#endif
+#ifdef LANGUAGE_EN_GB
+ #include "lang/en-GB.rc"
+#endif
#ifdef LANGUAGE_EN_US
#include "lang/en-US.rc"
#endif
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=647ba1cb45b87bb229280…
commit 647ba1cb45b87bb229280843ff48a1f90e806eed
Author: PopuriAO29 <36154203+PopuriAO29(a)users.noreply.github.com>
AuthorDate: Fri Sep 10 05:48:41 2021 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Sep 10 01:48:41 2021 +0300
[DESK] Correction for English (United Kingdom) translation (#3949)
The word "personalize" should be "personalise" in British English.
---
dll/cpl/desk/lang/en-GB.rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc
index 9ac99cd9eb9..7c373470442 100644
--- a/dll/cpl/desk/lang/en-GB.rc
+++ b/dll/cpl/desk/lang/en-GB.rc
@@ -5,7 +5,7 @@ CAPTION "Themes"
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30
+ LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalise your computer with one click.", IDC_STATIC, 5, 5, 235, 30
LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10
COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7255f1584909d1cfbd22…
commit d7255f1584909d1cfbd22c1b20fcc958dccf5c90
Author: George Bișoc <george.bisoc(a)reactos.org>
AuthorDate: Wed Sep 8 18:25:50 2021 +0200
Commit: George Bișoc <george.bisoc(a)reactos.org>
CommitDate: Thu Sep 9 19:29:53 2021 +0200
[NTOS:SE] Explicitly check the auto inherit flags right away
As we now have the SEF_* flags declared within the SDK we can simply check for such flags directly wihout having to check for the hard-coded flag values.
---
ntoskrnl/se/sd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c
index c3be55a677c..98de8842619 100644
--- a/ntoskrnl/se/sd.c
+++ b/ntoskrnl/se/sd.c
@@ -1285,7 +1285,7 @@ SeAssignSecurityEx(
}
if (!Owner)
{
- if (AutoInheritFlags & 0x20 /* FIXME: SEF_DEFAULT_OWNER_FROM_PARENT */)
+ if (AutoInheritFlags & SEF_DEFAULT_OWNER_FROM_PARENT)
{
DPRINT("Use parent owner sid!\n");
if (!ARGUMENT_PRESENT(ParentDescriptor))
@@ -1317,7 +1317,7 @@ SeAssignSecurityEx(
}
if (!Group)
{
- if (AutoInheritFlags & 0x40 /* FIXME: SEF_DEFAULT_GROUP_FROM_PARENT */)
+ if (AutoInheritFlags & SEF_DEFAULT_GROUP_FROM_PARENT)
{
DPRINT("Use parent group sid!\n");
if (!ARGUMENT_PRESENT(ParentDescriptor))