From da6a5a4cae098120b953df79c5336fe275d1a9be Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 1 May 2019 14:53:27 -0700 Subject: [PATCH] Localization prep - move strings from theme.xml to theme.wxl --- .../Windows/SharedFrameworkBundle/thm.wxl | 5 ++++- .../Windows/SharedFrameworkBundle/thm.xml | 6 +++--- .../Windows/WindowsHostingBundle/thm.wxl | 10 +++++++++- .../Windows/WindowsHostingBundle/thm.xml | 14 +++++++------- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Installers/Windows/SharedFrameworkBundle/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/thm.wxl index bb88e23d9e..11f484d7dd 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/thm.wxl +++ b/src/Installers/Windows/SharedFrameworkBundle/thm.wxl @@ -58,4 +58,7 @@ &Do not close applications. A reboot will be required. &OK &Cancel - \ No newline at end of file + + Welcome to the [WixBundle] Setup. + [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=320539">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. + diff --git a/src/Installers/Windows/SharedFrameworkBundle/thm.xml b/src/Installers/Windows/SharedFrameworkBundle/thm.xml index f9323a366f..c41ead0cf7 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/thm.xml +++ b/src/Installers/Windows/SharedFrameworkBundle/thm.xml @@ -17,8 +17,8 @@ - Welcome to the #(loc.Caption). - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=320539">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. + #(loc.Welcome) + #(loc.EulaPrivacy) #(loc.InstallAcceptCheckbox) @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/thm.wxl index 87ae937c7d..4ec741bf68 100644 --- a/src/Installers/Windows/WindowsHostingBundle/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/thm.wxl @@ -58,4 +58,12 @@ &Do not close applications. A reboot will be required. &OK &Cancel - \ No newline at end of file + + + Welcome to the [WixBundleName] Setup. + Please restart IIS after the installation completes. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. + IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. + [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=320539">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. + Please restart IIS after the installation completes. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. + IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. + diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.xml b/src/Installers/Windows/WindowsHostingBundle/thm.xml index 8ca4905b72..77de329ec9 100644 --- a/src/Installers/Windows/WindowsHostingBundle/thm.xml +++ b/src/Installers/Windows/WindowsHostingBundle/thm.xml @@ -17,10 +17,10 @@ - Welcome to the #(loc.Caption). - Please restart IIS after the installation completes. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. - IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=320539">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. + #(loc.Welcome) + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) + #(loc.EulaPrivacy) #(loc.InstallAcceptCheckbox) @@ -54,8 +54,8 @@ #(loc.ModifyHeader) - Please restart IIS after the installation completes. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. - IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://go.microsoft.com/fwlink/?LinkId=798277">here</a>. + #(loc.ModifyResetIIS) + #(loc.ModifyNoIIS) @@ -81,4 +81,4 @@ - \ No newline at end of file +