yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/9.5' into v9/dev

Browse Source
This commit is contained in:
Bjarke Berg
2022-04-22 14:59:56 +02:00
parent d1fcacb442 ef0e3d649f
commit 7474eaa0d8
5 changed files with 254 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.controller.js
View File

@@ -54,19 +54,49 @@ angular.module("umbraco").controller("Umbraco.Editors.ConfigureTwoFactorControll
} }
function disable(provider) { function disable(provider) {
if ($scope.model.isCurrentUser) {
const disableTwoFactorSettings = {
provider,
user: vm.user,
size: "small",
view: "views/common/infiniteeditors/twofactor/disabletwofactor.html",
close: function () {
editorService.close();
onInit();
}
};
const disableTwoFactorSettings = { editorService.open(disableTwoFactorSettings);
provider, } else {
user: vm.user, localizationService.localize("user_2faDisableForUser").then(function (value) {
size: "small", const removeOverlay = {
view: "views/common/infiniteeditors/twofactor/disabletwofactor.html", content: value,
close: function () { submitButtonLabelKey: 'actions_disable',
editorService.close(); submit: function ({ close }) {
onInit(); twoFactorLoginResource.disable(provider.providerName, $scope.model.user.key)
} .then(onResponse)
}; .catch(onError);
editorService.open(disableTwoFactorSettings); close();
}
};
overlayService.confirmRemove(removeOverlay);
});
}
}
function onResponse(response) {
if (response) {
localizationService.localize("user_2faProviderIsDisabledMsg").then(function (value) {
notificationsService.info(value);
});
onInit();
} else {
localizationService.localize("user_2faProviderIsNotDisabledMsg").then(function (value) {
notificationsService.error(value);
});
}
} }
function onError(error) { function onError(error) {

10
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.html
View File

@@ -21,15 +21,9 @@
<umb-icon icon="icon-check" class="success"></umb-icon> <umb-icon icon="icon-check" class="success"></umb-icon>
</p> </p>
<umb-button type="button" ng-if="!model.isCurrentUser" button-style="[warning,block]" <umb-button type="button" action="vm.disable(provider)" button-style="[warning,block]" label="Disable"
action="vm.disable(provider.providerName)" label="Disable" label-key="actions_disable" size="m" label-key="actions_disable" size="m">
state="vm.buttonState">
</umb-button> </umb-button>
<div ng-if="model.isCurrentUser">
<umb-button type="button" action="vm.disable(provider)" label="Disable" label-key="actions_disable">
</umb-button>
</div>
</div> </div>
<umb-button type="button" ng-if="!provider.isEnabledOnUser" button-style="[action,block]" <umb-button type="button" ng-if="!provider.isEnabledOnUser" button-style="[action,block]"

2
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -1927,6 +1927,8 @@ Mange hilsner fra Umbraco robotten
<key alias="2faDisableText">Hvis du ønsker at slå denne autentificeringsmetode fra, så skal du nu indtaste koden fra dit device:</key> <key alias="2faDisableText">Hvis du ønsker at slå denne autentificeringsmetode fra, så skal du nu indtaste koden fra dit device:</key>
<key alias="2faProviderIsEnabled">Denne autentificeringsmetode er slået til</key> <key alias="2faProviderIsEnabled">Denne autentificeringsmetode er slået til</key>
<key alias="2faProviderIsDisabledMsg">Den valgte autentificeringsmetode er nu slået fra</key> <key alias="2faProviderIsDisabledMsg">Den valgte autentificeringsmetode er nu slået fra</key>
<key alias="2faProviderIsNotDisabledMsg">Der skete en ukendt fejl da denne autentificeringsmetode skulles slåes fra</key>
<key alias="2faDisableForUser">Er du sikker på, at du vil fjerne denne autentificeringsmetode for denne bruger?</key>
</area> </area>
<area alias="validation"> <area alias="validation">
<key alias="validation">Validering</key> <key alias="validation">Validering</key>

412
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -577,11 +577,11 @@
<area alias="dictionaryItem"> <area alias="dictionaryItem">
<key alias="description"><![CDATA[ <key alias="description"><![CDATA[
Edit the different language versions for the dictionary item '<em>%0%</em>' below Edit the different language versions for the dictionary item '<em>%0%</em>' below
]]></key> ]]> </key>
<key alias="displayName">Culture Name</key> <key alias="displayName">Culture Name</key>
<key alias="changeKeyError"><![CDATA[ <key alias="changeKeyError"><![CDATA[
The key '%0%' already exists. The key '%0%' already exists.
]]></key> ]]> </key>
<key alias="overviewTitle">Dictionary overview</key> <key alias="overviewTitle">Dictionary overview</key>
</area> </area>
<area alias="examineManagement"> <area alias="examineManagement">
@@ -932,7 +932,7 @@
<p> <p>
Don't worry - no content will be deleted and everything will continue working afterwards! Don't worry - no content will be deleted and everything will continue working afterwards!
</p> </p>
]]></key> ]]> </key>
<key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
proceed. ]]></key> proceed. ]]></key>
<key alias="databaseUpToDate"> <key alias="databaseUpToDate">
@@ -978,19 +978,19 @@
<key alias="permissionsText"><![CDATA[ <key alias="permissionsText"><![CDATA[
Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's. Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
It also stores temporary data (aka: cache) for enhancing the performance of your website. It also stores temporary data (aka: cache) for enhancing the performance of your website.
]]></key> ]]> </key>
<key alias="runwayFromScratch">I want to start from scratch</key> <key alias="runwayFromScratch">I want to start from scratch</key>
<key alias="runwayFromScratchText"><![CDATA[ <key alias="runwayFromScratchText"><![CDATA[
Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own Document Types and templates. Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own Document Types and templates.
(<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>) (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
You can still choose to install Runway later on. Please go to the Developer section and choose Packages. You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
]]></key> ]]> </key>
<key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key> <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
<key alias="runwayInstalled">Runway is installed</key> <key alias="runwayInstalled">Runway is installed</key>
<key alias="runwayInstalledText"><![CDATA[ <key alias="runwayInstalledText"><![CDATA[
You have the foundation in place. Select what modules you wish to install on top of it.<br /> You have the foundation in place. Select what modules you wish to install on top of it.<br />
This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a> This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
]]></key> ]]> </key>
<key alias="runwayOnlyProUsers">Only recommended for experienced users</key> <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
<key alias="runwaySimpleSite">I want to start with a simple website</key> <key alias="runwaySimpleSite">I want to start with a simple website</key>
<key alias="runwaySimpleSiteText"><![CDATA[ <key alias="runwaySimpleSiteText"><![CDATA[
@@ -1004,7 +1004,7 @@
<em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br /> <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
<em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery. <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
</small> </small>
]]></key> ]]> </key>
<key alias="runwayWhatIsRunway">What is Runway</key> <key alias="runwayWhatIsRunway">What is Runway</key>
<key alias="step1">Step 1/5 Accept license</key> <key alias="step1">Step 1/5 Accept license</key>
<key alias="step2">Step 2/5: Database configuration</key> <key alias="step2">Step 2/5: Database configuration</key>
@@ -1081,72 +1081,72 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<tr> <tr>
<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;"> <td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]--> <!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
<div> </div> <div></div>
<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]--> <!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
</td> </td>
<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td> <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'> <table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
<tr> <tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'> <td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'> <div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
<br> <br>
<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'> <table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
<tr> <tr>
<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'> <td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
<tr> <tr>
<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> <td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'> <h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
Password reset requested Password reset requested
</h1> </h1>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
Your username to login to the Umbraco backoffice is: <strong>%0%</strong> Your username to login to the Umbraco backoffice is: <strong>%0%</strong>
</p> </p>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
<tbody> <tbody>
<tr> <tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'> <a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
Click this link to reset your password Click this link to reset your password
</a> </a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</p> </p>
<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p> <p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
<table border='0' cellpadding='0' cellspacing='0'> <table border='0' cellpadding='0' cellspacing='0'>
<tr> <tr>
<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'> <td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;"> <font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a> <a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
</font> </font>
</td> </td>
</tr> </tr>
</table> </table>
</p> </p>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br><br><br> <br><br><br>
</div> </div>
</td> </td>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>
]]></key> ]]> </key>
<key alias="mfaSecurityCodeSubject">Umbraco: Security Code</key> <key alias="mfaSecurityCodeSubject">Umbraco: Security Code</key>
<key alias="mfaSecurityCodeMessage">Your security code is: %0%</key> <key alias="mfaSecurityCodeMessage">Your security code is: %0%</key>
<key alias="2faTitle">One last step</key> <key alias="2faTitle">One last step</key>
@@ -1193,7 +1193,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
Have a nice day! Have a nice day!
Cheers from the Umbraco robot Cheers from the Umbraco robot
]]></key> ]]> </key>
<key alias="mailBodyVariantSummary">The following languages have been modified %0%</key> <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
<key alias="mailBodyHtml"><![CDATA[ <key alias="mailBodyHtml"><![CDATA[
<html> <html>
@@ -1210,70 +1210,70 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<tr> <tr>
<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;"> <td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]--> <!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
<div> </div> <div></div>
<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]--> <!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
</td> </td>
<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td> <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'> <table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
<tr> <tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'> <td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'> <div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
<br> <br>
<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'> <table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
<tr> <tr>
<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'> <td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
<tr> <tr>
<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> <td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'> <h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
Hi %0%, Hi %0%,
</h1> </h1>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong> This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
</p> </p>
<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'> <table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
<tbody> <tbody>
<tr> <tr>
<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'> <td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table> <a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a></td></tr></tbody></table>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
<h3>Update summary:</h3> <h3>Update summary:</h3>
%6% %6%
</p> </p>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
Have a nice day!<br /><br /> Have a nice day!<br /><br />
Cheers from the Umbraco robot Cheers from the Umbraco robot
</p> </p>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br><br><br> <br><br><br>
</div> </div>
</td> </td>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>
]]></key> ]]> </key>
<key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p> <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
%0% %0%
]]></key> ]]> </key>
<key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key> <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
<key alias="notifications">Notifications</key> <key alias="notifications">Notifications</key>
</area> </area>
@@ -1284,7 +1284,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="chooseLocalPackageText"><![CDATA[ <key alias="chooseLocalPackageText"><![CDATA[
Choose Package from your machine, by clicking the Browse<br /> Choose Package from your machine, by clicking the Browse<br />
button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
]]></key> ]]> </key>
<key alias="deletewarning">This will delete the package</key> <key alias="deletewarning">This will delete the package</key>
<key alias="includeAllChildNodes">Include all child nodes</key> <key alias="includeAllChildNodes">Include all child nodes</key>
<key alias="installed">Installed</key> <key alias="installed">Installed</key>
@@ -1373,19 +1373,19 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<area alias="publish"> <area alias="publish">
<key alias="contentPublishedFailedAwaitingRelease"><![CDATA[ <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
%0% could not be published because the item is scheduled for release. %0% could not be published because the item is scheduled for release.
]]></key> ]]> </key>
<key alias="contentPublishedFailedExpired"><![CDATA[ <key alias="contentPublishedFailedExpired"><![CDATA[
%0% could not be published because the item has expired. %0% could not be published because the item has expired.
]]></key> ]]> </key>
<key alias="contentPublishedFailedInvalid"><![CDATA[ <key alias="contentPublishedFailedInvalid"><![CDATA[
%0% could not be published because these properties: %1% did not pass validation rules. %0% could not be published because these properties: %1% did not pass validation rules.
]]></key> ]]> </key>
<key alias="contentPublishedFailedByEvent"><![CDATA[ <key alias="contentPublishedFailedByEvent"><![CDATA[
%0% could not be published, a 3rd party add-in cancelled the action. %0% could not be published, a 3rd party add-in cancelled the action.
]]></key> ]]> </key>
<key alias="contentPublishedFailedByParent"><![CDATA[ <key alias="contentPublishedFailedByParent"><![CDATA[
%0% can not be published, because a parent page is not published. %0% can not be published, because a parent page is not published.
]]></key> ]]> </key>
<key alias="contentPublishedFailedByMissingName"> <key alias="contentPublishedFailedByMissingName">
<![CDATA[%0% can not be published, because its missing a name.]]></key> <![CDATA[%0% can not be published, because its missing a name.]]></key>
<key alias="includeUnpublished">Include unpublished subpages</key> <key alias="includeUnpublished">Include unpublished subpages</key>
@@ -1396,7 +1396,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="publishAll">Publish %0% and all its subpages</key> <key alias="publishAll">Publish %0% and all its subpages</key>
<key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br /> <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below. You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
]]></key> ]]> </key>
</area> </area>
<area alias="colorpicker"> <area alias="colorpicker">
<key alias="noColors">You have not configured any approved colours</key> <key alias="noColors">You have not configured any approved colours</key>
@@ -1480,7 +1480,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="umbracoForum">Visit our.umbraco.com</key> <key alias="umbracoForum">Visit our.umbraco.com</key>
<key alias="umbracoTv">Visit umbraco.tv</key> <key alias="umbracoTv">Visit umbraco.tv</key>
<key alias="umbracoLearningBase">Watch our free tutorial videos</key> <key alias="umbracoLearningBase">Watch our free tutorial videos</key>
<key alias="umbracoLearningBaseDescription">on the Umbraco Learning Base</key> <key alias="umbracoLearningBaseDescription">on the Umbraco Learning Base</key>
</area> </area>
<area alias="settings"> <area alias="settings">
<key alias="defaulttemplate">Default template</key> <key alias="defaulttemplate">Default template</key>
@@ -1520,7 +1520,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key> <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
<key alias="operationCancelledHeader">Cancelled</key> <key alias="operationCancelledHeader">Cancelled</key>
<key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key> <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
<key alias="folderUploadNotAllowed">This file is being uploaded as part of a folder, but creating a new folder is not allowed here</key> <key alias="folderUploadNotAllowed">This file is being uploaded as part of a folder, but creating a new folder is not allowed here</key>
<key alias="folderCreationNotAllowed">Creating a new folder is not allowed here</key> <key alias="folderCreationNotAllowed">Creating a new folder is not allowed here</key>
<key alias="contentPublishedFailedByEvent">Publishing was cancelled by a 3rd party add-in</key> <key alias="contentPublishedFailedByEvent">Publishing was cancelled by a 3rd party add-in</key>
<key alias="contentTypeDublicatePropertyType">Property type already exists</key> <key alias="contentTypeDublicatePropertyType">Property type already exists</key>
@@ -1653,23 +1653,23 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="renderBodyDesc"><![CDATA[ <key alias="renderBodyDesc"><![CDATA[
Renders the contents of a child template, by inserting a Renders the contents of a child template, by inserting a
<code>@RenderBody()</code> placeholder. <code>@RenderBody()</code> placeholder.
]]></key> ]]> </key>
<key alias="defineSection">Define a named section</key> <key alias="defineSection">Define a named section</key>
<key alias="defineSectionDesc"><![CDATA[ <key alias="defineSectionDesc"><![CDATA[
Defines a part of your template as a named section by wrapping it in Defines a part of your template as a named section by wrapping it in
<code>@section { ... }</code>. This can be rendered in a <code>@section { ... }</code>. This can be rendered in a
specific area of the parent of this template, by using <code>@RenderSection</code>. specific area of the parent of this template, by using <code>@RenderSection</code>.
]]></key> ]]> </key>
<key alias="renderSection">Render a named section</key> <key alias="renderSection">Render a named section</key>
<key alias="renderSectionDesc"><![CDATA[ <key alias="renderSectionDesc"><![CDATA[
Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder. Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition. This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
]]></key> ]]> </key>
<key alias="sectionName">Section Name</key> <key alias="sectionName">Section Name</key>
<key alias="sectionMandatory">Section is mandatory</key> <key alias="sectionMandatory">Section is mandatory</key>
<key alias="sectionMandatoryDesc"><![CDATA[ <key alias="sectionMandatoryDesc"><![CDATA[
If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown. If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
]]></key> ]]> </key>
<key alias="queryBuilder">Query builder</key> <key alias="queryBuilder">Query builder</key>
<key alias="itemsReturned">items returned, in</key> <key alias="itemsReturned">items returned, in</key>
<key alias="iWant">I want</key> <key alias="iWant">I want</key>
@@ -1945,7 +1945,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
Have a nice day! Have a nice day!
Cheers from the Umbraco robot Cheers from the Umbraco robot
]]></key> ]]> </key>
<key alias="noTranslators">No translator users found. Please create a translator user before you start sending <key alias="noTranslators">No translator users found. Please create a translator user before you start sending
content to translation content to translation
</key> </key>
@@ -2134,82 +2134,82 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<tr> <tr>
<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;"> <td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]--> <!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
<div> </div> <div></div>
<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]--> <!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
</td> </td>
<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td> <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'> <table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
<tr> <tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'> <td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'> <div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
<br> <br>
<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'> <table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
<tr> <tr>
<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'> <td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
<tr> <tr>
<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> <td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'> <h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
Hi %0%, Hi %0%,
</h1> </h1>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office. You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
</p> </p>
<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'> <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>: Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
<br/> <br/>
<em>%2%</em> <em>%2%</em>
</p> </p>
<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'> <table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
<tbody> <tbody>
<tr> <tr>
<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'> <td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'> <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
<tbody> <tbody>
<tr> <tr>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'> <a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
Click this link to accept the invite Click this link to accept the invite
</a> </a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p> <p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
<table border='0' cellpadding='0' cellspacing='0'> <table border='0' cellpadding='0' cellspacing='0'>
<tr> <tr>
<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'> <td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;"> <font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a> <a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
</font> </font>
</td> </td>
</tr> </tr>
</table> </table>
</p> </p>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br><br><br> <br><br><br>
</div> </div>
</td> </td>
<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td> <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'></td>
</tr> </tr>
</table> </table>
</body> </body>
</html>]]></key> </html>]]></key>
<key alias="defaultInvitationMessage">Resending invitation...</key> <key alias="defaultInvitationMessage">Resending invitation...</key>
<key alias="deleteUser">Delete User</key> <key alias="deleteUser">Delete User</key>
<key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key> <key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
@@ -2228,6 +2228,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="2faDisableText">If you wish to disable this two-factor provider, then you must enter the code shown on your authentication device:</key> <key alias="2faDisableText">If you wish to disable this two-factor provider, then you must enter the code shown on your authentication device:</key>
<key alias="2faProviderIsEnabled">This two-factor provider is enabled</key> <key alias="2faProviderIsEnabled">This two-factor provider is enabled</key>
<key alias="2faProviderIsDisabledMsg">This two-factor provider is now disabled</key> <key alias="2faProviderIsDisabledMsg">This two-factor provider is now disabled</key>
<key alias="2faProviderIsNotDisabledMsg">Something went wrong with trying to disable this two-factor provider</key>
<key alias="2faDisableForUser">Do you want to disable this two-factor provider for this user?</key>
</area> </area>
<area alias="validation"> <area alias="validation">
<key alias="validation">Validation</key> <key alias="validation">Validation</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -2304,6 +2304,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="2faDisableText">If you wish to disable this two-factor provider, then you must enter the code shown on your authentication device:</key> <key alias="2faDisableText">If you wish to disable this two-factor provider, then you must enter the code shown on your authentication device:</key>
<key alias="2faProviderIsEnabled">This two-factor provider is enabled</key> <key alias="2faProviderIsEnabled">This two-factor provider is enabled</key>
<key alias="2faProviderIsDisabledMsg">This two-factor provider is now disabled</key> <key alias="2faProviderIsDisabledMsg">This two-factor provider is now disabled</key>
<key alias="2faProviderIsNotDisabledMsg">Something went wrong with trying to disable this two-factor provider</key>
<key alias="2faDisableForUser">Do you want to disable this two-factor provider for this user?</key>
</area> </area>
<area alias="validation"> <area alias="validation">
<key alias="validation">Validation</key> <key alias="validation">Validation</key>