Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/mumble/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3688,17 +3688,32 @@ void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString re
basereason = tr("Server presented a certificate which failed verification.");
}
QStringList qsl;
bool bSelfSigned = false;
for (const QSslError &e : Global::get().sh->qlErrors) {
qsl << QString::fromLatin1("<li>%1</li>").arg(e.errorString().toHtmlEscaped());
if (e.error() == QSslError::SelfSignedCertificate
|| e.error() == QSslError::SelfSignedCertificateInChain) {
bSelfSigned = true;
}
}
QString selfSignedNote;
if (bSelfSigned) {
selfSignedNote = QString("<p>%1</p>").arg(
tr("This server is using a self-signed certificate. Self-signed certificates "
"are not issued by a trusted authority, which is why this warning appears. "
"If you trust this server, you can safely accept the certificate — "
"Mumble will remember it for future connections."));
}

QMessageBox qmb(QMessageBox::Warning, QLatin1String("Mumble"),
tr("<p>%1</p><ul>%2</ul><p>The specific errors with this certificate are:</p><ol>%3</ol>"
"%4"
"<p>Do you wish to accept this certificate anyway?<br />(It will also be stored so you "
"won't be asked this again.)</p>")
.arg(basereason)
.arg(digests_section)
.arg(qsl.join(QString())),
.arg(qsl.join(QString()))
.arg(selfSignedNote),
QMessageBox::Yes | QMessageBox::No, this);

qmb.setDefaultButton(QMessageBox::No);
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5355,10 +5355,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7162,6 +7158,14 @@ the channel&apos;s context menu.</source>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5352,10 +5352,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7159,6 +7155,14 @@ the channel&apos;s context menu.</source>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5351,10 +5351,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7158,6 +7154,14 @@ the channel&apos;s context menu.</source>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5413,10 +5413,6 @@ El paràmetre només serà per als missatges nous, els que ja s&apos;han mostrat
<source>Server presented a certificate which failed verification.</source>
<translation>El servidor ha presentat un certificat del que la verificació que ha fallat .</translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;Concretament els errors d&apos;aquest certificat són:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Voleu acceptar aquest certificat de totes maneres?&lt;br /&gt;(També s&apos;emmagatzemarà per tal que no se li tornarà a demanar això.)&lt;/p&gt;</translation>
</message>
<message>
<source>Server connection failed.</source>
<translation>Ha fallat la connexió al servidor.</translation>
Expand Down Expand Up @@ -7225,6 +7221,14 @@ al menú contextual del canal.</translation>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5406,10 +5406,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation>Server předložil certifikát, u kterého selhalo ověření.</translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7216,6 +7212,14 @@ kontextové nabídce kanálů.</translation>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5355,10 +5355,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7162,6 +7158,14 @@ the channel&apos;s context menu.</source>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5405,10 +5405,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation>Serveren forelagde et certifikat som mislykkedes verificering.</translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server connection failed.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -7215,6 +7211,14 @@ kanalens genvejsmenu.</translation>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5413,10 +5413,6 @@ Die Einstellung gilt nur für neue Nachrichten, die bereits angezeigten behalten
<source>Server presented a certificate which failed verification.</source>
<translation>Der Server hat ein Zertifikat gesendet, dessen Überprüfung gescheitert ist.</translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;Die Fehler dieses Zertifikats sind:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Wollen Sie dieses Zertifikat trotzdem akzeptieren?&lt;br /&gt;(Es wird auch abgespeichert, weshalb Sie nicht wieder gefragt werden.)&lt;/p&gt;</translation>
</message>
<message>
<source>Server connection failed.</source>
<translation>Serververbindung fehlgeschlagen.</translation>
Expand Down Expand Up @@ -7225,6 +7221,14 @@ des Kanals auswählen.</translation>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
12 changes: 8 additions & 4 deletions src/mumble/mumble_el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5413,10 +5413,6 @@ The setting only applies for new messages, the already shown ones will retain th
<source>Server presented a certificate which failed verification.</source>
<translation>Ο διακομιστής παρουσίασε ένα πιστοποιητικό το οποίο δεν μπόρεσε να επιβεβαιωθεί.</translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;Τα συγκεκριμένα σφάλματα με αυτό το πιστοποιητικό είναι:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Θέλετε να αποδεχτείτε αυτό το πιστοποιητικό ούτως ή άλλως;&lt;br /&gt;(θα αποθηκευτεί, ώστε να μην σας ζητηθεί ξανά.)&lt;/p&gt;</translation>
</message>
<message>
<source>Server connection failed.</source>
<translation>Η σύνδεση διακομιστή απέτυχε.</translation>
Expand Down Expand Up @@ -7225,6 +7221,14 @@ the channel&apos;s context menu.</source>
<source>Added %1 to favorites.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This server is using a self-signed certificate. Self-signed certificates are not issued by a trusted authority, which is why this warning appears. If you trust this server, you can safely accept the certificate — Mumble will remember it for future connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;%4&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Manual</name>
Expand Down
Loading