From 9c1e8ef08d93ebf53faffcea34d01e6ba67c5bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Wed, 8 Feb 2017 23:30:05 +0000
Subject: [PATCH] [FONTVIEW][HIVECLS]: Addendum to r73755 and r73759: .otc is
 an OpenType Font Collection file .

svn path=/trunk/; revision=73763
---
 reactos/base/applications/fontview/lang/bg-BG.rc |  7 ++++---
 reactos/base/applications/fontview/lang/cs-CZ.rc |  5 +++--
 reactos/base/applications/fontview/lang/de-DE.rc |  7 ++++---
 reactos/base/applications/fontview/lang/en-US.rc |  9 +++++----
 reactos/base/applications/fontview/lang/es-ES.rc |  7 ++++---
 reactos/base/applications/fontview/lang/fr-FR.rc | 11 ++++++-----
 reactos/base/applications/fontview/lang/he-IL.rc |  7 ++++---
 reactos/base/applications/fontview/lang/it-IT.rc |  7 ++++---
 reactos/base/applications/fontview/lang/lt-LT.rc |  7 ++++---
 reactos/base/applications/fontview/lang/ms-MY.rc |  7 ++++---
 reactos/base/applications/fontview/lang/no-NO.rc |  7 ++++---
 reactos/base/applications/fontview/lang/pl-PL.rc |  7 ++++---
 reactos/base/applications/fontview/lang/pt-BR.rc |  7 ++++---
 reactos/base/applications/fontview/lang/ro-RO.rc |  7 ++++---
 reactos/base/applications/fontview/lang/ru-RU.rc |  7 ++++---
 reactos/base/applications/fontview/lang/sk-SK.rc |  7 ++++---
 reactos/base/applications/fontview/lang/sq-AL.rc |  7 ++++---
 reactos/base/applications/fontview/lang/sv-SE.rc |  7 ++++---
 reactos/base/applications/fontview/lang/tr-TR.rc |  7 ++++---
 reactos/base/applications/fontview/lang/uk-UA.rc |  7 ++++---
 reactos/base/applications/fontview/lang/zh-CN.rc |  7 ++++---
 reactos/base/applications/fontview/lang/zh-TW.rc |  7 ++++---
 reactos/boot/bootdata/hivecls.inf                | 12 ++++++------
 23 files changed, 96 insertions(+), 74 deletions(-)

diff --git a/reactos/base/applications/fontview/lang/bg-BG.rc b/reactos/base/applications/fontview/lang/bg-BG.rc
index 79940672c7d..e38905afd6c 100644
--- a/reactos/base/applications/fontview/lang/bg-BG.rc
+++ b/reactos/base/applications/fontview/lang/bg-BG.rc
@@ -10,11 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "Няма достатъчно място за завършване на действието."
     IDS_ERROR_NOFONT "%1 не е редовен шрифтов файл."
     IDS_ERROR_NOCLASS "Неуспешно изпълнение на класа на прозореца."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/cs-CZ.rc b/reactos/base/applications/fontview/lang/cs-CZ.rc
index 611ac1da331..6dcbdf883a1 100644
--- a/reactos/base/applications/fontview/lang/cs-CZ.rc
+++ b/reactos/base/applications/fontview/lang/cs-CZ.rc
@@ -10,11 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "K dokončení operace není dostatek paměti."
     IDS_ERROR_NOFONT "Soubor %1 není platným souborem písma."
     IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala."
-    IDS_FILTER_LIST "Podporované soubory písem (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Podporované soubory písem (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Písmo Font (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Písmo TrueType (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
 Písmo OpenType (*.otf)\0*.otf\0\
-Písmo Font (*.fon)\0*.fon\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 Všechny soubory (*.*)\0*.*\0"
     IDS_PREVIOUS "< &Previous"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/de-DE.rc b/reactos/base/applications/fontview/lang/de-DE.rc
