Merge a546849 into ad05abe

Author: ge0rdi

Localization/English/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Version 4.3.1 \endash general release\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
 Thank you for installing \cf3\b Open-Shell\'99\cf0\b0 . It adds some missing features to Windows 7, Windows 8, Windows 8.1 and Windows 10 - like a classic start menu, start button, a toolbar for Windows Explorer and others.\par
 \par
@@ -98,7 +96,7 @@ To uninstall \cf3\b Open-Shell\cf0\b0  follow these steps:\par
 
 \pard 
 {\pntext\f1 1)\tab}{\*\pn\pnlvlbody\pnf1\pnindent0\pnstart1\pndec{\pntxta)}}
-\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0  and double-click on \b Classic Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
+\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0  and double-click on \b Open-Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
 {\pntext\f1 2)\tab}If you installed any additional skins for the start menu you will have to delete them manually\par
 
 \pard\widctlpar\par

Src/Lib/Settings.cpp

@@ -416,8 +416,8 @@ static void GetRegPaths( TSettingsComponent component, const wchar_t *&regPath,
 			gpPath=L"Software\\Policies\\OpenShell\\ClassicExplorer";
 			break;
 		case COMPONENT_MENU:
-			regPath=L"Software\\OpenShell\\Menu";
-			gpPath=L"Software\\Policies\\OpenShell\\Menu";
+			regPath=L"Software\\OpenShell\\StartMenu";
+			gpPath=L"Software\\Policies\\OpenShell\\StartMenu";
 			break;
 		case COMPONENT_IE:
 			regPath=L"Software\\OpenShell\\ClassicIE";
@@ -2418,7 +2418,7 @@ static const char *g_AdmxText1csm=
 "\t\t</definitions>\r\n"
 "\t</supportedOn>\r\n"
 "\t<categories>\r\n"
-"\t\t<category name=\"Menu\" displayName=\"$(string.MenuCat)\" explainText=\"$(string.MenuCatHelp)\">\r\n"
+"\t\t<category name=\"StartMenu\" displayName=\"$(string.MenuCat)\" explainText=\"$(string.MenuCatHelp)\">\r\n"
 "\t\t\t<parentCategory ref=\"classic_shell:OpenShell\" />\r\n"
 "\t\t</category>\r\n";
 
@@ -2545,9 +2545,9 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
 			admlText1=g_AdmlText1ce;
 			break;
 		case COMPONENT_MENU:
-			keyName="Software\\Policies\\OpenShell\\Menu";
+			keyName="Software\\Policies\\OpenShell\\StartMenu";
 			prefix="CSM_";
-			catName="Menu";
+			catName="StartMenu";
 			admxText1=g_AdmxText1csm;
 			admlText1=g_AdmlText1csm;
 			break;

Src/Localization/Chinese/OpenShellReadme.rtf

@@ -4,10 +4,8 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\keep\keepn\widctlpar\s2\sb200\sl276\slmult1\cf2\expndtw0\kerning0\b\f1\fs26\'b0\'e6\'b1\'be\f0 4.3.1 \endash\f1\'b3\'a3\'b9\'e6\'b0\'e6\'b1\'be\f0\par
-
 \pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f2\fs22\par
-\f1\'b8\'d0\'d0\'bb\'c4\'fa\'b0\'b2\'d7\'b0\cf3\b\f2 Classic Shell\f3\'99\cf0\b0\f1\'a1\'a3\'cb\'fc\'bd\'ab\'d2\'bb\'d0\'a9\'c8\'b1\'c9\'d9\'b5\'c4\'cc\'d8\'d0\'d4\'b2\'b9\'b3\'e4\'b5\'bd\f2  Windows 7, Windows 8, Windows 8.1 \f1\'ba\'cd\f2  Windows 10\emdash\emdash\f1\'c0\'fd\'c8\'e7\'be\'ad\'b5\'e4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'a1\'a2\'bf\'aa\'ca\'bc\'b0\'b4\'c5\'a5\'a1\'a2\'d7\'ca\'d4\'b4\'b9\'dc\'c0\'ed\'c6\'f7\'b9\'a4\'be\'df\'c0\'b8\'b5\'c8\'b5\'c8\'a1\'a3\f2\par
+\f1\'b8\'d0\'d0\'bb\'c4\'fa\'b0\'b2\'d7\'b0\cf3\b\f2 Open-Shell\f3\'99\cf0\b0\f1\'a1\'a3\'cb\'fc\'bd\'ab\'d2\'bb\'d0\'a9\'c8\'b1\'c9\'d9\'b5\'c4\'cc\'d8\'d0\'d4\'b2\'b9\'b3\'e4\'b5\'bd\f2  Windows 7, Windows 8, Windows 8.1 \f1\'ba\'cd\f2  Windows 10\emdash\emdash\f1\'c0\'fd\'c8\'e7\'be\'ad\'b5\'e4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'a1\'a2\'bf\'aa\'ca\'bc\'b0\'b4\'c5\'a5\'a1\'a2\'d7\'ca\'d4\'b4\'b9\'dc\'c0\'ed\'c6\'f7\'b9\'a4\'be\'df\'c0\'b8\'b5\'c8\'b5\'c8\'a1\'a3\f2\par
 \par
 
 \pard\widctlpar\f1\'d7\'ee\'d0\'c2\'b5\'c4\'b0\'e6\'b1\'be\'bf\'c9\'d2\'d4\'d4\'da\f2 OpenShell\f1\'b5\'c4\'cd\'f8\'d5\'be\'d5\'d2\'b5\'bd\'a3\'ba\f2\par
@@ -1596,8 +1594,8 @@ f0fcce418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad41
 
 \pard\keep\keepn\widctlpar\s1\sb480\sl480\slmult1\cf5\b\f1\fs28\'d0\'b6\'d4\'d8\f0\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f1\fs22\'d2\'aa\'d0\'b6\'d4\'d8\cf3\b\f2 Classic Shell\cf0\b0\f1\'a3\'ac\'bf\'c9\'b0\'b4\'d2\'d4\'cf\'c2\'b2\'bd\'d6\'e8\'b2\'d9\'d7\'f7\'a3\'ba\f2\par
-1)\f1\'b4\'f2\'bf\'aa\'bf\'d8\'d6\'c6\'c3\'e6\'b0\'e5\'a3\'ac\'d1\'a1\'d4\'f1\ldblquote\'b3\'cc\'d0\'f2\'ba\'cd\'b9\'a6\'c4\'dc\rdblquote\'a3\'ac\'d5\'d2\'b5\'bd\'b2\'a2\'cb\'ab\'bb\'f7\ldblquote\f2 Classic Shell\f1\rdblquote\'a3\'ac\'c8\'bb\'ba\'f3\'b0\'b4\'d5\'d5\'cb\'b5\'c3\'f7\'b2\'d9\'d7\'f7\'a1\'a3\'c4\'e3\'bf\'c9\'c4\'dc\'d0\'e8\'d2\'aa\'d6\'d8\'d0\'c2\'c6\'f4\'b6\'af\f2 Windows\f1\'d2\'d4\'cd\'ea\'b3\'c9\'d0\'b6\'d4\'d8\'c1\'f7\'b3\'cc\'a1\'a3\f2\par
+\pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f1\fs22\'d2\'aa\'d0\'b6\'d4\'d8\cf3\b\f2 Open-Shell\cf0\b0\f1\'a3\'ac\'bf\'c9\'b0\'b4\'d2\'d4\'cf\'c2\'b2\'bd\'d6\'e8\'b2\'d9\'d7\'f7\'a3\'ba\f2\par
+1)\f1\'b4\'f2\'bf\'aa\'bf\'d8\'d6\'c6\'c3\'e6\'b0\'e5\'a3\'ac\'d1\'a1\'d4\'f1\ldblquote\'b3\'cc\'d0\'f2\'ba\'cd\'b9\'a6\'c4\'dc\rdblquote\'a3\'ac\'d5\'d2\'b5\'bd\'b2\'a2\'cb\'ab\'bb\'f7\ldblquote\f2 Open-Shell\f1\rdblquote\'a3\'ac\'c8\'bb\'ba\'f3\'b0\'b4\'d5\'d5\'cb\'b5\'c3\'f7\'b2\'d9\'d7\'f7\'a1\'a3\'c4\'e3\'bf\'c9\'c4\'dc\'d0\'e8\'d2\'aa\'d6\'d8\'d0\'c2\'c6\'f4\'b6\'af\f2 Windows\f1\'d2\'d4\'cd\'ea\'b3\'c9\'d0\'b6\'d4\'d8\'c1\'f7\'b3\'cc\'a1\'a3\f2\par
 2)\f1\'c8\'e7\'b9\'fb\'c4\'e3\'b0\'b2\'d7\'b0\'c1\'cb\'c8\'ce\'ba\'ce\'b6\'ee\'cd\'e2\'b5\'c4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'c6\'a4\'b7\'f4\'a3\'ac\'c4\'e3\'d0\'e8\'d2\'aa\'d7\'d4\'d0\'d0\'bd\'ab\'c6\'e4\'c9\'be\'b3\'fd\'a1\'a3\f2\par
 }
 

