[Scummvm-git-logs] scummvm master -> c26d440311cd885843fda91062ca5006eedd52fa

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c26d440311 GUI: Fixed Japanese language abbreviation in font specification


Commit: c26d440311cd885843fda91062ca5006eedd52fa
    https://github.com/scummvm/scummvm/commit/c26d440311cd885843fda91062ca5006eedd52fa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-17T14:16:55+02:00

Commit Message:
GUI: Fixed Japanese language abbreviation in font specification

Changed paths:
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_gfx.stx
    gui/themes/scummremastered.zip
    gui/themes/scummremastered/remastered_gfx.stx


diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 16c9aee945..e458361b4e 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 02d7719b63..1f4fdc3f12 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -128,7 +128,7 @@
 	<fonts>
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Bold.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
@@ -138,7 +138,7 @@
 				id = 'text_default'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -146,7 +146,7 @@
 		</font>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Bold.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
@@ -156,7 +156,7 @@
 				id = 'text_button'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -164,7 +164,7 @@
 		</font>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -174,7 +174,7 @@
 				id = 'text_normal'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -183,7 +183,7 @@
 		<font	id = 'tooltip_normal'
 				file = 'fixed5x8.bdf'
 				point_size = '8'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 0cecaa24ef..5f8bcc6c94 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/remastered_gfx.stx b/gui/themes/scummremastered/remastered_gfx.stx
index 86ce2a016c..b5fad350af 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -130,7 +130,7 @@
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'>
 				<!-- Add these in order of priority. First match is used -->
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Bold.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
@@ -140,7 +140,7 @@
 				id = 'text_default'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -148,7 +148,7 @@
 		</font>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Bold.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
@@ -158,7 +158,7 @@
 				id = 'text_button'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -166,7 +166,7 @@
 		</font>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -176,7 +176,7 @@
 				id = 'text_normal'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
@@ -185,7 +185,7 @@
 		<font	id = 'tooltip_normal'
 				file = 'clR6x12.bdf'
 				point_size = '11'>
-				<language id = 'jp'  scalable_file = 'NotoSansJP-Regular.otf'/>
+				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
 				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>