index 016650e9d65..b3ff7113be5 100644
--- a/reactos/base/applications/fontview/lang/de-DE.rc
+++ b/reactos/base/applications/fontview/lang/de-DE.rc
@@ -10,11 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "Es steht nicht genügend Speicher zur Verfügung."
     IDS_ERROR_NOFONT "Die angegebene Datei %1 ist keine gültige Schriftartendatei."
     IDS_ERROR_NOCLASS "Fehler beim Initialisieren der Fensterklasse."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/en-US.rc b/reactos/base/applications/fontview/lang/en-US.rc
index ae12c054cfc..6ae1042ed1a 100644
--- a/reactos/base/applications/fontview/lang/en-US.rc
+++ b/reactos/base/applications/fontview/lang/en-US.rc
@@ -7,14 +7,15 @@ BEGIN
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Error"
-    IDS_ERROR_NOMEM "There's not enough memory to complete the operation."
+    IDS_ERROR_NOMEM "There is not enough memory to complete the operation."
     IDS_ERROR_NOFONT "The file %1 is not a valid font file."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/es-ES.rc b/reactos/base/applications/fontview/lang/es-ES.rc
index d0caf7fb3cc..21fcfc1a913 100644
--- a/reactos/base/applications/fontview/lang/es-ES.rc
+++ b/reactos/base/applications/fontview/lang/es-ES.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "No hay memoria suficiente para completar la operación."
     IDS_ERROR_NOFONT "El archivo %1 no es un archivo de fuente válido."
     IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana."
-    IDS_FILTER_LIST "Todas las tipografías (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Todas las tipografías (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Tipografía de mapa de bits (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Tipografía TrueType (*.ttf)\0*.ttf\0\
 Colección de tipografías TrueType (*.ttc)\0*.ttc\0\
-Tipografía OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
-Tipografía de mapa de bits (*.fon;*.fnt)\0*.fon;*.fnt\0\
+Tipografía OpenType (*.otf)\0*.otf\0\
+Colección de tipografías OpenType (*.otc)\0*.otc\0\
 Todos los archivos (*.*)\0*.*\0"
     IDS_PREVIOUS "< Ante&rior"
     IDS_NEXT "Siguie&nte >"
diff --git a/reactos/base/applications/fontview/lang/fr-FR.rc b/reactos/base/applications/fontview/lang/fr-FR.rc
index 293c8c93772..965b11d4665 100644
--- a/reactos/base/applications/fontview/lang/fr-FR.rc
+++ b/reactos/base/applications/fontview/lang/fr-FR.rc
@@ -10,12 +10,13 @@ BEGIN
     IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération."
     IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier de polices valide."
     IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre."