Src/Localization/ChineseTW/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\f1\fs24\'aa\'a9\'a5\'bb\f0  4.3.1 \endash  \f1\'b3\'71\'a5\'ce\'aa\'a9\'a5\'bb\f0\par
-
 \pard\widctlpar\cf0\expndtw0\b0\f2\fs22\par
 \f1\'b7\'50\'c1\'c2\'b1\'7a\'a6\'77\'b8\'cb\f2  \cf3\b Open-Shell\'99\cf0\b0\f1\'a1\'43\f2  \f1\'a5\'a6\'a6\'62\f2  Windows 7, Windows 8, Windows 8.1\f1\'a9\'4d\f2 Windows 10\f1\'bc\'57\'a5\'5b\'a4\'46\'a4\'40\'a8\'c7\'af\'ca\'a4\'d6\'aa\'ba\'a5\'5c\'af\'e0\f2  - \f1\'a4\'f1\'a6\'70\'a4\'40\'ad\'d3\'a8\'e5\'ab\'ac\f2  [\f1\'b6\'7d\'a9\'6c\f2 ] \f1\'a5\'5c\'af\'e0\'aa\'ed\'a1\'42\f2 [\f1\'b6\'7d\'a9\'6c\f2 ] \f1\'ab\'f6\'b6\'73\'a1\'42\f2 Windows \f1\'c0\'c9\'ae\'d7\'c1\'60\'ba\'de\'a4\'75\'a8\'e3\'a6\'43\'a9\'4d\'a8\'e4\'a5\'a6\'a1\'43\f2\par
 \par

