Merge pull request #954 from MihaelaStoica/CA-208609

CA-208609: Change wording on TLS settings page
This commit is contained in:
Stephen Turner 2016-04-21 10:28:22 +01:00
commit 0ff7604dc1
3 changed files with 8 additions and 8 deletions

View File

@ -154,13 +154,13 @@
<value>7, 31</value>
</data>
<data name="radioButtonTLS.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 17</value>
<value>85, 17</value>
</data>
<data name="radioButtonTLS.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="radioButtonTLS.Text" xml:space="preserve">
<value>&amp;Maximum security: TLS 1.2 only</value>
<value>&amp;TLS 1.2 only</value>
</data>
<data name="&gt;&gt;radioButtonTLS.Name" xml:space="preserve">
<value>radioButtonTLS</value>
@ -181,13 +181,13 @@
<value>7, 54</value>
</data>
<data name="radioButtonSSL.Size" type="System.Drawing.Size, System.Drawing">
<value>292, 17</value>
<value>312, 17</value>
</data>
<data name="radioButtonSSL.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="radioButtonSSL.Text" xml:space="preserve">
<value>&amp;Backwards compatibility: SSL 3.0 and TLS 1.0, 1.1 &amp;&amp; 1.2</value>
<value>&amp;Backwards compatibility mode (TLS 1.2 and earlier protocols)</value>
</data>
<data name="&gt;&gt;radioButtonSSL.Name" xml:space="preserve">
<value>radioButtonSSL</value>
@ -232,7 +232,7 @@
<value>30, 90</value>
</data>
<data name="labelDisruption.Size" type="System.Drawing.Size, System.Drawing">
<value>363, 13</value>
<value>369, 13</value>
</data>
<data name="labelDisruption.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -270,4 +270,4 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
</root>

View File

@ -28852,7 +28852,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to SSL &amp; TLS.
/// Looks up a localized string similar to Backwards compatibility.
/// </summary>
public static string SECURITYEDITPAGE_SUBTEXT_SSL {
get {

View File

@ -10037,7 +10037,7 @@ The master must be upgraded first, so if you skip the master, the rolling pool u
<value>Select the security protocols that can be used for communicating with this server.</value>
</data>
<data name="SECURITYEDITPAGE_SUBTEXT_SSL" xml:space="preserve">
<value>SSL &amp; TLS</value>
<value>Backwards compatibility</value>
</data>
<data name="SECURITYEDITPAGE_SUBTEXT_TLS" xml:space="preserve">
<value>TLS 1.2 only</value>