diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 31e2208..1d2296f 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -600,7 +600,7 @@ call :oh_hookinstall
if defined _sublic (
if not exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
-call :dk_color %Gray% "Checking Old Office With Sub License [Found. Update Office, otherwise, it may show a licensing issue-related banner.]"
+call :dk_color %Gray% "Checking for Old Office With Sub License [Found, Update Office otherwise it may show a licensing issue-related banner.]"
)
)
@@ -619,7 +619,7 @@ reg add "%kmskey%" /f /v KeyManagementServiceName /t REG_SZ /d "10.0.0.10" /reg:
)
reg delete "%kmskey%" /f %nul%
reg add "%kmskey%" /f /v KeyManagementServiceName /t REG_SZ /d "10.0.0.10" %nul%
-echo Adding a Reg To Prevent Banner [Successful]
+echo Adding a Registry Key to Prevent Banner [Successful]
)
)
@@ -641,7 +641,7 @@ call :oh_licrefresh
echo:
if not defined error (
call :dk_color %Green% "Office is permanently activated."
-if defined ohub call :dk_color %Gray% "Office apps such as Word, Excel are activated, use them directly. Ignore 'Buy' button in Office dashboard app."
+if defined ohub call :dk_color %Gray% "Office apps such as Word, Excel are activated. Search for them and use them directly. Ignore the 'Buy' button in the Office dashboard app."
echo Help: %mas%troubleshoot
) else (
call :dk_color %Red% "Some errors were detected."
@@ -667,7 +667,7 @@ call :oh_reset
call :oh_getpath
echo:
-echo Uninstalling Ohook Activation...
+echo Uninstalling Ohook activation...
echo:
if defined o16c2r_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o16c2r_reg% /v InstallPath" %nul6%') do (set "_16CHook=%%b\root\vfs"))
@@ -698,7 +698,7 @@ if exist "%%~A\Microsoft %%~G\root\vfs\%%#\sppc*dll" (set _present=1& del /s /f
reg query HKCU\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency %nul% && (
echo:
-echo Deleting - Registry keys to skip license check from all ^& future new useraccounts
+echo Deleting - Registry keys for skipping license check
reg load HKU\DEF_TEMP %SystemDrive%\Users\Default\NTUSER.DAT %nul%
reg query HKU\DEF_TEMP\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency %nul% && reg delete HKU\DEF_TEMP\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency /f
@@ -723,7 +723,7 @@ reg unload HKU\%%# %nul%
set "kmskey=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\0ff1ce15-a989-479d-af46-f275c6370663"
reg query "%kmskey%" %nul% && (
echo:
-echo Deleting - Registry keys to prevent non-genuine banner
+echo Deleting - Registry keys for preventing non-genuine banner
reg delete "%kmskey%" /f
)
@@ -735,16 +735,16 @@ echo ___________________________________________________________________________
echo:
if not defined _present (
-echo Ohook Activation is not installed.
+echo Ohook activation is not installed.
) else (
if defined _unerror (
call :dk_color %Red% "Failed to uninstall Ohook activation."
call :oh_checkapps
if defined checknames (
call :dk_color %Blue% "Close [!checknames!] and try again."
-call :dk_color %Blue% "If its still not resolved then restart system and try again."
+call :dk_color %Blue% "If it is still not fixed, then restart your system and try again."
) else (
-call :dk_color %Blue% "Restart system and try again."
+call :dk_color %Blue% "Restart your system and try again."
)
) else (
call :dk_color %Green% "Successfully uninstalled Ohook activation."
@@ -808,7 +808,7 @@ exit /b
:oh_fixprids
if not defined _prids (
-call :dk_color %Gray% "Checking ProductReleaseIds In Registry [Not Found]"
+call :dk_color %Gray% "Checking for ProductReleaseIds Registry [Not Found]"
exit /b
)
@@ -919,11 +919,11 @@ if not exist "%_hookPath%\sppc.dll" (if not defined ierror set ierror=Copy)
echo:
if not defined ierror (
-echo Symlinking System's sppc.dll To ["%_hookPath%\sppcs.dll"] [Successful]
+echo Symlinking System sppc.dll to ["%_hookPath%\sppcs.dll"] [Successful]
if defined exhook (
-echo Copying Custom %_hook% To ["%_hookPath%\sppc.dll"] [Successful]
+echo Copying Custom %_hook% to ["%_hookPath%\sppc.dll"] [Successful]
) else (
-echo Extracting Custom %_hook% To ["%_hookPath%\sppc.dll"] [Successful]
+echo Extracting Custom %_hook% to ["%_hookPath%\sppc.dll"] [Successful]
)
) else (
set error=1
@@ -932,9 +932,9 @@ echo:
call :oh_checkapps
if defined checknames (
call :dk_color %Blue% "Close [!checknames!] and try again."
-call :dk_color %Blue% "If its still not resolved then restart system and try again."
+call :dk_color %Blue% "If it is still not fixed, then restart your system and try again."
) else (
-if /i not "%ierror%"=="Copy" call :dk_color %Blue% "Restart system and try again."
+if /i not "%ierror%"=="Copy" call :dk_color %Blue% "Restart your system and try again."
if /i "%ierror%"=="Copy" call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script."
)
echo:
@@ -981,8 +981,8 @@ echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
call :dk_inskey "[!key!] [!_prod!] [!_lic!]"
) else (
set error=1
-call :dk_color %Red% "Checking Product In Script [Office %oVer%.0 !_prod! not found in script]"
-call :dk_color %Blue% "Make sure you are using Latest MAS script."
+call :dk_color %Red% "Checking for the Product in the Script [Office %oVer%.0 !_prod! Not Found]"
+call :dk_color %Blue% "Make sure you are using the latest version of MAS."
set fixes=%fixes% %mas%
call :dk_color %_Yellow% "%mas%"
)
@@ -996,7 +996,7 @@ if defined winserver if defined _config (
echo %_oIds% | find /i "Retail" %nul1% && (
set scaIsNeeded=1
reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
-echo Adding SharedComputerLicensing Reg [Successful] [Needed On Server With Retail Office]"
+echo Adding SharedComputerLicensing Registry [Successful] [Needed on Windows Server With Retail Office]"
)
)
@@ -1043,13 +1043,13 @@ echo Activating Office... [MSI ^| %_version% ^| %_oArch%]
if not defined _oBranding (
set error=1
-call :dk_color %Red% "Checking BRANDING.XML [Not Found. Aborting activation...]"
+call :dk_color %Red% "Checking for BRANDING.XML [Not Found, aborting...]"
exit /b
)
if not defined _oIds (
set error=1
-call :dk_color %Red% "Checking Installed Products [Product IDs not found. Aborting activation...]"
+call :dk_color %Red% "Checking for Installed Product ID's [Product IDs not found, aborting...]"
exit /b
)
@@ -1110,7 +1110,7 @@ for /f "tokens=* delims=" %%a in ('%psc% "$p = 'HKLM:\SOFTWARE\Microsoft\Windows
if not defined _sidlist (
set error=1
-call :dk_color %Red% "Checking User Accounts SID [Not Found]"
+call :dk_color %Red% "Checking for User Account SID's [Not Found]"
exit /b
)
@@ -1118,7 +1118,7 @@ set /a counter=0
for %%# in (%_sidlist%) do set /a counter+=1
if %counter% GTR 10 (
-call :dk_color %Gray% "Checking Total User Accounts [%counter%]"
+call :dk_color %Gray% "Checking Total User Account Count [%counter%]"
)
::==========================
@@ -1188,7 +1188,7 @@ reg delete "HKLM\SOFTWARE\Microsoft\Office\%%#.0\Common\OEM" /f /reg:32 %nul%
reg delete "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Policies\0ff1ce15-a989-479d-af46-f275c6370663" /f %nul%
-echo Clearing Office License Blocks [Successfully Cleared From All %counter% Useraccounts]
+echo Clearing Office License Blocks [Successfully cleared from all %counter% user accounts]
::==========================
@@ -1206,7 +1206,7 @@ for %%# in (%_sidlist%) do (
reg delete HKU\%%#\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency /f %nul%
reg add HKU\%%#\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency /v "TimeOfLastHeartbeatFailure" /t REG_SZ /d "2040-01-01T00:00:00Z" /f %nul%
)
-echo Adding Reg Keys To Skip License Check [Successfully Added To All %counter% ^& Future New Useraccounts]
+echo Adding Reg Keys to Skip License Check [Successfully added to all %counter% ^& future new user accounts]
)
::==========================
@@ -1220,14 +1220,14 @@ reg query HKU\%%# %nul% && set failedtounload=1
if defined failedtoload (
set error=1
-call :dk_color %Red% "Loading Unloaded accounts Registry [Failed For Some Useraccounts]"
-call :dk_color %Blue% "Restart the system and try again."
+call :dk_color %Red% "Loading Unloaded Accounts Registry [Failed for some user accounts]"
+call :dk_color %Blue% "Restart your system and try again."
)
if defined failedtounload (
set error=1
-call :dk_color %Red% "Unloading loaded accounts Registry [Failed For Some Useraccounts]"
-call :dk_color %Blue% "Restart the system and try again."
+call :dk_color %Red% "Unloading Loaded Account Registries [Failed for some user accounts]"
+call :dk_color %Blue% "Restart your system and try again."
)
exit /b
@@ -1398,7 +1398,7 @@ echo Installing Generic Product Key %~1 [Successful]
) else (
call :dk_color %Red% "Installing Generic Product Key %~1 [Failed] %keyerror%"
if not defined error (
-if defined altapplist call :dk_color %Red% "Activation ID not found for this key."
+if defined altapplist call :dk_color %Red% "No Activation ID was found for this key."
call :dk_color %Blue% "%_fixmsg%"
set showfix=1
)
@@ -1531,7 +1531,7 @@ for %%G in (DependOnService Description DisplayName ErrorControl ImagePath Objec
reg query HKLM\SYSTEM\CurrentControlSet\Services\%%# /v %%G %nul% || (set _corrupt=1 & set /a wucount+=1)
)
)
-if %wucount% GEQ 1 set "results=%results%[WU registry is corrupt]"
+if %wucount% GEQ 1 set "results=%results%[Windows Update registry is corrupt]"
sc start sppsvc %nul%
echo "%errorlevel%" | findstr "577 225" %nul% && (
@@ -1541,7 +1541,7 @@ if not exist %SysPath%\sppsvc.exe if not exist %SysPath%\alg.exe (set "results=%
)
if not "%results%%pupfound%"=="" (
-if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]"
+if defined pupfound call :dk_color %Gray% "Checking for PUP Activators [Found%pupfound%]"
if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection %results%"
set fixes=%fixes% %mas%remove_mal%w%ware
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
@@ -1561,7 +1561,7 @@ call :dk_chkmal
sc query Null %nul% || (
set error=1
set showfix=1
-call :dk_color %Red% "Checking Sandboxing [Found. Script may not work properly.]"
+call :dk_color %Red% "Checking for Sandboxing [Found, the script may not work properly.]"
call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script."
echo:
)
@@ -1586,7 +1586,7 @@ if defined _corrupt (if defined serv_cor (set "serv_cor=!serv_cor! %%#") else (s
if defined serv_cor (
set error=1
set showfix=1
-call :dk_color %Red% "Checking Corrupt Services [%serv_cor%]"
+call :dk_color %Red% "Checking for Corrupt Services [%serv_cor%]"
)
::========================================================================================================================================
@@ -1652,7 +1652,7 @@ if defined serv_e (
set error=1
call :dk_color %Red% "Starting Services [Failed] [%serv_e%]"
echo %serv_e% | findstr /i "ClipSVC-1058 sppsvc-1058" %nul% && (
-call :dk_color %Blue% "Restart the system to fix this error."
+call :dk_color %Blue% "Restart your system to fix this error."
set showfix=1
)
)
@@ -1664,7 +1664,7 @@ set showfix=1
if defined safeboot_option (
set error=1
set showfix=1
-call :dk_color2 %Red% "Checking Boot Mode [%safeboot_option%] " %Blue% "[Safe mode found. Run in normal mode.]"
+call :dk_color2 %Red% "Checking Boot Mode [%safeboot_option%] " %Blue% "[Safe mode detected, run in normal mode.]"
)
@@ -1674,7 +1674,7 @@ set error=1
call :dk_color %Red% "Checking Windows Setup State [%imagestate%]"
echo "%imagestate%" | find /i "RESEAL" %nul% && (
set showfix=1
-call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode."
+call :dk_color %Blue% "You need to run the script in normal mode in case you are running it in Audit Mode."
)
)
@@ -1682,7 +1682,7 @@ call :dk_color %Blue% "You need to run it in normal mode in case you are running
reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinPE" /v InstRoot %nul% && (
set error=1
set showfix=1
-call :dk_color2 %Red% "Checking WinPE " %Blue% "[WinPE mode found. Run in normal mode.]"
+call :dk_color2 %Red% "Checking for WinPE Mode " %Blue% "[WinPE mode found. Run in normal mode.]"
)
@@ -1692,7 +1692,7 @@ for /f "delims=" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':w
echo "%wpainfo%" | find /i "Error Found" %nul% && (
set error=1
set wpaerror=1
-call :dk_color %Red% "Checking WPA Registry Error [%wpainfo%]"
+call :dk_color %Red% "Checking for WPA Registry Errors [%wpainfo%]"
) || (
echo Checking WPA Registry Count [%wpainfo%]
)
@@ -1701,7 +1701,7 @@ echo Checking WPA Registry Count [%wpainfo%]
if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (
set error=1
-call :dk_color %Red% "Checking Eval Packages [Non-Eval Licenses are installed in Eval Windows]"
+call :dk_color %Red% "Checking for Evaluation Packages [Non-Evaluation Licenses are installed in Evaluation Windows]"
set fixes=%fixes% %mas%evaluation_editions
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
)
@@ -1720,18 +1720,18 @@ if "%osSKU%"=="165" set osedition=ProfessionalEducationN
if not defined officeact (
if %osedition%==0 (
-call :dk_color %Red% "Checking Edition Name [Not Found In Registry]"
+call :dk_color %Red% "Checking for Edition Name [Not Found in Registry]"
) else (
if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
set error=1
set skunotfound=1
-call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]"
+call :dk_color %Red% "Checking for License Files [Not Found] [%osedition%]"
)
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
set error=1
-call :dk_color %Red% "Checking Package File [Not Found] [%osedition%]"
+call :dk_color %Red% "Checking for Package Files [Not Found] [%osedition%]"
)
)
)
@@ -1780,14 +1780,14 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found
reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (
set error=1
set showfix=1
-call :dk_color2 %Red% "Checking Rearm " %Blue% "[System Restart Is Required]"
+call :dk_color2 %Red% "Checking for Rearm " %Blue% "[System Restart is Required]"
)
reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (
set error=1
set showfix=1
-call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System Restart Is Required]"
+call :dk_color2 %Red% "Checking for Volatile ClipSVC Key " %Blue% "[System Restart is Required]"
)
@@ -1795,14 +1795,14 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && (
-echo Checking Eval WLMS Service [Found]
+echo Checking for Evaluation WLMS Service [Found]
)
)
reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || (
set error=1
-call :dk_color %Red% "Checking HKU\S-1-5-20 Reg [Not Found]"
+call :dk_color %Red% "Checking for HKU\S-1-5-20 Registry [Not Found]"
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
)
@@ -1812,13 +1812,13 @@ for %%# in (SppEx%w%tComObj.exe sppsvc.exe) do (
reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ima%w%ge File Execu%w%tion Options\%%#" %nul% && (if defined _sppint (set "_sppint=!_sppint!, %%#") else (set "_sppint=%%#"))
)
if defined _sppint (
-echo Checking SPP Interference In IFEO [%_sppint%]
+echo Checking for SPP Interference in IFEO [%_sppint%]
)
for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" %nul6%') do if /i %%b NEQ 0x0 (
reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%
-call :dk_color %Red% "Checking SkipRearm [Default 0 Value Not Found. Changing To 0]"
+call :dk_color %Red% "Checking for SkipRearm [Default 0 Value Not Found. Changing To 0]"
%psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 10 | Out-Null"
set error=1
)
@@ -1827,7 +1827,7 @@ set error=1
reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found]"
set fixes=%fixes% %mas%issues_due_to_gaming_spoofers
-call :dk_color2 %Blue% "Possibly Caused By Gaming Spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
+call :dk_color2 %Blue% "Possibly Caused By HWID Spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
set error=1
set showfix=1
)
@@ -1857,9 +1857,9 @@ set "d=!d! $AclObject.SetSecurityDescriptorSddlForm($sddl);"
set "d=!d! Set-Acl -Path %tokenstore% -AclObject $AclObject;"
%psc% "!d!" %nul%
if exist "%tokenstore%\" (
-call :dk_color %Gray% "Checking SPP Token Folder [Not Found. Created Now] [%tokenstore%\]"
+call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creating Now] [%tokenstore%\]"
) else (
-call :dk_color %Red% "Checking SPP Token Folder [Not Found. Failed To Create] [%tokenstore%\]"
+call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]"
set error=1
set showfix=1
)
@@ -1877,14 +1877,14 @@ if not defined allapps (
set "_notfoundids=Not found"
)
set error=1
-call :dk_color %Red% "Checking Activation IDs [!_notfoundids!]"
+call :dk_color %Red% "Checking Activation ID's [!_notfoundids!]"
)
)
if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (
set error=1
-call :dk_color %Red% "Checking SPP tokens.dat [Not Found] [%tokenstore%\]"
+call :dk_color %Red% "Checking for SPP tokens.dat [Not Found] [%tokenstore%\]"
)
@@ -1977,7 +1977,7 @@ if ($osVersion.Build -ge $minBuildNumber) {
}
for ($i=1; $i -le $count; $i++) {
if (-not $subkeyHashTable.ContainsKey("$i")) {
- Write-Output "Total Keys $count. Error Found- $i key does not exist"
+ Write-Output "Total Keys $count. Error Found - $i key does not exist"
$wpaKey.Close()
exit
}
@@ -1988,7 +1988,7 @@ $wpaKey.GetSubKeyNames() | ForEach-Object {
if ($PSVersionTable.PSVersion.Major -lt 3) {
cmd /c "reg query "HKLM\SYSTEM\WPA\$_" /ve /t REG_BINARY >nul 2>&1"
if ($LASTEXITCODE -ne 0) {
- Write-Host "Total Keys $count. Error Found- Binary Data is corrupt"
+ Write-Host "Total Keys $count. Error Found - Binary Data is corrupt"
$wpaKey.Close()
exit
}
@@ -1996,7 +1996,7 @@ $wpaKey.GetSubKeyNames() | ForEach-Object {
$subkey = $wpaKey.OpenSubKey($_)
$p = $subkey.GetValueNames()
if (($p | Where-Object { $subkey.GetValueKind($_) -eq [Microsoft.Win32.RegistryValueKind]::Binary }).Count -eq 0) {
- Write-Host "Total Keys $count. Error Found- Binary Data is corrupt"
+ Write-Host "Total Keys $count. Error Found - Binary Data is corrupt"
$wpaKey.Close()
exit
}