[fonts] Replace WenQuanYi MicroHei with Droid Sans Fallback

mapsme · Sep 22, 2015 · 45e1125 · 45e1125
1 parent 6c01695
commit 45e1125
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 38 deletions.
diff --git a/android/YoPme/assets/02_droidsans-fallback.ttf b/android/YoPme/assets/02_droidsans-fallback.ttf
@@ -0,0 +1 @@
+../../../data/02_droidsans-fallback.ttf
diff --git a/android/YoPme/assets/02_wqy-microhei.ttf b/android/YoPme/assets/02_wqy-microhei.ttf
diff --git a/android/flavors/mwm-ttf-assets/02_droidsans-fallback.ttf b/android/flavors/mwm-ttf-assets/02_droidsans-fallback.ttf
@@ -0,0 +1 @@
+../../../data/02_droidsans-fallback.ttf
diff --git a/android/flavors/mwm-ttf-assets/02_wqy-microhei.ttf b/android/flavors/mwm-ttf-assets/02_wqy-microhei.ttf
diff --git a/data/02_droidsans-fallback.ttf b/data/02_droidsans-fallback.ttf
diff --git a/data/02_wqy-microhei.ttf b/data/02_wqy-microhei.ttf
diff --git a/data/external_resources.txt b/data/external_resources.txt
@@ -1,7 +1,7 @@
 WorldCoasts.mwm 4788968
 World.mwm 40203475
 01_dejavusans.ttf 633604
-02_wqy-microhei.ttf 5177387
+02_droidsans-fallback.ttf 4033420
 03_jomolhari-id-a3d.ttf 1817160
 04_padauk.ttf 248076
 05_khmeros.ttf 265552

diff --git a/data/fonts_whitelist.txt b/data/fonts_whitelist.txt
@@ -21,4 +21,4 @@ Latin_Extended-B 01_dejavusans.ttf
 Latin_Extended-B /system/fonts/DroidSans.ttf
 Latin_Extended-B /system/fonts/Roboto-Regular.ttf
 Latin_Extended-B 00_roboto_regular.ttf
-CJK_Compatibility 02_wqy-microhei.ttf
+CJK_Compatibility 02_droidsans-fallback.ttf
diff --git a/debian/control b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://mapswith.me/
 
 Package: mapswithme
 Architecture: any
-Depends: dbus, fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, ttf-wqy-microhei|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: dbus, fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, fonts-droid|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
 Description: Detailed Offline Maps of the Entire World
  The quickest offline maps of the entire world. Search and navigate maps fully 
  offline. Maps work everywhere!
@@ -31,7 +31,7 @@ Description: Detailed Offline Maps of the Entire World
 
 Package: mapswithme-server
 Architecture: any
-Depends: fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, ttf-wqy-microhei|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, fonts-froid|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
 Description: MapsWithMe server application
  This package contains server application for using MapsWithMe engine in 
  userless environments. Maps work everywhere!

diff --git a/installer/win/MapsWithMe.wxs b/installer/win/MapsWithMe.wxs
@@ -83,8 +83,8 @@
              <Component Id='_01_dejavusans.ttf' Guid='9c3a2d71-58a5-4e5a-ae65-0ffd085e7f6f'>
                <File Id='_01_dejavusans.ttf' Name='01_dejavusans.ttf' Source='..\..\data\01_dejavusans.ttf' DiskId='1' KeyPath='yes' Checksum='no' />
              </Component>
-             <Component Id='_02_wqy_microhei.ttf' Guid='1370713b-1bdf-484a-984a-5a829ecfd9ee'>
-               <File Id='_02_wqy_microhei.ttf' Name='02_wqy-microhei.ttf' Source='..\..\data\02_wqy-microhei.ttf' DiskId='1' KeyPath='yes' Checksum='no' />
+             <Component Id='_02_droidsans_fallback.ttf' Guid='1370713b-1bdf-484a-984a-5a829ecfd9ee'>
+               <File Id='_02_droidsans_fallback.ttf' Name='02_droidsans-fallback.ttf' Source='..\..\data\02_droidsans-fallback.ttf' DiskId='1' KeyPath='yes' Checksum='no' />
              </Component>
              <Component Id='_03_jomolhari_id_a3d.ttf' Guid='8c0e64ea-b45e-4a1c-a8b5-8ec0647d6db6'>
                <File Id='_03_jomolhari_id_a3d.ttf' Name='03_jomolhari-id-a3d.ttf' Source='..\..\data\03_jomolhari-id-a3d.ttf' DiskId='1' KeyPath='yes' Checksum='no' />
@@ -156,7 +156,7 @@
          <ComponentRef Id='_World.mwm' />
 
          <ComponentRef Id='_01_dejavusans.ttf' />
