Sync with trunk head (r48654)

[reactos.git] / base / setup / usetup / muifonts.h

diff --git a/base/setup/usetup/muifonts.h b/base/setup/usetup/muifonts.h
index c2d214f..18e707a 100644 (file)
--- a/base/setup/usetup/muifonts.h
+++ b/base/setup/usetup/muifonts.h
@@ -1,5 +1,4 @@
-#ifndef LANG_MUI_FONTS_H__
-#define LANG_MUI_FONTS_H__
+#pragma once
 
 MUI_SUBFONT LatinFonts[] =
 {
@@ -51,11 +50,27 @@ MUI_SUBFONT HebrewFonts[] =
     { L"Courier",         L"FreeMono" },
     { L"Courier New",     L"FreeMono" },
     { L"Times New Roman", L"DejaVu Serif" },
-    { L"Tahoma",          L"DejaVu Sans"      },
-    { L"MS Sans Serif",   L"DejaVu Sans"      },
-    { L"MS Shell Dlg",    L"DejaVu Sans"      },
-    { L"MS Shell Dlg 2",  L"DejaVu Sans"      },
-    { L"Helv",            L"DejaVu Sans"  },
+    { L"Tahoma",          L"DejaVu Sans" },
+    { L"MS Sans Serif",   L"DejaVu Sans" },
+    { L"MS Shell Dlg",    L"DejaVu Sans" },
+    { L"MS Shell Dlg 2",  L"DejaVu Sans" },
+    { L"Helv",            L"DejaVu Sans" },
+    { NULL, NULL }
+};
+
+MUI_SUBFONT CJKFonts[] =
+{
+    { L"Arial",           L"Liberation Sans" },
+    { L"Courier",         L"FreeMono" },
+    { L"Courier New",     L"FreeMono" },
+    { L"Times New Roman", L"Liberation Serif" },
+    { L"Tahoma",          L"Droid Sans Fallback" },
+    { L"MS Sans Serif",   L"Tahoma" },
+    { L"MS Shell Dlg",    L"Droid Sans Fallback" },
+    { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
+    { L"MS UI Gothic",    L"Droid Sans Fallback" },
+    { L"MS UI Gothic 2",  L"Droid Sans Fallback" },
+    { L"Helv",            L"Tahoma" },
     { NULL, NULL }
 };
 
@@ -65,12 +80,10 @@ MUI_SUBFONT UnicodeFonts[] =
     { L"Courier",         L"DejaVu Sans Mono" },
     { L"Courier New",     L"DejaVu Sans Mono" },
     { L"Times New Roman", L"DejaVu Serif" },
-    { L"Tahoma",          L"DejaVu Sans"      },
-    { L"MS Sans Serif",   L"DejaVu Sans"      },
-    { L"MS Shell Dlg",    L"DejaVu Sans"      },
-    { L"MS Shell Dlg 2",  L"DejaVu Sans"      },
-    { L"Helv",            L"DejaVu Sans"  },
+    { L"Tahoma",          L"DejaVu Sans" },
+    { L"MS Sans Serif",   L"DejaVu Sans" },
+    { L"MS Shell Dlg",    L"DejaVu Sans" },
+    { L"MS Shell Dlg 2",  L"DejaVu Sans" },
+    { L"Helv",            L"DejaVu Sans" },
     { NULL, NULL }
 };
-
-#endif