Src/Localization/English/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Version 4.3.1 \endash general release\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
 Thank you for installing \cf3\b Open-Shell\'99\cf0\b0 . It adds some missing features to Windows 7, Windows 8, Windows 8.1 and Windows 10 - like a classic start menu, start button, a toolbar for Windows Explorer and others.\par
 \par
@@ -98,7 +96,7 @@ To uninstall \cf3\b Open-Shell\cf0\b0  follow these steps:\par
 
 \pard 
 {\pntext\f1 1)\tab}{\*\pn\pnlvlbody\pnf1\pnindent0\pnstart1\pndec{\pntxta)}}
-\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0  and double-click on \b Classic Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
+\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0  and double-click on \b Open-Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
 {\pntext\f1 2)\tab}If you installed any additional skins for the start menu you will have to delete them manually\par
 
 \pard\widctlpar\par

Src/Localization/French/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mmathFont4\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \nowidctlpar\sa300\sl200\slmult0\qc\cf1\expndtw5\kerning1\f0\fs52 Open-Shell\par
 
-\pard\nowidctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Diffusion g\f1\'e9\f0 n\f1\'e9\f0 rale \f1\endash\f0  Version 4.3.1\b0\par
-
 \pard\nowidctlpar\cf0\expndtw0\kerning1\i0\f2\fs22\par
 \b Merci d'avoir install\f1\'e9\f2  \cf3 Open-Shell\'99\cf0 . Cela permet d'ajouter des fonctions manquantes \f1\'e0\f2  Windows 7, Windows 8, Windows 8.1 et Windows 10 \f1\endash\f2  Comme le classique menu d\f1\'e9\f2 marrer, le bouton d\f1\'e9\f2 marrer, une barre d'outils pour l'explorateur Windows et d'autres.\b0\par
 \par

Src/Localization/German/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Version 4.3.1 \endash  Finale Version\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
 Vielen Dank f\'fcr die Installation von \cf3\b Open-Shell\'99\cf0\b0 . Durch Open-Shell werden in Windows 7, Windows 8, Windows 8.1 und Windows 10 einige fehlende Funktionen aus fr\'fcheren Windows Versionen hinzugef\'fcgt - wie ein klassisches Startmen\'fc, eine Starttaste (Startschaltfl\'e4che mit Windows Symbol), eine Werkzeugleiste f\'fcr den Windows Explorer und andere Funktionen.\par
 \par
@@ -97,7 +95,7 @@ Um \cf3\b Open-Shell\cf0\b0  zu deinstallieren bitte die nachfolgenden Schritte
 
 \pard 
 {\pntext\f1 1)\tab}{\*\pn\pnlvlbody\pnf1\pnindent0\pnstart1\pndec{\pntxta)}}