-         <ComponentRef Id='_02_wqy_microhei.ttf' />
+         <ComponentRef Id='_02_droidsans_fallback.ttf' />
          <ComponentRef Id='_03_jomolhari_id_a3d.ttf' />
          <ComponentRef Id='_04_padauk.ttf' />
          <ComponentRef Id='_05_khmeros.ttf' />

diff --git a/installer/win/generator.pl b/installer/win/generator.pl
@@ -1,6 +1,6 @@
 use strict;
 
-my @RESOURCES = ("01_dejavusans.ttf", "02_wqy-microhei.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf",
+my @RESOURCES = ("01_dejavusans.ttf", "02_droidsans-fallback.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf",
                  "basic.skn", "symbols_24.png",
                  "classificator.txt", "drawing_rules.bin",
                  "fonts_blacklist.txt", "fonts_whitelist.txt", "unicode_blocks.txt",

diff --git a/installer/win/guids.txt b/installer/win/guids.txt
@@ -4,7 +4,7 @@
 0cd8c6a6-5f3d-40bc-a36b-cb37842239d4 QtNetwork4.dll
 8de45066-d0c7-475e-b83e-cba8f9df8a60 QtWebkit4.dll
 9c3a2d71-58a5-4e5a-ae65-0ffd085e7f6f 01_dejavusans.ttf
-1370713b-1bdf-484a-984a-5a829ecfd9ee 02_wqy-microhei.ttf
+1370713b-1bdf-484a-984a-5a829ecfd9ee 02_droidsans-fallback.ttf
 8c0e64ea-b45e-4a1c-a8b5-8ec0647d6db6 03_jomolhari-id-a3d.ttf
 9895bfbb-480f-4a83-baa6-3826cf496398 04_padauk.ttf
 5ea3e229-6211-4790-9a7b-81f653cfda7d 05_khmeros.ttf

diff --git a/iphone/Benchmarks/Benchmarks.xcodeproj/project.pbxproj b/iphone/Benchmarks/Benchmarks.xcodeproj/project.pbxproj
@@ -74,7 +74,7 @@
 		FA37C9BC1354CC14006610DC /* 07_abyssinica_sil_r.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA37C9991354CC14006610DC /* 07_abyssinica_sil_r.ttf */; };
 		FA37C9BD1354CC14006610DC /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA37C99A1354CC14006610DC /* 05_khmeros.ttf */; };
 		FA37C9BE1354CC14006610DC /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA37C99B1354CC14006610DC /* 04_padauk.ttf */; };
-		FA37C9BF1354CC14006610DC /* 02_wqy-microhei.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA37C99C1354CC14006610DC /* 02_wqy-microhei.ttf */; };
+		9DF04B261B71019700DACAF1 /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B251B71019700DACAF1 /* 02_droidsans-fallback.ttf */; };
 		FA37C9C01354CC14006610DC /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA37C99D1354CC14006610DC /* 01_dejavusans.ttf */; };
 /* End PBXBuildFile section */
 
@@ -155,7 +155,7 @@
 		FA37C9991354CC14006610DC /* 07_abyssinica_sil_r.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 07_abyssinica_sil_r.ttf; path = ../../data/07_abyssinica_sil_r.ttf; sourceTree = SOURCE_ROOT; };
 		FA37C99A1354CC14006610DC /* 05_khmeros.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 05_khmeros.ttf; path = ../../data/05_khmeros.ttf; sourceTree = SOURCE_ROOT; };
 		FA37C99B1354CC14006610DC /* 04_padauk.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 04_padauk.ttf; path = ../../data/04_padauk.ttf; sourceTree = SOURCE_ROOT; };
-		FA37C99C1354CC14006610DC /* 02_wqy-microhei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_wqy-microhei.ttf"; path = "../../data/02_wqy-microhei.ttf"; sourceTree = SOURCE_ROOT; };
+		9DF04B251B71019700DACAF1 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_droidsans-fallback.ttf"; path = "../../data/02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
 		FA37C99D1354CC14006610DC /* 01_dejavusans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 01_dejavusans.ttf; path = ../../data/01_dejavusans.ttf; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -318,7 +318,7 @@
 				FA37C9991354CC14006610DC /* 07_abyssinica_sil_r.ttf */,
 				FA37C99A1354CC14006610DC /* 05_khmeros.ttf */,
 				FA37C99B1354CC14006610DC /* 04_padauk.ttf */,
-				FA37C99C1354CC14006610DC /* 02_wqy-microhei.ttf */,
+				9DF04B251B71019700DACAF1 /* 02_droidsans-fallback.ttf */,
 				FA37C99D1354CC14006610DC /* 01_dejavusans.ttf */,
 			);
 			name = Resources;
@@ -412,7 +412,7 @@
 				FA37C9BC1354CC14006610DC /* 07_abyssinica_sil_r.ttf in Resources */,
 				FA37C9BD1354CC14006610DC /* 05_khmeros.ttf in Resources */,
 				FA37C9BE1354CC14006610DC /* 04_padauk.ttf in Resources */,
