[0.4.14][REACTOS] Remove references to ReactOS Foundation (#4557)

See https://reactos.org/wiki/ReactOS_Foundation for more information.

the first part of CORE-18191

picked from 0.4.15-dev-4866-g 6881d8c6247c8d27e57c3a6112bf386204f089be

Respect:
-Colins wish to leave out for now all the matches in kbdtool for legal uncertainty
-boot_images.cmake on master vs. boot/CMakeLists.txt in older branches
-treating cpu.inf special in this first commit for the sake of keeping sync to all other infs
-unlike master I decided to groom also cdmake, because I don't see any reason yet to dump that
 in the older branches
-all releases down to releases/0.4.7 were released for the first time after the "ReactOS foundation"
 dissolved already in 2015. So all are definitely fine to receive this commit.
-port back some EOL whitespace fixes as well in common.ver to sync the file to 100% to master head

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 727f75a..85eeece 100644 (file)
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -54,8 +54,8 @@ ${_efisys_file} 1
 ")
 
 # ISO image identifier names
-set(ISO_MANUFACTURER "ReactOS Foundation")  # For both the publisher and the preparer
-set(ISO_VOLNAME      "ReactOS")             # For both the Volume ID and the Volume set ID
+set(ISO_MANUFACTURER "ReactOS Project") # For both the publisher and the preparer
+set(ISO_VOLNAME      "ReactOS")         # For both the Volume ID and the Volume set ID
 
 
 # Create user profile directories in the LiveImage

diff --git a/media/inf/cpu.inf b/media/inf/cpu.inf
index 1676a72..9959d8b 100644 (file)
--- a/media/inf/cpu.inf
+++ b/media/inf/cpu.inf
@@ -111,7 +111,7 @@ LoadOrderGroup = Extended Base
 
 [Strings]
 
-ReactOS = "ReactOS Foundation"
+ReactOS = "ReactOS Team"
 ProcessorClassName = "Processors"
 
 CyrixMfg = "Cyrix"

diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc b/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc
index 5c60771..ad3c155 100644 (file)
--- a/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc
+++ b/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Black Shade"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Images by David Quintana <gigaherz@gmail.com>"
 5004, "Images released under CC-BY-SA 4.0"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc
index c74a4cb..a3ac0a4 100644 (file)
--- a/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc
+++ b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Black Shade"
 5001, "Stile di visualizzazione"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Immagini di David Quintana <gigaherz@gmail.com>"
 5004, "Immagini rilasciate sotto licenza CC-BY-SA 4.0"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc b/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc
index 21a936e..5e5b473 100644 (file)
--- a/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc
+++ b/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Lautus"
 5001, "Visueller Stil"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Pisarz, basierend auf Luna Inspirat"
 5004, "Veröffentlicht unter GNU/GPL 2.0, 2011"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Lautus/lautus.msstyles/lang/en-US.rc b/media/themes/Lautus/lautus.msstyles/lang/en-US.rc
index 7c90dbf..67c9554 100644 (file)
--- a/media/themes/Lautus/lautus.msstyles/lang/en-US.rc
+++ b/media/themes/Lautus/lautus.msstyles/lang/en-US.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Lautus"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Pisarz, based on Luna Inspirat"
 5004, "Released under GNU/GPL 2.0, 2011"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc b/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc
index 367302f..7dbbf11 100644 (file)
--- a/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc
+++ b/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Lautus"
 5001, "Stile di visualizzazione"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Pisarz, basato on Luna Inspirat"
 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2011"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc
index 75890cd..ae58f3b 100644 (file)
--- a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc
+++ b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Lunar"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Cernodile & Illen, built on top of Lautus"
 5004, "Released under GNU/GPL 2.0, 2019"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc
index 98ee489..6a3726c 100644 (file)
--- a/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc
+++ b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Lunar"
 5001, "Stile di visualizzazione"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Cernodile & Illen, basato su Lautus"
 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2019"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc b/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc
index 9d984f4..78eff7e 100644 (file)
--- a/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc
+++ b/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Mizu"
 5001, "Visueller Stil"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Foxlet, basierend auf Lautus"
 5004, "Veröffentlicht unter GNU/GPL 2.0, 2019"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Mizu/mizu.msstyles/lang/en-US.rc b/media/themes/Mizu/mizu.msstyles/lang/en-US.rc
index 1819c9b..a0fb99d 100644 (file)
--- a/media/themes/Mizu/mizu.msstyles/lang/en-US.rc
+++ b/media/themes/Mizu/mizu.msstyles/lang/en-US.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Mizu"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Foxlet, based on Lautus"
 5004, "Released under GNU/GPL 2.0, 2019"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc b/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc
index b11a6cb..e7c2f4b 100644 (file)
--- a/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc
+++ b/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc
@@ -28,7 +28,7 @@ STRINGTABLE
 {
 5000, "Mizu"
 5001, "Stile di visualizzazione"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Foxlet, basato on Lautus"
 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2019"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Modern/modern.msstyles/lang/de-DE.rc b/media/themes/Modern/modern.msstyles/lang/de-DE.rc
index a56c5cf..9c69cd1 100644 (file)
--- a/media/themes/Modern/modern.msstyles/lang/de-DE.rc
+++ b/media/themes/Modern/modern.msstyles/lang/de-DE.rc
@@ -30,7 +30,7 @@ STRINGTABLE
 {
 5000, "Modern"
 5001, "Visueller Stil"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Polar, basierend auf win10"
 5004, "Veröffentlicht unter GNU/GPL 3.0, 2018"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Modern/modern.msstyles/lang/en-GB.rc b/media/themes/Modern/modern.msstyles/lang/en-GB.rc
index 08dbf08..9614618 100644 (file)
--- a/media/themes/Modern/modern.msstyles/lang/en-GB.rc
+++ b/media/themes/Modern/modern.msstyles/lang/en-GB.rc
@@ -30,7 +30,7 @@ STRINGTABLE
 {
 5000, "Modern"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Polar, based on win10"
 5004, "Released under GNU/GPL 3.0, 2018"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Modern/modern.msstyles/lang/en-US.rc b/media/themes/Modern/modern.msstyles/lang/en-US.rc
index c165ed9..5ad89f5 100644 (file)
--- a/media/themes/Modern/modern.msstyles/lang/en-US.rc
+++ b/media/themes/Modern/modern.msstyles/lang/en-US.rc
@@ -30,7 +30,7 @@ STRINGTABLE
 {
 5000, "Modern"
 5001, "Visual Style"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Polar, based on win10"
 5004, "Released under GNU/GPL 3.0, 2018"
 5005, "http://www.reactos.org"

diff --git a/media/themes/Modern/modern.msstyles/lang/it-IT.rc b/media/themes/Modern/modern.msstyles/lang/it-IT.rc
index cd8f0c2..476bc26 100644 (file)
--- a/media/themes/Modern/modern.msstyles/lang/it-IT.rc
+++ b/media/themes/Modern/modern.msstyles/lang/it-IT.rc
@@ -30,7 +30,7 @@ STRINGTABLE
 {
 5000, "Modern"
 5001, "Stile di visualizzazione"
-5002, "ReactOS Foundation"
+5002, "ReactOS Project"
 5003, "Polar, basato on win10"
 5004, "Distribuito sotto licenza GNU/GPL 3.0, 2018"
 5005, "http://www.reactos.org"

diff --git a/modules/rosapps/applications/devutils/cdmake/config.h b/modules/rosapps/applications/devutils/cdmake/config.h
index ffb5dab..026f255 100644 (file)
--- a/modules/rosapps/applications/devutils/cdmake/config.h
+++ b/modules/rosapps/applications/devutils/cdmake/config.h
@@ -9,7 +9,7 @@
 #define DIR_SEPARATOR_STRING "\\"
 #endif
 
-#define MANUFACTURER_ID "ReactOS Foundation"
-#define PUBLISHER_ID    "ReactOS Foundation"
-#define DATA_PREP_ID    "ReactOS Foundation"
+#define MANUFACTURER_ID "ReactOS Project"
+#define PUBLISHER_ID    "ReactOS Project"
+#define DATA_PREP_ID    "ReactOS Project"
 #define APP_ID          "CDMAKE CD-ROM Premastering Utility"

diff --git a/sdk/include/psdk/common.ver b/sdk/include/psdk/common.ver
index 1b5cd9a..3163b95 100644 (file)
--- a/sdk/include/psdk/common.ver
+++ b/sdk/include/psdk/common.ver
@@ -18,9 +18,9 @@
 //
 #ifndef VER_LEGALCOPYRIGHT_STR
 #if defined(RC_INVOKED) && !defined(WIN16)
-#define VER_LEGALCOPYRIGHT_STR L"\251 ReactOS Foundation. All rights reserved."
+#define VER_LEGALCOPYRIGHT_STR L"\251 ReactOS Project. All rights reserved."
 #else
-#define VER_LEGALCOPYRIGHT_STR "Copyright (c) ReactOS Foundation. All rights reserved."
+#define VER_LEGALCOPYRIGHT_STR "Copyright (c) ReactOS Project. All rights reserved."
 #endif
 #endif
 
@@ -29,9 +29,9 @@
 //
 #ifndef VER_PRODUCTNAME_STR
 #ifdef RC_INVOKED
-#define VER_PRODUCTNAME_STR L"ReactOS\256 Operating System"
+#define VER_PRODUCTNAME_STR L"ReactOS Operating System"
 #else
-#define VER_PRODUCTNAME_STR "ReactOS (R) Operating System"
+#define VER_PRODUCTNAME_STR "ReactOS Operating System"
 #endif
 #endif
 
@@ -86,35 +86,35 @@
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "        "
 #elif __BUILDMACHINE_LEN__ == 16
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "         "
-#elif __BUILDMACHINE_LEN__ == 15                       
+#elif __BUILDMACHINE_LEN__ == 15
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "          "
-#elif __BUILDMACHINE_LEN__ == 14                               
+#elif __BUILDMACHINE_LEN__ == 14
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "           "
-#elif __BUILDMACHINE_LEN__ == 13                                 
+#elif __BUILDMACHINE_LEN__ == 13
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "            "
-#elif __BUILDMACHINE_LEN__ == 12                               
+#elif __BUILDMACHINE_LEN__ == 12
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "             "
-#elif __BUILDMACHINE_LEN__ == 11                               
+#elif __BUILDMACHINE_LEN__ == 11
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "              "
-#elif __BUILDMACHINE_LEN__ == 10                               
+#elif __BUILDMACHINE_LEN__ == 10
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "               "
-#elif __BUILDMACHINE_LEN__ == 9                                
+#elif __BUILDMACHINE_LEN__ == 9
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                "
-#elif __BUILDMACHINE_LEN__ == 8                                
+#elif __BUILDMACHINE_LEN__ == 8
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                 "
-#elif __BUILDMACHINE_LEN__ == 7                                
+#elif __BUILDMACHINE_LEN__ == 7
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                  "
-#elif __BUILDMACHINE_LEN__ == 6                                
+#elif __BUILDMACHINE_LEN__ == 6
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                   "
-#elif __BUILDMACHINE_LEN__ == 5                                
+#elif __BUILDMACHINE_LEN__ == 5
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                    "
-#elif __BUILDMACHINE_LEN__ == 4                                
+#elif __BUILDMACHINE_LEN__ == 4
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                     "
-#elif __BUILDMACHINE_LEN__ == 3                                
+#elif __BUILDMACHINE_LEN__ == 3
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                      "
-#elif __BUILDMACHINE_LEN__ == 2                                
+#elif __BUILDMACHINE_LEN__ == 2
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                       "
-#elif __BUILDMACHINE_LEN__ == 1                                
+#elif __BUILDMACHINE_LEN__ == 1
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG "                        "
 #else
 #define BUILD_MACHINE_TAG_PADDED BUILD_MACHINE_TAG

diff --git a/sdk/include/psdk/ntverp.h b/sdk/include/psdk/ntverp.h
index a3fd988..566f141 100644 (file)
--- a/sdk/include/psdk/ntverp.h
+++ b/sdk/include/psdk/ntverp.h
@@ -144,8 +144,8 @@
 // Company and Trademarks
 //
 #define VER_COMPANYNAME_STR                 \
-    "ReactOS(R) Foundation"
+    "ReactOS Project"
 #define VER_PRODUCTNAME_STR                 \
-    "ReactOS(R) Operating System"
+    "ReactOS Operating System"
 #define VER_LEGALTRADEMARKS_STR             \
-    "ReactOS(R) is a registered trademark of the ReactOS Foundation."
+    "ReactOS is a registered trademark of ReactOS Deutschland e.V."