-\widctlpar\fi-360\li720\b Systemsteuerung -> Programme und Funktionen\b0  \'f6ffnen und auf \b Classic Shell\b0  klicken. Danach den Anweisungen folgen. Anschlie\'dfend muss Windows neu gestartet werden, damit der Vorgang vollst\'e4ndig abgeschlossen wird.\par
+\widctlpar\fi-360\li720\b Systemsteuerung -> Programme und Funktionen\b0  \'f6ffnen und auf \b Open-Shell\b0  klicken. Danach den Anweisungen folgen. Anschlie\'dfend muss Windows neu gestartet werden, damit der Vorgang vollst\'e4ndig abgeschlossen wird.\par
 {\pntext\f1 2)\tab}Sofern f\'fcr das Startmen\'fc nachtr\'e4glich zus\'e4tzliche Skin-Dateien installiert worden sind, m\'fcssen diese anschlie\'dfend manuell deinstalliert werden\par
 
 \pard\widctlpar\par

Src/Localization/Italian/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Versione 4.3.0 \endash reelase generale\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
 \lang2064 Grazie per aver installato \cf3\b Open-Shell\'99\cf0\b0 .Il programma aggiunge alcune funzionalit\'e0 mancanti a Windows 7, Windows 8, Windows 8.1 e Windows 10 - come il menu Start classico, il puslante Start, una barra strumenti per Windows Explorer e altro ancora.\par
 \par

Src/Localization/Polish/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Wersja 4.3.1 \endash  \cf3\f1 wydanie og\'f3lne\cf2\fs22\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\par
 \f2 Dzi\'eakujemy za zainstalowanie \cf3\b\f1 Open-Shell\'99\cf0\b0 . \f2 Program dodaje niekt\'f3re brakuj\'b9ce funkcje w systemie Windows 7\f1 , Windows 8, Windows 8.1 i Windows 10\f2  - jak w klasyczne menu Start, przycisk Start, pasek narz\'eadzi Eksploratora Windows i inne.\f1\par
 \par

Src/Localization/Russian/OpenShellReadme.rtf

@@ -4,8 +4,6 @@
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
 \pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Classic\lang4105  \lang1033 Shell\lang4105\par
 
-\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\f1\fs24\lang1058\'c2\'e5\'f0\'f1\'e8\'ff\f0\lang4105  4.\lang1033 3\lang4105 .\lang1033 1\lang4105  \endash  \f1\lang1049\'ee\'e1\'f9\'e8\'e9 \'e2\'fb\'ef\'f3\'f1\'ea\f0\lang4105\par
-
 \pard\widctlpar\cf0\expndtw0\b0\i0\f2\fs22\par
 \f3\lang1049\'c1\'eb\'e0\'e3\'ee\'e4\'e0\'f0\'e8\'ec \'e2\'e0\'f1 \'e7\'e0 \'f3\'f1\'f2\'e0\'ed\'ee\'e2\'ea\'f3 \cf3\b\f2\lang1033 Classic\lang4105  \lang1033 Shell\lang4105\'99\cf0\b0 . \lang1033 Classic\lang4105  \lang1033 Shell\f3\lang1049  \'e4\'ee\'e1\'e0\'e2\'eb\'ff\'e5\'f2 \'ed\'e5\'ea\'ee\'f2\'ee\'f0\'fb\'e5 \'ee\'f2\'f1\'f3\'f2\'f1\'f2\'e2\'f3\'fe\'f9\'e8\'e5 \'f4\'f3\'ed\'ea\'f6\'e8\'e8 \'e2 Windows 7\f2\lang1033 , \lang4105 Windows \lang1033 8, \lang4105 Windows \lang1033 8.1\f3\lang1049  \'e8 Windows \f2\lang1033 10\f3\lang1049 , \'ea\'e0\'ea \'ea\'eb\'e0\'f1\'f1\'e8\'f7\'e5\'f1\'ea\'ee\'e5 \'ec\'e5\'ed\'fe \'ef\'f3\'f1\'ea, \'ef\'e0\'ed\'e5\'eb\'e8 \'e8\'ed\'f1\'f2\'f0\'f3\'ec\'e5\'ed\'f2\'ee\'e2 \'ef\'f0\'ee\'e2\'ee\'e4\'ed\'e8\'ea\'e0 Windows \'e8 \'e4\'f0\'f3\'e3\'e8\'e5.\f2\lang4105\par
 \par