diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index dbb8a7a6b6ea..27137c0a5e00 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -811,7 +811,7 @@ The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. + Could not save the appsettings.json file. Please modify the connection string manually. Your database has been found and is identified as Database configuration @@ -820,12 +820,12 @@ ]]> Next to proceed.]]> - Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

-

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

+ Database not found! Please check that the information in the "ConnectionStrings" property of the "appsettings.json" file is correct.

+

To proceed, please edit the "appsettings.json" file (using Visual Studio or your favourite text editor), add the connection string for your database in the key named "umbracoDbDSN" and save the file.

Click the retry button when - done.
- More information on editing web.config here.

]]> + done.
+ More information on editing appsettings.json here.

]]> Please contact your ISP if necessary. If you're installing on a local machine or server you might need information from your system administrator.]]> @@ -844,7 +844,7 @@ The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> The password is changed! Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + By clicking the next button, you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. Not installed yet. Affected files and folders More information on setting up permissions for Umbraco here @@ -907,8 +907,8 @@ You installed Runway, so why not see how your new website looks.]]> Further help and information Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> Umbraco %0% is installed and ready for use - /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> + + started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, you can find plenty of resources on our getting started pages.]]> Launch Umbraco @@ -2044,8 +2044,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Your website's SSL certificate is expiring in %0% days. Error pinging the URL %0% - '%1%' You are currently %0% viewing the site using the HTTPS scheme. - The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. - The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. + The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your appsettings.json file. Once you access this site using the HTTPS scheme, that should be set to 'true'. + The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your appsettings.json file, your cookies are %1% marked as secure. Debug compilation mode is disabled. Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. @@ -2071,10 +2071,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont --> %0%.]]> No headers revealing information about the website technology were found. - In the Web.config file, system.net/mailsettings could not be found. - In the Web.config file system.net/mailsettings section, the host is not configured. + In the appsettings.json file, Umbraco:CMS:Global:Smtp could not be found. + In the appsettings.json file Umbraco:CMS:Global:Smtp section, the host is not configured. SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. + The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the appsettings.json file Umbraco:CMS:Global:Smtp are correct. %0%.]]> %0%.]]>

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 06cc8de008d7..94cf22501e9b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -830,19 +830,19 @@ The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. + Could not save the appsettings.json file. Please modify the connection string manually. Your database has been found and is identified as Database configuration install button to install the Umbraco %0% database ]]> Next to proceed.]]> - Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

-

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

+ Database not found! Please check that the information in the "ConnectionStrings" property of the "appsettings.json" file is correct.

+

To proceed, please edit the "appsettings.json" file (using Visual Studio or your favourite text editor), add the connection string for your database in the key named "umbracoDbDSN" and save the file.

Click the retry button when - done.
- More information on editing web.config here.

]]> + done.
+ More information on editing appsettings.json here.

]]> Please contact your ISP if necessary. If you're installing on a local machine or server you might need information from your system administrator.]]> @@ -861,7 +861,7 @@ The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> The password is changed! Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + By clicking the next button, you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. Not installed yet. Affected files and folders More information on setting up permissions for Umbraco here @@ -924,8 +924,7 @@ You installed Runway, so why not see how your new website looks.]]> Further help and information Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> Umbraco %0% is installed and ready for use - /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> + started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, you can find plenty of resources on our getting started pages.]]> Launch Umbraco @@ -2102,8 +2101,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Your website's SSL certificate is expiring in %0% days. Error pinging the URL %0% - '%1%' You are currently %0% viewing the site using the HTTPS scheme. - The configuration value 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. - The configuration value 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. + The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your appsettings.json file. Once you access this site using the HTTPS scheme, that should be set to 'true'. + The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your appsettings.json file, your cookies are %1% marked as secure. Debug compilation mode is disabled. Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. @@ -2129,10 +2128,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont --> %0%.]]> No headers revealing information about the website technology were found. - The 'Umbraco:CMS:Global:Smtp' configuration could not be found. - The 'Umbraco:CMS:Global:Smtp:Host' configuration could not be found. + In the appsettings.json file, Umbraco:CMS:Global:Smtp could not be found. + In the appsettings.json file Umbraco:CMS:Global:Smtp section, the host is not configured. SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the configuration 'Umbraco:CMS:Global:Smtp' are correct. + The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the appsettings.json file Umbraco:CMS:Global:Smtp are correct. %0%.]]> %0%.]]>

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]>