fixed abort subheader, font langstrings

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3135 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Modern UI/Language files/Japanese.nsh

@@ -11,9 +11,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "JAPANESE"
 
   !define MUI_LANGNAME "Japanese" ;(日本語) Use only ASCII characters (if this is not possible, use the English name)
-
-  !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"

Contrib/Modern UI/Language files/Korean.nsh

@@ -12,10 +12,7 @@
 
   !ifndef EUL_RUL
     !define EUL_RUL	"(을)를"	; ~을/를 문제 해결을 위한 정의 !insertmacro MUI_LANGUAGE "Korean" 하기 전에 define 해 놓으면된다.
-  !endif	
-  
-  !define MUI_FONT "±¼¸²"
-  !define MUI_FONTSIZE "9"
+  !endif	s
 
   !define MUI_TEXT_WELCOME_INFO_TITLE "$(^Name) 설치를 시작합니다."
   !define MUI_TEXT_WELCOME_INFO_TEXT "이 프로그램은 당신의 컴퓨터에 $(^Name)${EUL_RUL} 설치할 것입니다.\r\n\r\n설치를 시작하기 전 가능한한 모든 프로그램을 종료하여 주시기 바랍니다. 이는 재부팅을 하지 않고서도 시스템 파일을 수정할 수 있게 해줍니다.\r\n\r\n$_CLICK"

Contrib/Modern UI/Language files/SimpChinese.nsh

@@ -9,9 +9,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "SIMPCHINESE"
 
   !define MUI_LANGNAME "Chinese (Simplified)" ;(以语言本身的方式，写下语言名称) Use only ASCII characters (if this is not possible, use the English name)
-
-  !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"

Contrib/Modern UI/Language files/TradChinese.nsh

@@ -9,9 +9,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "TRADCHINESE"
 
   !define MUI_LANGNAME "Chinese (Traditional)" ;(以語言本身的方式，寫下語言名稱) Use only ASCII characters (if this is not possible, use the English name)
-
-  !define MUI_FONT "·s²Ó©úÅé"
-  !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"

Contrib/Modern UI/System.nsh

@@ -256,7 +256,7 @@ Var MUI_TEMP2
     !ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
       !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
     !else
-      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
+      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_SUBTITLE)"
     !endif
   !else
       !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
@@ -315,7 +315,7 @@ Var MUI_TEMP2
 !macro MUI_GUIINIT_BASIC
 
   GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037
-  CreateFont $MUI_TEMP2 "$(MUI_FONT)" "$(MUI_FONTSIZE)" "700"
+  CreateFont $MUI_TEMP2 "$(^Font)" "$(^FontSize))" "700"
   SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
   SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
 
@@ -1100,7 +1100,7 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
     SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
     
-    CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
+    CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
         
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
@@ -1474,7 +1474,7 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
     SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
     
-    CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
+    CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
     
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
@@ -1969,17 +1969,6 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_LANGUAGEFILE_LANGSTRING_FONT NAME DEFAULT
-
-  !ifdef "${NAME}"
-    Langstring "${NAME}" 0 "${${NAME}}"
-    !undef "${NAME}"
-  !else
-    Langstring "${NAME}" 0 "${DEFAULT}"
-  !endif
-
-!macroend
-
 !macro MUI_LANGUAGEFILE_END
 
   !include "${NSISDIR}\Contrib\Modern UI\Language files\Default.nsh"
@@ -1997,9 +1986,6 @@ Var MUI_TEMP2
     !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' ${LANG_${LANGUAGE}} ${MUI_LANGDLL_PUSHLIST_TEMP}"
   !endif
  
-  !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"