-				FA37C9BF1354CC14006610DC /* 02_wqy-microhei.ttf in Resources */,
+				9DF04B261B71019700DACAF1 /* 02_droidsans-fallback.ttf in Resources */,
 				FA37C9C01354CC14006610DC /* 01_dejavusans.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -88,7 +88,7 @@
 		4579C89F1AD2FA36001D6B90 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; };
 		4579C8A01AD2FAB1001D6B90 /* 00_roboto_regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 00_roboto_regular.ttf */; };
 		4579C8A11AD2FAB1001D6B90 /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; };
-		4579C8A21AD2FAB1001D6B90 /* 02_wqy-microhei.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E6134C4968003A9827 /* 02_wqy-microhei.ttf */; };
+		9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; };
 		4579C8A31AD2FAB1001D6B90 /* 03_jomolhari-id-a3d.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */; };
 		4579C8A41AD2FAB1001D6B90 /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E8134C4968003A9827 /* 04_padauk.ttf */; };
 		4579C8A51AD2FAB1001D6B90 /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E9134C4968003A9827 /* 05_khmeros.ttf */; };
@@ -181,7 +181,7 @@
 		EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */; };
 		EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297E1219ECA300EB67A9 /* RenderContext.mm */; };
 		EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; };
-		EEA61602134C496A003A9827 /* 02_wqy-microhei.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E6134C4968003A9827 /* 02_wqy-microhei.ttf */; };
+		9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; };
 		EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */; };
 		EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E8134C4968003A9827 /* 04_padauk.ttf */; };
 		EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E9134C4968003A9827 /* 05_khmeros.ttf */; };
@@ -582,7 +582,7 @@
 		EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderBuffer.mm; path = Classes/RenderBuffer.mm; sourceTree = SOURCE_ROOT; };
 		EE7F297E1219ECA300EB67A9 /* RenderContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderContext.mm; path = Classes/RenderContext.mm; sourceTree = SOURCE_ROOT; };
 		EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 01_dejavusans.ttf; path = ../../data/01_dejavusans.ttf; sourceTree = SOURCE_ROOT; };
-		EEA615E6134C4968003A9827 /* 02_wqy-microhei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_wqy-microhei.ttf"; path = "../../data/02_wqy-microhei.ttf"; sourceTree = SOURCE_ROOT; };
+		9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_droidsans-fallback.ttf"; path = "../../data/02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
 		EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "03_jomolhari-id-a3d.ttf"; path = "../../data/03_jomolhari-id-a3d.ttf"; sourceTree = SOURCE_ROOT; };
 		EEA615E8134C4968003A9827 /* 04_padauk.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 04_padauk.ttf; path = ../../data/04_padauk.ttf; sourceTree = SOURCE_ROOT; };
 		EEA615E9134C4968003A9827 /* 05_khmeros.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 05_khmeros.ttf; path = ../../data/05_khmeros.ttf; sourceTree = SOURCE_ROOT; };
@@ -1736,7 +1736,7 @@
 				FA64D9A813F975AD00350ECF /* types.txt */,
 				FAF30A94173AB23900818BF6 /* 00_roboto_regular.ttf */,
 				EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */,
-				EEA615E6134C4968003A9827 /* 02_wqy-microhei.ttf */,
+				9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */,
 				EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */,
 				EEA615E8134C4968003A9827 /* 04_padauk.ttf */,
 				EEA615E9134C4968003A9827 /* 05_khmeros.ttf */,
@@ -2032,7 +2032,7 @@
 				F64F4B711B4A41D40081A24A /* MWMDownloaderDialogHeader.xib in Resources */,
 				FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
 				EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */,
-				EEA61602134C496A003A9827 /* 02_wqy-microhei.ttf in Resources */,
+				9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */,
 				4A7D89C81B2EBF3B00AC843E /* resources-xxhdpi_dark in Resources */,
 				34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */,
 				EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */,
@@ -2130,7 +2130,7 @@
 				6C47C8BF1AD6C47E000C52C1 /* Localizable.strings in Resources */,
 				4579C8A01AD2FAB1001D6B90 /* 00_roboto_regular.ttf in Resources */,
 				4579C8A11AD2FAB1001D6B90 /* 01_dejavusans.ttf in Resources */,
-				4579C8A21AD2FAB1001D6B90 /* 02_wqy-microhei.ttf in Resources */,
+				9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */,
 				4579C8A31AD2FAB1001D6B90 /* 03_jomolhari-id-a3d.ttf in Resources */,
 				4579C8A41AD2FAB1001D6B90 /* 04_padauk.ttf in Resources */,
 				4579C8A51AD2FAB1001D6B90 /* 05_khmeros.ttf in Resources */,

