diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh
index 771403c9..e315e47c 100644
--- a/Contrib/Modern UI/Language files/Japanese.nsh
+++ b/Contrib/Modern UI/Language files/Japanese.nsh
@@ -12,11 +12,8 @@
!define MUI_LANGNAME "Japanese" ;(日本語) Name of the language in the language itself
- !define MUI_FONT_HEADER "ＭＳ Ｐゴシック"
- !define MUI_FONTSIZE_HEADER "9"
-
- !define MUI_FONT_TITLE "ＭＳ Ｐゴシック"
- !define MUI_FONTSIZE_TITLE "12"
+ !define MUI_FONT "ＭＳ Ｐゴシック"
+ !define MUI_FONTSIZE "9"
!define MUI_TEXT_WELCOME_INFO_TITLE "$(^Name) セットアップ ウィザードへようこそ"
!define MUI_TEXT_WELCOME_INFO_TEXT "このウィザードは、$(^Name)のインストールをガイドしていきます。\r\n\r\nセットアップを開始する前に、他のすべてのアプリケーションを終了することを推奨します。これによって、セットアップがこのコンピュータを再起動せずに、確実にシステム ファイルをアップデートすることが出来るようになります。\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Language files/Korean.nsh b/Contrib/Modern UI/Language files/Korean.nsh
index 89969d0b..7f284017 100644
--- a/Contrib/Modern UI/Language files/Korean.nsh
+++ b/Contrib/Modern UI/Language files/Korean.nsh
@@ -2,23 +2,30 @@
;Compatible with Modern UI 1.66
;Language: Korean (1042)
-;By linak linak@korea.com / modified by koder@popdesk.co.kr ｼﾁ､ｽﾃ ｸﾞﾀﾏｷﾎ 'ｲﾀ' ｿｬｶ ｹﾙｶｴﾏｴﾙ.
-
+;By linak linak@korea.com
+;modified by koder@popdesk.co.kr ｼﾁ､ｽﾃ ｸﾞﾀﾏｷﾎ 'ｲﾀ' ｿｬｶ ｹﾙｶｴﾏｴﾙ / wini.pe.kr ｷﾎ ｿﾀｽﾃｸ ｻﾇﾃｿｹﾁｦｸｦ ｺｼｼ ﾀﾖﾀｻ ｲｮｴﾏｴﾙ.
;--------------------------------
!insertmacro MUI_LANGUAGEFILE_BEGIN "KOREAN"
!define MUI_LANGNAME "Korean" ;Use only ASCII characters (if this is not possible, use the English name)
+ !ifndef EUL_RUL
+ !define EUL_RUL "(ﾀｻ)ｸｦ" ; ~ﾀｻ/ｸｦ ｹｮﾁｦ ﾇﾘｰ眤ｻ ﾀｧﾇﾑ ﾁ､ﾀﾇ !insertmacro MUI_LANGUAGE "Korean" ﾇﾏｱ ﾀｿ｡ define ﾇﾘ ｳﾀｸｸ魴ﾈｴﾙ.
+ !endif
+
+ !define MUI_FONT "ｱｼｸｲ"
+ !define MUI_FONTSIZE "9"
+
!define MUI_TEXT_WELCOME_INFO_TITLE "$(^Name) ｼｳﾄ｡ ｸｶｹｻ鄙｡ ｿﾀｽﾅ ｰﾍﾀｻ ﾈｯｿｵﾇﾕｴﾏｴﾙ."
- !define MUI_TEXT_WELCOME_INFO_TEXT "ﾀﾌ ｸｶｹｻ邏ﾂ ｴ鄂ﾅﾀﾇ ﾄﾄﾇｻﾅﾍｿ｡ $(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾒ ｰﾍﾀﾔｴﾏｴﾙ.\r\n\r\nｼｳﾄ｡ｸｦ ｽﾃﾀﾛﾇﾏｱ ﾀｿ｡ ｸｵ ﾇﾁｷﾎｱﾗｷ･ﾀｻ ﾁｾｷ睇ﾘﾁﾖｽﾃｱ ｹﾙｶｴﾏｴﾙ. ﾇﾁｷﾎｱﾗｷ･ﾀｻ ﾁｾｷ睇ﾏｰﾔ ｵﾇｸ ｽﾃｽｺﾅﾛﾀｻ ﾀ郤ﾎﾆﾃ ﾇﾏﾁ ｾﾊｰｼｭｵｵ ﾆｯﾁ､ﾇﾑ ｽﾃｽｺﾅﾛ ﾆﾄﾀﾏﾀｻ ｼﾁ､ﾇﾒ ｼ ﾀﾖｱ ｶｧｹｮﾀﾔｴﾏｴﾙ.\r\n\r\n$_CLICK"
+ !define MUI_TEXT_WELCOME_INFO_TEXT "ﾀﾌ ｸｶｹｻ邏ﾂ ｴ鄂ﾅﾀﾇ ﾄﾄﾇｻﾅﾍｿ｡ $(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾒ ｰﾍﾀﾔｴﾏｴﾙ.\r\n\r\nｼｳﾄ｡ｸｦ ｽﾃﾀﾛﾇﾏｱ ﾀｿ｡ ｸｵ ﾇﾁｷﾎｱﾗｷ･ﾀｻ ﾁｾｷ睇ﾘﾁﾖｽﾃｱ ｹﾙｶｴﾏｴﾙ. ﾇﾁｷﾎｱﾗｷ･ﾀｻ ﾁｾｷ睇ﾏｰﾔ ｵﾇｸ ｽﾃｽｺﾅﾛﾀｻ ﾀ郤ﾎﾆﾃ ﾇﾏﾁ ｾﾊｰｼｭｵｵ ｽﾃｽｺﾅﾛ ﾆﾄﾀﾏﾀｻ ｼﾁ､ﾇﾒ ｼ ﾀﾖｱ ｶｧｹｮﾀﾔｴﾏｴﾙ.\r\n\r\n$_CLICK"
!define MUI_TEXT_LICENSE_TITLE "ｻ鄙 ｰ霎 ｵｿﾀﾇ"
- !define MUI_TEXT_LICENSE_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾏｽﾃｱ ﾀｿ｡ ｻ鄙 ｰ霎 ｳｻｿﾀｻ ｻﾆｺｸｽﾃｱ ｹﾙｶｴﾏｴﾙ."
+ !define MUI_TEXT_LICENSE_SUBTITLE "$(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾏｽﾃｱ ﾀｿ｡ ｻ鄙 ｰ霎 ｳｻｿﾀｻ ｻﾆｺｸｽﾃｱ ｹﾙｶｴﾏｴﾙ."
!define MUI_INNERTEXT_LICENSE_TOP "ｻ鄙 ｰ霎 ｵｿﾀﾇ ｻ酩ﾗﾀﾇ ｳｪｸﾓﾁ ｺﾎｺﾐﾀｻ ｺｸｽﾃｷﾁｸ [Page Down] ﾅｰｸｦ ｴｭｷｯ ﾁﾖｼｼｿ."
- !define MUI_INNERTEXT_LICENSE_BOTTOM "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ 'ｵｿﾀﾇﾇﾔ'ﾀｻ ｴｭｷｯ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ."
- !define MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ｾﾆｷ｡ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
- !define MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ﾃｹｹﾂｰ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
+ !define MUI_INNERTEXT_LICENSE_BOTTOM "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ 'ｵｿﾀﾇﾇﾔ'ﾀｻ ｴｭｷｯ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ."
+ !define MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ｾﾆｷ｡ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
+ !define MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ﾃｹｹﾂｰ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
!define MUI_TEXT_COMPONENTS_TITLE "ｱｸｼｺ ｿ莨ﾒ ｼｱﾅﾃ"
!define MUI_TEXT_COMPONENTS_SUBTITLE "ｼｳﾄ｡ﾇﾏｰﾀﾚ ﾇﾏｴﾂ $(^Name)ﾀﾇ ｱｸｼｺ ｿ莨ﾒｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
@@ -26,10 +33,10 @@
!define MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ｻｼｼ ｼｳｸﾀｻ ｺｸｽﾃｰ ｽﾍﾀｸｽﾅ ｺﾎｺﾐｿ｡ ｸｶｿｽｺｸｦ ｿﾃｷﾁｳﾀｸｼｼｿ."
!define MUI_TEXT_DIRECTORY_TITLE "ｼｳﾄ｡ ﾀｧﾄ｡ ｼｱﾅﾃ"
- !define MUI_TEXT_DIRECTORY_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ ﾇﾒ ﾆｴｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
+ !define MUI_TEXT_DIRECTORY_SUBTITLE "$(^Name)${EUL_RUL} ｼｳﾄ｡ ﾇﾒ ﾆｴｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
!define MUI_TEXT_INSTALLING_TITLE "ｼｳﾄ｡ﾁﾟ"
- !define MUI_TEXT_INSTALLING_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ｼｳﾄ｡ﾇﾏｴﾂ ｵｿｾﾈ ﾀ眇ﾃ ｱ箒ﾙｷﾁ ﾁﾖｼｼｿ."
+ !define MUI_TEXT_INSTALLING_SUBTITLE "$(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾏｴﾂ ｵｿｾﾈ ﾀ眇ﾃ ｱ箒ﾙｷﾁ ﾁﾖｼｼｿ."
!define MUI_TEXT_FINISH_TITLE "ｼｳﾄ｡ ｿﾏｷ"
!define MUI_TEXT_FINISH_SUBTITLE "ｼｳﾄ｡ｰ｡ ｼｺｰﾀﾀｸｷﾎ ﾀﾌｷ鄒ﾁｳｽﾀｴﾏｴﾙ."
@@ -55,22 +62,22 @@
!define MUI_UNTEXT_CONFIRM_TITLE "$(^Name) ﾁｦｰﾅ"
- !define MUI_UNTEXT_CONFIRM_SUBTITLE "ｽﾃｽｺﾅﾛｿ｡ｼｭ $(^Name) ﾁｦｰﾅﾇﾏｱ"
+ !define MUI_UNTEXT_CONFIRM_SUBTITLE "$(^Name) ﾁｦｰﾅﾇﾏｱ"
!define MUI_UNTEXT_LICENSE_TITLE "ｻ鄙 ｰ霎 ｵｿﾀﾇ"
- !define MUI_UNTEXT_LICENSE_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ｻ霖ｦﾇﾏｽﾃｱ ﾀｿ｡ ｻ鄙 ｰ霎 ｳｻｿﾀｻ ｻﾆｺｸｽﾃｱ ｹﾙｶｴﾏｴﾙ."
- !define MUI_UNINNERTEXT_LICENSE_BOTTOM "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ 'ｵｿﾀﾇﾇﾔ'ﾀｻ ｴｭｷｯ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｻ霖ｦﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ."
- !define MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ｾﾆｷ｡ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｻ霖ｦﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
- !define MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ﾃｹｹﾂｰ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)(ﾀｻ)ｸｦ ｻ霖ｦﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
+ !define MUI_UNTEXT_LICENSE_SUBTITLE "$(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾏｽﾃｱ ﾀｿ｡ ｻ鄙 ｰ霎 ｳｻｿﾀｻ ｻﾆｺｸｽﾃｱ ｹﾙｶｴﾏｴﾙ."
+ !define MUI_UNINNERTEXT_LICENSE_BOTTOM "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ 'ｵｿﾀﾇﾇﾔ'ﾀｻ ｴｭｷｯ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ."
+ !define MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ｾﾆｷ｡ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
+ !define MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ｳｻｿｿ｡ ｵｿﾀﾇ ﾇﾏｼﾌｴﾙｸ ﾃｹｹﾂｰ ｻ酩ﾗﾀｻ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ. $(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾏｱ ﾀｧﾇﾘｼｭｴﾂ ｹﾝｵ蠖ﾃ ｳｻｿｿ｡ ｵｿﾀﾇﾇﾏｼﾅｾﾟ ﾇﾕｴﾏｴﾙ. $_CLICK"
!define MUI_UNTEXT_COMPONENTS_TITLE "ｱｸｼｺ ｿ莨ﾒ ｼｱﾅﾃ"
!define MUI_UNTEXT_COMPONENTS_SUBTITLE "ﾁｦｰﾅﾇﾏｰﾀﾚ ﾇﾏｴﾂ $(^Name)ﾀﾇ ｱｸｼｺ ｿ莨ﾒｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
!define MUI_UNTEXT_DIRECTORY_TITLE "ﾁｦｰﾅ ﾀｧﾄ｡ ｼｱﾅﾃ"
- !define MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ﾁｦｰﾅﾇﾒ ﾆｴｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
+ !define MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾒ ﾆｴｸｦ ｼｱﾅﾃﾇﾘ ﾁﾖｼｼｿ."
!define MUI_UNTEXT_UNINSTALLING_TITLE "ﾁｦｰﾅﾁﾟ"
- !define MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^Name)(ﾀｻ)ｸｦ ﾁｦｰﾅﾇﾏｴﾂ ｵｿｾﾈ ﾀ眇ﾃ ｱ箒ﾙｷﾁ ﾁﾖｽﾃｱ ｹﾙｶｴﾏｴﾙ."
+ !define MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^Name)${EUL_RUL} ﾁｦｰﾅﾇﾏｴﾂ ｵｿｾﾈ ﾀ眇ﾃ ｱ箒ﾙｷﾁ ﾁﾖｽﾃｱ ｹﾙｶｴﾏｴﾙ."
!define MUI_UNTEXT_FINISH_TITLE "ﾁｦｰﾅ ｸｶﾄｧ"
!define MUI_UNTEXT_FINISH_SUBTITLE "ﾇﾁｷﾎｱﾗｷ･ﾀｻ ｼｺｰﾀﾀｸｷﾎ ﾁｦｰﾅﾇﾏｿｴｽﾀｴﾏｴﾙ."
@@ -78,4 +85,4 @@
!define MUI_UNTEXT_ABORT_TITLE "ﾇﾁｷﾎｱﾗｷ･ ﾁｦｰﾅ ﾃｼﾒ"
!define MUI_UNTEXT_ABORT_SUBTITLE "ﾇﾁｷﾎｱﾗｷ･ ﾁｦｰﾅｰ｡ ﾃｼﾒ ｵﾇｾｽﾀｴﾏｴﾙ."
-!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh
index b394c2dc..8c54d484 100644
--- a/Contrib/Modern UI/Language files/SimpChinese.nsh
+++ b/Contrib/Modern UI/Language files/SimpChinese.nsh
@@ -10,12 +10,9 @@
!define MUI_LANGNAME "Chinese (Simplified)" ;(ﾒﾔﾓﾑﾔｱｾﾉｵﾄｷｽﾊｽ｣ｬﾐｴﾏﾂﾓﾑﾔﾃｳﾆ) Name of the language in the language itself
- !define MUI_FONT_HEADER "ﾋﾎﾌ"
- !define MUI_FONTSIZE_HEADER "9"
+ !define MUI_FONT "ﾋﾎﾌ"
+ !define MUI_FONTSIZE "9"
- !define MUI_FONT_TITLE "ﾋﾎﾌ"
- !define MUI_FONTSIZE_TITLE "9"
-
!define MUI_TEXT_WELCOME_INFO_TITLE "ｻｶﾓｭﾊｹﾓﾃ $(^Name) ｰｲﾗｰﾏｵｼ"
!define MUI_TEXT_WELCOME_INFO_TEXT "ﾕ篆ｫｻ瞞ﾚﾄ羞ﾄｼﾆﾋ羹｣ｬｰｲﾗｰ $(^Name) ｡｣\r\n\r\nﾔﾚｿｪﾊｼｰｲﾗｰﾖｮﾇｰ｣ｬｽｨﾒ鰕ﾈｹﾘｱﾕﾆ萢ﾋﾓﾐﾓｦﾓﾃｳﾌﾐ｡｣ﾕ篆ｫﾔﾊﾐ｡ｰｰｲﾗｰｳﾌﾐ｡ｱｸﾐﾂﾖｸｶｨｵﾄﾏｵﾍｳﾎﾄｼ｣ｬｶｲｻﾐ靨ｪﾖﾘﾐﾂﾆｶｯﾄ羞ﾄｼﾆﾋ羹｡｣\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh
index f0323da0..1560dc70 100644
--- a/Contrib/Modern UI/Language files/TradChinese.nsh
+++ b/Contrib/Modern UI/Language files/TradChinese.nsh
@@ -10,11 +10,8 @@
!define MUI_LANGNAME "Chinese (Traditional)" ;(･Hｻyｨ･･ｻｨｭｪｺ､隕｡｡Aｼg､Uｻyｨ･ｦWｺﾙ) Name of the language in the language itself
- !define MUI_FONT_HEADER "ｷsｲﾓｩﾅ"
- !define MUI_FONTSIZE_HEADER "9"
-
- !define MUI_FONT_TITLE "ｷsｲﾓｩﾅ"
- !define MUI_FONTSIZE_TITLE "9"
+ !define MUI_FONT "ｷsｲﾓｩﾅ"
+ !define MUI_FONTSIZE "9"
!define MUI_TEXT_WELCOME_INFO_TITLE "ﾅwｪｨﾏ･ﾎ $(^Name) ｦwｸﾋｺﾆF"
!define MUI_TEXT_WELCOME_INFO_TEXT "ｳoｱNｷ|ｦbｧAｪｺｹqｸ｣｡Aｦwｸﾋ $(^Name) ｡C\r\n\r\nｦbｶ}ｩlｦwｸﾋ､ｧｫe｡Aｫﾘﾄｳ･ﾃｳｬｨ茹Lｩﾒｦｳﾀｳ･ﾎｵ{ｦ｡｡CｳoｱN､ｹｳ\\｡uｦwｸﾋｵ{ｦ｡｡vｧｷsｫｩwｪｺｨtｲﾎﾀﾉｮﾗ｡Aｦﾓ､｣ｻﾝｭnｭｫｷsｱﾒｰﾊｧAｪｺｹqｸ｣｡C\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 02648fca..1f9243c6 100644
--- a/Contrib/Modern UI/Readme.html
+++ b/Contrib/Modern UI/Readme.html
@@ -63,14 +63,14 @@ table
.header
{
- font-size: 14pt;
+ font-size: 16pt;
color: #7A7272;
}
.subheader
{
margin: 20px;
- font-size: 12pt;
+ font-size: 14pt;
font-weight: bold;
color: #303030;
}
@@ -78,7 +78,7 @@ table
.sub2header
{
margin: 20px;
- font-size: 11pt;
+ font-size: 12pt;
font-weight: bold;
color: #2B5885;
}
@@ -164,7 +164,7 @@ will also help you to learn more about the Modern UI.
When adding " to a Modern UI string, you should always escape it ($\"),
because the Modern UI macros use " to separate parameters. If you want to set texts like above you have to
escape both " and ' (using $\" and $\').
-
+
!include "MUI.nsh"
MUI.nsh is in the Include directory, so you don't have
to specify a path.
@@ -238,9 +238,11 @@ will also help you to learn more about the Modern UI.
MUI_INSTFILESPAGE_COLORS (/windows |
(foreground color: RRGGBB hexadecimal) (background color: RRGGBB hexadecimal))
- The colors of the details screen. Use /windows for the default colors.
+ The colors of the details screen.
+
Default: /windows
MUI_INSTFILESPAGE_PROGRESSBAR ("" | colored | smooth)
- The style of the progress bar. Colored makes it use the MUI_INSTALLCOLORS.
Default: smooth
+ The style of the progress bar. Colored makes it use the MUI_INSTALLCOLORS.
+
Default: smooth
@@ -460,35 +462,21 @@ will also help you to learn more about the Modern UI.
More info...
If you want add your own code to functions inserted by the
Modern UI (i.e. the .onGUIInit function and the page functions), create your
own function and let the Modern UI functions call them.
More info...
-
+
Insert the Modern UI language files for the languages to want to include.
!insertmacro MUI_LANGUAGE "English"
The Modern UI language files load the NLF language files,
so you should not use LoadLanguageFile.
-
-
-
You can customize the fonts for a language using the following defines before inserting
- a language.
-
MUI_FONT_HEADER font_name
- MUI_FONTSIZE_HEADER font_size
- MUI_FONTSTYLE_HEADER weight [/ITALIC] [/UNDERLINE] [/STRIKE]
- The font for the title in the header.
-
MUI_FONT_TITLE font_name
- MUI_FONTSIZE_TITLE font_size
- MUI_FONTSTYLE_TITLE weight [/ITALIC] [/UNDERLINE] [/STRIKE]
- The font for the title on the Welcome and Finish page.
-
Note: Page texts can be changed using page settings.
-
If you want the installer to display a language selection dialog
(have a look at the
- MultiLanguage.nsi example), insert the MUI_LANGDLL_DISPLAY macro in .onInit.
+ MultiLanguage.nsi example), insert the MUI_LANGDLL_DISPLAY macro in the .onInit function.
Function .onInit
@@ -543,7 +531,7 @@ functions.
Add your installer sections and functions.
See the NSIS Users Manual for details.
-
+
The descriptions of sections will be displayed on the
components page, when the user hovers the mouse over a section.
If you don't want to use descriptions, use the MUI_COMPONENTSPAGE_NODESC
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index f49137ba..f0d56ba9 100644
--- a/Contrib/Modern UI/System.nsh
+++ b/Contrib/Modern UI/System.nsh
@@ -306,7 +306,7 @@ Var MUI_TEMP2
!macro MUI_GUIINIT_BASIC
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037
- CreateFont $MUI_TEMP2 "$(MUI_FONT_HEADER)" "$(MUI_FONTSIZE_HEADER)" "$(MUI_FONTSTYLE_HEADER)"
+ CreateFont $MUI_TEMP2 "$(MUI_FONT)" "$(MUI_FONTSIZE)" "700"
SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
@@ -330,7 +330,7 @@ Var MUI_TEMP2
!macro MUI_UNGUIINIT_BASIC
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037
- CreateFont $MUI_TEMP2 "$(MUI_FONT_HEADER)" "$(MUI_FONTSIZE_HEADER)" "$(MUI_FONTSTYLE_HEADER)"
+ CreateFont $MUI_TEMP2 "$(MUI_FONT)" "$(MUI_FONTSIZE)" "700"
SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
@@ -802,40 +802,6 @@ Var MUI_TEMP2
!endif
!insertmacro MUI_FUNCTION_FINISHPAGE mui.FinishPre_${MUI_UNIQUEID} mui.FinishLeave_${MUI_UNIQUEID}
-
- !ifdef MUI_FINISHPAGE_RUN
- !undef MUI_FINISHPAGE_RUN
- !endif
- !ifdef MUI_FINISHPAGE_RUN_PARAMETERS
- !undef MUI_FINISHPAGE_RUN_PARAMETERS
- !endif
- !ifdef MUI_FINISHPAGE_RUN_NOTCHECKED
- !undef MUI_FINISHPAGE_RUN_NOTCHECKED
- !endif
- !ifdef MUI_FINISHPAGE_RUN_FUNCTION
- !undef MUI_FINISHPAGE_RUN_FUNCTION
- !endif
- !ifdef MUI_FINISHPAGE_SHOWREADME
- !undef MUI_FINISHPAGE_SHOWREADME
- !endif
- !ifdef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
- !undef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
- !endif
- !ifdef MUI_FINISHPAGE_SHOWREADME_FUNCTION
- !undef MUI_FINISHPAGE_SHOWREADME_FUNCTION
- !endif
- !ifdef MUI_FINISHPAGE_LINK
- !undef MUI_FINISHPAGE_LINK
- !endif
- !ifdef MUI_FINISHPAGE_LINK_LOCATION
- !undef MUI_FINISHPAGE_LINK_LOCATION
- !endif
- !ifdef MUI_FINISHPAGE_LINK_COLOR
- !undef MUI_FINISHPAGE_LINK_COLOR
- !endif
- !ifdef MUI_FINISHPAGE_NOREBOOTSUPPORT
- !undef MUI_FINISHPAGE_NOREBOOTSUPPORT
- !endif
!verbose pop
@@ -1203,12 +1169,13 @@ Var MUI_TEMP2
GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
- CreateFont $MUI_TEMP2 "$(MUI_FONT_TITLE)" "$(MUI_FONTSIZE_TITLE)" "$(MUI_FONTSTYLE_TITLE)"
+
+ CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
-
+
GetDlgItem $MUI_TEMP1 $MUI_HWND 1200
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
@@ -1616,7 +1583,11 @@ Var MUI_TEMP2
GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
- CreateFont $MUI_TEMP2 "$(MUI_FONT_TITLE)" "$(MUI_FONTSIZE_TITLE)" "$(MUI_FONTSTYLE_TITLE)"
+
+ GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
+ SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+
+ CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
@@ -1756,6 +1727,40 @@ Var MUI_TEMP2
FunctionEnd
+ !ifdef MUI_FINISHPAGE_RUN
+ !undef MUI_FINISHPAGE_RUN
+ !endif
+ !ifdef MUI_FINISHPAGE_RUN_PARAMETERS
+ !undef MUI_FINISHPAGE_RUN_PARAMETERS
+ !endif
+ !ifdef MUI_FINISHPAGE_RUN_NOTCHECKED
+ !undef MUI_FINISHPAGE_RUN_NOTCHECKED
+ !endif
+ !ifdef MUI_FINISHPAGE_RUN_FUNCTION
+ !undef MUI_FINISHPAGE_RUN_FUNCTION
+ !endif
+ !ifdef MUI_FINISHPAGE_SHOWREADME
+ !undef MUI_FINISHPAGE_SHOWREADME
+ !endif
+ !ifdef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !undef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !endif
+ !ifdef MUI_FINISHPAGE_SHOWREADME_FUNCTION
+ !undef MUI_FINISHPAGE_SHOWREADME_FUNCTION
+ !endif
+ !ifdef MUI_FINISHPAGE_LINK
+ !undef MUI_FINISHPAGE_LINK
+ !endif
+ !ifdef MUI_FINISHPAGE_LINK_LOCATION
+ !undef MUI_FINISHPAGE_LINK_LOCATION
+ !endif
+ !ifdef MUI_FINISHPAGE_LINK_COLOR
+ !undef MUI_FINISHPAGE_LINK_COLOR
+ !endif
+ !ifdef MUI_FINISHPAGE_NOREBOOTSUPPORT
+ !undef MUI_FINISHPAGE_NOREBOOTSUPPORT
+ !endif
+
!macroend
!macro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -2136,17 +2141,6 @@ Var MUI_TEMP2
!macroend
-!macro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT NAME DEFAULT
-
- !ifdef "${NAME}"
- Langstring "${NAME}" 0 "${${NAME}}"
- !undef "${NAME}"
- !else
- Langstring "${NAME}" 0 "${DEFAULT}"
- !endif
-
-!macroend
-
!macro MUI_LANGUAGEFILE_LANGSTRING_FONT NAME DEFAULT
!ifdef "${NAME}"
@@ -2172,15 +2166,10 @@ Var MUI_TEMP2
!undef MUI_LANGDLL_PUSHLIST
!define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' ${LANG_${LANGUAGE}} ${MUI_LANGDLL_PUSHLIST_TEMP}"
!endif
-
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONT_HEADER" "MS Shell Dlg"
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSIZE_HEADER" "8"
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSTYLE_HEADER" "700"
-
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONT_TITLE" "MS Shell Dlg"
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONTSIZE_TITLE" "12"
- !insertmacro MUI_LANGUAGEFILE_LANGSTRING_INSTFONT "MUI_FONTSTYLE_TITLE" "700"
-
+
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONT" "MS Shell Dlg"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSIZE" "8"
+
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_BGCOLOR"
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE WELCOME "MUI_TEXT_WELCOME_INFO_TITLE"
@@ -2271,4 +2260,4 @@ Var MUI_TEMP2
!ifndef MUI_MANUALVERBOSE
!verbose 4
-!endif
\ No newline at end of file
+!endif
\ No newline at end of file