Skip to content
Permalink
Browse files

Merge PR #3084: Fix #3021: Update cert wizard introductory text

  • Loading branch information...
mkrautz committed May 11, 2017
2 parents 6aba984 + c7d5d5a commit 97c34f4cb9cacdbbf98cfebaf7ac8d990982bfc1
Showing with 1 addition and 5 deletions.
  1. +1 −5 src/mumble/Cert.ui
@@ -30,11 +30,7 @@
<item>
<widget class="QLabel" name="qlIntroText">
<property name="text">
<string>&lt;p&gt;Mumble can use certificates to authenticate with servers. Using certificates avoids passwords, meaning you don't need to disclose any password to the remote site. It also enables very easy user registration.&lt;/p&gt;&lt;p&gt;While Mumble can work without certificates, the majority of servers will expect you to have one.&lt;/p&gt;
&lt;p&gt;
It is &lt;b&gt;strongly&lt;/b&gt; recommended that you &lt;a href=&quot;http://mumble.info/certificate.php&quot;&gt;create a trusted certificate&lt;/a&gt;.
&lt;/p&gt;
</string>
<string>&lt;p&gt;Mumble can use certificates to authenticate with servers. Using certificates avoids passwords, meaning you don't need to disclose any password to the remote site. It also enables very easy user registration and a client side friends list independent of servers.&lt;/p&gt;&lt;p&gt;While Mumble can work without certificates, the majority of servers will expect you to have one.&lt;/p&gt;&lt;p&gt;Creating a new certificate automatically is sufficient for most use cases. But Mumble also supports certificates representing trust in the users ownership of an email address. These certificates are issued by third parties. For more information see our &lt;a href=&quot;http://mumble.info/certificate.php&quot;&gt;user certificate documentation&lt;/a&gt;. &lt;/p&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>

0 comments on commit 97c34f4

Please sign in to comment.
You can’t perform that action at this time.