diff --git a/platform/platform.cpp b/platform/platform.cpp
@@ -94,7 +94,7 @@ void Platform::GetFontNames(FilesList & res) const
     "00_roboto_regular.ttf",
 #endif
     "01_dejavusans.ttf",
-    "02_wqy-microhei.ttf",
+    "02_droidsans-fallback.ttf",
     "03_jomolhari-id-a3d.ttf",
     "04_padauk.ttf",
     "05_khmeros.ttf",

diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp
@@ -27,6 +27,7 @@ void Platform::GetSystemFontNames(FilesList & res) const
   char const * fontsWhitelist[] = {
     "Roboto-Regular.ttf",
     "DroidSansFallback.ttf",
+    "DroidSansFallbackFull.ttf",
     "DroidSans.ttf",
     "DroidSansArabic.ttf",
     "DroidSansSemc.ttf",

diff --git a/qt/qt.pro b/qt/qt.pro
@@ -74,7 +74,7 @@ XHDPI_SKIN_RES.files = ../data/resources-xhdpi/basic.skn ../data/resources-xhdpi
 FONT_RES.path = $$FONTSDIR
 FONT_RES.files = ../data/00_roboto_regular.ttf \
                  ../data/01_dejavusans.ttf \
-                 ../data/02_wqy-microhei.ttf \
+                 ../data/02_droidsans-fallback.ttf \
                  ../data/03_jomolhari-id-a3d.ttf \
                  ../data/04_padauk.ttf \
                  ../data/05_khmeros.ttf \

diff --git a/tizen/MapsWithMe/data/02_droidsans-fallback.ttf b/tizen/MapsWithMe/data/02_droidsans-fallback.ttf
@@ -0,0 +1 @@
+../../../data/02_droidsans-fallback.ttf
diff --git a/tizen/MapsWithMe/data/02_wqy-microhei.ttf b/tizen/MapsWithMe/data/02_wqy-microhei.ttf
diff --git a/tizen/MapsWithMe/data/about.html b/tizen/MapsWithMe/data/about.html
diff --git a/tizen/MapsWithMe/res/screen-density-high/flags b/tizen/MapsWithMe/res/screen-density-high/flags
diff --git a/tizen/RunUnitTests/res/02_droidsans-fallback.ttf b/tizen/RunUnitTests/res/02_droidsans-fallback.ttf
@@ -0,0 +1 @@
+../../../data/02_droidsans-fallback.ttf
diff --git a/tizen/RunUnitTests/res/02_wqy-microhei.ttf b/tizen/RunUnitTests/res/02_wqy-microhei.ttf
diff --git a/tizen/RunUnitTests/res/about.html b/tizen/RunUnitTests/res/about.html
diff --git a/tizen/RunUnitTests/res/android-guides.json b/tizen/RunUnitTests/res/android-guides.json
diff --git a/tizen/scripts/update_assets_for_unit_tests.sh b/tizen/scripts/update_assets_for_unit_tests.sh
@@ -10,7 +10,7 @@ DST=$1
 
 files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
        types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \
-       drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_wqy-microhei.ttf
+       drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
        03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf
        minsk-pass.mwm)
 

diff --git a/tizen/scripts/update_assets_for_version.sh b/tizen/scripts/update_assets_for_version.sh
@@ -10,7 +10,7 @@ mkdir $DST
 
 files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
        types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \
-       drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_wqy-microhei.ttf
+       drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
        03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf)
 
 for item in ${files[*]}

diff --git a/tools/android/add_assets_mwm-ttf.sh b/tools/android/add_assets_mwm-ttf.sh
@@ -5,7 +5,7 @@ SRC=../../../data
 DST=$1
 
 files=(World.mwm WorldCoasts.mwm \
-       01_dejavusans.ttf 02_wqy-microhei.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf)
+       01_dejavusans.ttf 02_droidsans-fallback.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf)
 
 for item in ${files[*]}
 do

diff --git a/tools/android/obb_make.sh b/tools/android/obb_make.sh
@@ -1,3 +1,3 @@
 cd ../../data
-zip -0 ../tools/android/fonts.obb 01_dejavusans.ttf 02_wqy-microhei.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf
+zip -0 ../tools/android/fonts.obb 01_dejavusans.ttf 02_droidsans-fallback.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf
 zip -0 ../tools/android/world.obb World.mwm WorldCoasts.mwm
diff --git a/tools/unix/external_resources.sh b/tools/unix/external_resources.sh
@@ -3,7 +3,7 @@
 FILES=( World.mwm \
         WorldCoasts.mwm \
         01_dejavusans.ttf \
-        02_wqy-microhei.ttf \
+        02_droidsans-fallback.ttf \
         03_jomolhari-id-a3d.ttf \
         04_padauk.ttf \
         05_khmeros.ttf \