-    IDS_FILTER_LIST "Toutes polices supportées (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+    IDS_FILTER_LIST "Toutes polices supportées (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
 Fichier de polices (*.fon;*.fnt)\0*.fon;*.fnt\0\
-All Files (*.*)\0*.*\0"
+Fichier de polices TrueType (*.ttf)\0*.ttf\0\
+Fichier collection de polices TrueType (*.ttc)\0*.ttc\0\
+Fichier de polices OpenType (*.otf)\0*.otf\0\
+Fichier collection de polices OpenType (*.otc)\0*.otc\0\
+Tous les fichiers (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&récédent"
     IDS_NEXT "Suiva&nt >"
 END
diff --git a/reactos/base/applications/fontview/lang/he-IL.rc b/reactos/base/applications/fontview/lang/he-IL.rc
index 75d8fb7913c..fc245c95c96 100644
--- a/reactos/base/applications/fontview/lang/he-IL.rc
+++ b/reactos/base/applications/fontview/lang/he-IL.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "אין מספיק זיכרון כדי להשלים את הפעולה."
     IDS_ERROR_NOFONT "הקובץ %1 אינו קובץ גופנים חוקי."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/it-IT.rc b/reactos/base/applications/fontview/lang/it-IT.rc
index 9e3e36f10f7..3eaa1cd9326 100644
--- a/reactos/base/applications/fontview/lang/it-IT.rc
+++ b/reactos/base/applications/fontview/lang/it-IT.rc
@@ -10,11 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "Memoria insufficiente per completare l'operazione."
     IDS_ERROR_NOFONT "Il file% 1 non è un file di origine valido."
     IDS_ERROR_NOCLASS "Impossibile avviare la classe."
-    IDS_FILTER_LIST "Tutti i font supportati (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Tutti i font supportati (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Font TrueType (*.ttf)\0*.ttf\0\
 Collezione Font TrueType (*.ttc)\0*.ttc\0\
-Font OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+Font OpenType (*.otf)\0*.otf\0\
+Collezione Font OpenType (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&recedente"
     IDS_NEXT "Ava&nti >"
diff --git a/reactos/base/applications/fontview/lang/lt-LT.rc b/reactos/base/applications/fontview/lang/lt-LT.rc
index c12bb4cc6b9..bd9703d9be0 100644
--- a/reactos/base/applications/fontview/lang/lt-LT.rc
+++ b/reactos/base/applications/fontview/lang/lt-LT.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Užduočiai užbaigti, nepakanka atminties."
     IDS_ERROR_NOFONT "%1 nėra teisinga šrifto byla."
     IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasės."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/ms-MY.rc b/reactos/base/applications/fontview/lang/ms-MY.rc
index f5d2629e368..e22d4ebb02c 100644
--- a/reactos/base/applications/fontview/lang/ms-MY.rc
+++ b/reactos/base/applications/fontview/lang/ms-MY.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Terdapat tidak cukup ingatan untuk melengkapkan operasi ini."
     IDS_ERROR_NOFONT "Fail %1 bukanlah fail fon yang sah."
     IDS_ERROR_NOCLASS "Tidak dapat mengawalkan kelas tetingkap."
-    IDS_FILTER_LIST "Semuanya disokong fon (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Semuanya disokong fon (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/no-NO.rc b/reactos/base/applications/fontview/lang/no-NO.rc
index d4b3ef2bd8b..f1c7b65587c 100644
--- a/reactos/base/applications/fontview/lang/no-NO.rc
+++ b/reactos/base/applications/fontview/lang/no-NO.rc
@@ -10,11 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "Det er ikke nok minne for å fullføre oppgaven."
     IDS_ERROR_NOFONT "Filen %1 er ikke et gyldig skriftfil."
     IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/pl-PL.rc b/reactos/base/applications/fontview/lang/pl-PL.rc
index 4f216154080..0b2d7bdd677 100644
--- a/reactos/base/applications/fontview/lang/pl-PL.rc
+++ b/reactos/base/applications/fontview/lang/pl-PL.rc
@@ -18,11 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "Brakuje pamięci do ukończenia tej operacji."
     IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki."
     IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/pt-BR.rc b/reactos/base/applications/fontview/lang/pt-BR.rc
index c3f70efb339..1e39fabb664 100644
--- a/reactos/base/applications/fontview/lang/pt-BR.rc
+++ b/reactos/base/applications/fontview/lang/pt-BR.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Não há memória suficiente para completar a operação."
     IDS_ERROR_NOFONT "O arquivo %1 não é um arquivo de fonte válida."
     IDS_ERROR_NOCLASS "Não foi possível inicializar a janela."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/ro-RO.rc b/reactos/base/applications/fontview/lang/ro-RO.rc
index f09221872cc..7d5bebafe98 100644
--- a/reactos/base/applications/fontview/lang/ro-RO.rc
+++ b/reactos/base/applications/fontview/lang/ro-RO.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația."
     IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat."
     IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată."
-    IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;.ttc;*.fon;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Toate fonturile recunoscute (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Fișiere de tip Font (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Fonturi de tip TrueType (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-Fonturi de tip OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
-Fișiere de tip Font (*.fon;*.fnt)\0*.fon;*.fnt\0\
+Fonturi de tip OpenType (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 Orice fișier (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/ru-RU.rc b/reactos/base/applications/fontview/lang/ru-RU.rc
index d8d6416ea79..20ef3c16d38 100644
--- a/reactos/base/applications/fontview/lang/ru-RU.rc
+++ b/reactos/base/applications/fontview/lang/ru-RU.rc
@@ -12,11 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Недостаточно памяти для выполнения операции."
     IDS_ERROR_NOFONT "%1 не является корректным файлом шрифта."
     IDS_ERROR_NOCLASS "Невозможно инициализировать класс окна."
-    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Файлы шрифтов (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType шрифты (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType шрифты (*.otf;*.otc)\0*.otf;*.otc\0\
-Файлы шрифтов (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType шрифты (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 Все файлы (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/sk-SK.rc b/reactos/base/applications/fontview/lang/sk-SK.rc
index c86685cc3df..29af80a7626 100644
--- a/reactos/base/applications/fontview/lang/sk-SK.rc
+++ b/reactos/base/applications/fontview/lang/sk-SK.rc
@@ -15,11 +15,12 @@ BEGIN
     IDS_ERROR_NOMEM "Na vykonanie tejto operácie nie je dostatok voľnej pamäte."
     IDS_ERROR_NOFONT "Požadovaný súbor %1 nie je platným súborom písiem."
     IDS_ERROR_NOCLASS "Nepodarilo sa inicializovať triedu window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/sq-AL.rc b/reactos/base/applications/fontview/lang/sq-AL.rc
index d3dc87ebbfb..18e4a1073b9 100644
--- a/reactos/base/applications/fontview/lang/sq-AL.rc
+++ b/reactos/base/applications/fontview/lang/sq-AL.rc
@@ -14,11 +14,12 @@ BEGIN
     IDS_ERROR_NOMEM "Nuk ka memorie të mjaftueshme për të përfunduar operacionin."
     IDS_ERROR_NOFONT "Dokumenti %1 nuk është një font i vlefshem."
     IDS_ERROR_NOCLASS "Nuk mund të fillojë dritaren e klases."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/sv-SE.rc b/reactos/base/applications/fontview/lang/sv-SE.rc
index 01477fca4c6..475caf49998 100644
--- a/reactos/base/applications/fontview/lang/sv-SE.rc
+++ b/reactos/base/applications/fontview/lang/sv-SE.rc
@@ -17,11 +17,12 @@ BEGIN
     IDS_ERROR_NOMEM "Det er inte nog minne för att slutföre operationen."
     IDS_ERROR_NOFONT "Filen %1 är inte en giltig typsnittsfil."
     IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/tr-TR.rc b/reactos/base/applications/fontview/lang/tr-TR.rc
index 5032b935e70..f221689e482 100644
--- a/reactos/base/applications/fontview/lang/tr-TR.rc
+++ b/reactos/base/applications/fontview/lang/tr-TR.rc
@@ -11,11 +11,12 @@ BEGIN
     IDS_ERROR_NOMEM "Bu işlemi bitirmek için yeterli bellek yok."
     IDS_ERROR_NOFONT "%1 kütüğü, geçerli bir yazı tipi kütüğü değil."
     IDS_ERROR_NOCLASS "Pencere sınıfı başlatılamadı."
-    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Yazı Tipi Kütüğü (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Yazı Tipi (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Yazı Tipi (*.otf;*.otc)\0*.otf;*.otc\0\
-Yazı Tipi Kütüğü (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Yazı Tipi (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 Tüm Kütükler (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/uk-UA.rc b/reactos/base/applications/fontview/lang/uk-UA.rc
index 661c600a7dd..66f7c2cff4e 100644
--- a/reactos/base/applications/fontview/lang/uk-UA.rc
+++ b/reactos/base/applications/fontview/lang/uk-UA.rc
@@ -18,11 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "Недостатньо пам'яті для завершення операції."
     IDS_ERROR_NOFONT "Файл %1 не є коректним файлом шрифту."
     IDS_ERROR_NOCLASS "Неможливо ініціалізувати віконний клас."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType Font (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
-Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType Font (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 All Files (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/zh-CN.rc b/reactos/base/applications/fontview/lang/zh-CN.rc
index e0be26f8df8..02ea461651e 100644
--- a/reactos/base/applications/fontview/lang/zh-CN.rc
+++ b/reactos/base/applications/fontview/lang/zh-CN.rc
@@ -18,11 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "没有足够的内存来完成操作。"
     IDS_ERROR_NOFONT "％1不是一个有效的字体档案。"
     IDS_ERROR_NOCLASS "窗口无法初始化。"
-    IDS_FILTER_LIST "支持所有的字体 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "支持所有的字体 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+字体文件 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType 字体 (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType 字体 (*.otf;*.otc)\0*.otf;*.otc\0\
-字体文件 (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType 字体 (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 所有文件 (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/base/applications/fontview/lang/zh-TW.rc b/reactos/base/applications/fontview/lang/zh-TW.rc
index 04914f48ab7..a346eb7985d 100644
--- a/reactos/base/applications/fontview/lang/zh-TW.rc
+++ b/reactos/base/applications/fontview/lang/zh-TW.rc
@@ -18,11 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。"
     IDS_ERROR_NOFONT "%1 不是一個有效的字體檔案。"
     IDS_ERROR_NOCLASS "窗口無法初始化。"
-    IDS_FILTER_LIST "所有支援的字體 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+    IDS_FILTER_LIST "所有支援的字體 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 TrueType 字體 (*.ttf)\0*.ttf\0\
 TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType 字體 (*.otf;*.otc)\0*.otf;*.otc\0\
-字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\
+OpenType 字體 (*.otf)\0*.otf\0\
+OpenType Font Collection (*.otc)\0*.otc\0\
 所有檔 (*.*)\0*.*\0"
     IDS_PREVIOUS "< P&revious"
     IDS_NEXT "&Next >"
diff --git a/reactos/boot/bootdata/hivecls.inf b/reactos/boot/bootdata/hivecls.inf
index e46a06fad4f..e2713f13c63 100644
--- a/reactos/boot/bootdata/hivecls.inf
+++ b/reactos/boot/bootdata/hivecls.inf
@@ -118,37 +118,37 @@ HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002
 
 ; Fonts
 HKCR,".fon","",0x00000000,"fonfile"
-HKCR,"fonfile","",0x00000000,"Font file"
+HKCR,"fonfile","",0x00000000,"Font File"
 HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-209"
 HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155"
 HKCR,"fonfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
 HKCR,".fnt","",0x00000000,"fntfile"
-HKCR,"fntfile","",0x00000000,"Font file"
+HKCR,"fntfile","",0x00000000,"Font File"
 HKCR,"fntfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-209"
 HKCR,"fntfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155"
 HKCR,"fntfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
 HKCR,".ttf","",0x00000000,"ttffile"
-HKCR,"ttffile","",0x00000000,"TrueType Font file"
+HKCR,"ttffile","",0x00000000,"TrueType Font File"
 HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-210"
 HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
 HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
 HKCR,".ttc","",0x00000000,"ttcfile"
-HKCR,"ttcfile","",0x00000000,"TrueType Font Collection file"
+HKCR,"ttcfile","",0x00000000,"TrueType Font Collection File"
 HKCR,"ttcfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-210"
 HKCR,"ttcfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
 HKCR,"ttcfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
 HKCR,".otf","",0x00000000,"otffile"
-HKCR,"otffile","",0x00000000,"OpenType Font file"
+HKCR,"otffile","",0x00000000,"OpenType Font File"
 HKCR,"otffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-211"
 HKCR,"otffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
 HKCR,"otffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
 HKCR,".otc","",0x00000000,"otcfile"
-HKCR,"otcfile","",0x00000000,"OpenType Font file"
+HKCR,"otcfile","",0x00000000,"OpenType Font Collection File"
 HKCR,"otcfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-211"
 HKCR,"otcfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
 HKCR,"otcfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""