Merge pull request #2455 from nextcloud/stable9-1872

[stable9] Fix misleading SSL/TLS SMTP email configuration

Author: MorrisJobke

settings/templates/admin.php

@@ -34,8 +34,8 @@
 
 $mail_smtpsecure = [
 	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL'),
-	'tls'	=> $l->t('TLS'),
+	'ssl'	=> $l->t('SSL/TLS'),
+	'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [