Merge pr #5714: FEAT(client, ui): separate ipv4 and ipv6 in ServerItem tooltip

The "Addresses" field in the ServerItem tooltip shows both ipv4 and ipv6
addresses. The order of addresses in this field is not determined.
In the wild it is randomized. As discussed in #5696 it is better to implement
a concrete ordering to prevent user confusion. To further improve the
readability of the addresses we split the addresses field in two fields
called "IPv4 address" and "IPv6 address". The ipv4 address is now always
shown above the ipv6 address.

Implements #5696

46 files changed, 380 insertions, 187 deletions

diff --git a/src/HostAddress.cpp b/src/HostAddress.cpp
index 8c6a68f8c..a726be164 100644
--- a/src/HostAddress.cpp
+++ b/src/HostAddress.cpp
@@ -135,22 +135,29 @@ quint32 qHash(const HostAddress &ha) {
 	return (ha.hash[0] ^ ha.hash[1] ^ ha.hash[2] ^ ha.hash[3]);
 }
 
-QString HostAddress::toString() const {
+QString HostAddress::toString(bool bracketEnclosed) const {
 	if (isV6()) {
 		if (isValid()) {
-			QString qs;
+			QString str;
+			const char *squareBracketOpen  = "";
+			const char *squareBracketClose = "";
+			if (bracketEnclosed) {
+				squareBracketOpen  = "[";
+				squareBracketClose = "]";
+			}
 #if QT_VERSION >= 0x050500
-			qs = QString::asprintf("[%x:%x:%x:%x:%x:%x:%x:%x]", ntohs(shorts[0]), ntohs(shorts[1]), ntohs(shorts[2]),
-								   ntohs(shorts[3]), ntohs(shorts[4]), ntohs(shorts[5]), ntohs(shorts[6]),
-								   ntohs(shorts[7]));
+			str = QString::asprintf("%s%x:%x:%x:%x:%x:%x:%x:%x%s", squareBracketOpen, ntohs(shorts[0]),
+									ntohs(shorts[1]), ntohs(shorts[2]), ntohs(shorts[3]), ntohs(shorts[4]),
+									ntohs(shorts[5]), ntohs(shorts[6]), ntohs(shorts[7]), squareBracketClose);
 #else
 			// sprintf() has been deprecated in Qt 5.5 in favor for the static QString::asprintf()
-			qs.sprintf("[%x:%x:%x:%x:%x:%x:%x:%x]", ntohs(shorts[0]), ntohs(shorts[1]), ntohs(shorts[2]),
-					   ntohs(shorts[3]), ntohs(shorts[4]), ntohs(shorts[5]), ntohs(shorts[6]), ntohs(shorts[7]));
+			str.sprintf("%s%x:%x:%x:%x:%x:%x:%x:%x%s", squareBracketOpen, ntohs(shorts[0]), ntohs(shorts[1]),
+						ntohs(shorts[2]), ntohs(shorts[3]), ntohs(shorts[4]), ntohs(shorts[5]), ntohs(shorts[6]),
+						ntohs(shorts[7]), squareBracketClose);
 #endif
-			return qs.replace(QRegExp(QLatin1String("(:0)+")), QLatin1String(":"));
+			return str.replace(QRegExp(QLatin1String("(:0)+")), QLatin1String(":"));
 		} else {
-			return QLatin1String("[::]");
+			return bracketEnclosed ? QLatin1String("[::]") : QLatin1String("::");
 		}
 	} else {
 		return QHostAddress(ntohl(hash[3])).toString();
diff --git a/src/HostAddress.h b/src/HostAddress.h
index 761cf945d..d0b65a608 100644
--- a/src/HostAddress.h
+++ b/src/HostAddress.h
@@ -35,7 +35,7 @@ struct HostAddress {
 
 	bool match(const HostAddress &, int bits) const;
 
-	QString toString() const;
+	QString toString(bool bracketEnclosed = true) const;
 
 	std::string toStdString() const;
 	QHostAddress toAddress() const;
diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp
index d3655d826..f53e6ea85 100644
--- a/src/mumble/ConnectDialog.cpp
+++ b/src/mumble/ConnectDialog.cpp
@@ -473,11 +473,23 @@ QVariant ServerItem::data(int column, int role) const {
 					return uiUsers ? QString::fromLatin1("%1/%2 ").arg(uiUsers).arg(uiMaxUsers) : QVariant();
 			}
 		} else if (role == Qt::ToolTipRole) {
-			QStringList qsl;
+			QStringList ipv4List;
+			QStringList ipv6List;
 			foreach (const ServerAddress &addr, qlAddresses) {
-				const QString qsAddress = addr.host.toString() + QLatin1String(":")
-										  + QString::number(static_cast< unsigned long >(addr.port));
-				qsl << qsAddress.toHtmlEscaped();
+				const QString address = addr.host.toString(false).toHtmlEscaped();
+				if (addr.host.isV6()) {
+					ipv6List << address;
+				} else {
+					ipv4List << address;
+				}
+			}
+			QString ipv4 = "-";
+			QString ipv6 = "-";
+			if (!ipv4List.isEmpty()) {
+				ipv4 = ipv4List.join(QLatin1String(", "));
+			}
+			if (!ipv6List.isEmpty()) {
+				ipv6 = ipv6List.join(QLatin1String(", "));
 			}
 
 			double ploss = 100.0;
@@ -500,7 +512,9 @@ QVariant ServerItem::data(int column, int role) const {
 					  .arg(ConnectDialog::tr("Port"))
 					  .arg(usPort)
 				  + QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>")
-						.arg(ConnectDialog::tr("Addresses"), qsl.join(QLatin1String(", ")));
+						.arg(ConnectDialog::tr("IPv4 address"), ipv4)
+				  + QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>")
+						.arg(ConnectDialog::tr("IPv6 address"), ipv6);
 
 			if (!qsUrl.isEmpty())
 				qs += QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>")
diff --git a/src/mumble/mumble_ar.ts b/src/mumble/mumble_ar.ts
index 834be2067..69825e2d7 100644
--- a/src/mumble/mumble_ar.ts
+++ b/src/mumble/mumble_ar.ts
@@ -3016,10 +3016,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3051,6 +3047,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_bg.ts b/src/mumble/mumble_bg.ts
index 6212bf3c9..b0140f1dc 100644
--- a/src/mumble/mumble_bg.ts
+++ b/src/mumble/mumble_bg.ts
@@ -3013,10 +3013,6 @@ Are you sure you wish to replace your certificate?
         <translation>Порт</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Адреси</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Сайт</translation>
     </message>
@@ -3048,6 +3044,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Версия</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_br.ts b/src/mumble/mumble_br.ts
index 44408d6be..5d29ef590 100644
--- a/src/mumble/mumble_br.ts
+++ b/src/mumble/mumble_br.ts
@@ -3012,10 +3012,6 @@ Are you sure you wish to replace your certificate?
         <translation>Porzh</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3047,6 +3043,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Stumm</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_ca.ts b/src/mumble/mumble_ca.ts
index ab28d56b4..b037977ed 100644
--- a/src/mumble/mumble_ca.ts
+++ b/src/mumble/mumble_ca.ts
@@ -3038,10 +3038,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3073,6 +3069,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts
index a0814b6b3..b7bf74c09 100644
--- a/src/mumble/mumble_cs.ts
+++ b/src/mumble/mumble_cs.ts
@@ -3054,10 +3054,6 @@ Jste si jisti, že chcete certifikát nahradit?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresy</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Internetová stránka</translation>
     </message>
@@ -3089,6 +3085,14 @@ Jste si jisti, že chcete certifikát nahradit?
         <source>Version</source>
         <translation>Verze</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_cy.ts b/src/mumble/mumble_cy.ts
index a6d901cd5..02c97b14d 100644
--- a/src/mumble/mumble_cy.ts
+++ b/src/mumble/mumble_cy.ts
@@ -3016,10 +3016,6 @@ Are you sure you wish to replace your certificate?
         <translation>Porth</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Cyfeiriad</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Gwefan</translation>
     </message>
@@ -3051,6 +3047,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Fersiwn</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts
index e24b326e3..77b152cb6 100644
--- a/src/mumble/mumble_da.ts
+++ b/src/mumble/mumble_da.ts
@@ -3052,10 +3052,6 @@ Er du sikker på du vil erstatte dit certifikat?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresser</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Websted</translation>
     </message>
@@ -3087,6 +3083,14 @@ Er du sikker på du vil erstatte dit certifikat?
         <source>Version</source>
         <translation>Version</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts
index afc466f4c..7886a9487 100644
--- a/src/mumble/mumble_de.ts
+++ b/src/mumble/mumble_de.ts
@@ -3053,10 +3053,6 @@ Sind Sie sicher, dass Sie Ihr Zertifikat ersetzen möchten?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adressen</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Webseite</translation>
     </message>
@@ -3088,6 +3084,14 @@ Sind Sie sicher, dass Sie Ihr Zertifikat ersetzen möchten?
         <source>Version</source>
         <translation>Version</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_el.ts b/src/mumble/mumble_el.ts
index fa046ab45..26324b04c 100644
--- a/src/mumble/mumble_el.ts
+++ b/src/mumble/mumble_el.ts
@@ -3053,10 +3053,6 @@ Are you sure you wish to replace your certificate?
         <translation>Θύρα</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Διευθύνσεις</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Δικτυακός τόπος</translation>
     </message>
@@ -3088,6 +3084,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Έκδοση</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts
index fc0e0e5a1..d3b015cbc 100644
--- a/src/mumble/mumble_en.ts
+++ b/src/mumble/mumble_en.ts
@@ -3011,10 +3011,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3046,6 +3042,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_en_GB.ts b/src/mumble/mumble_en_GB.ts
index 65b405dee..9b59d7b2b 100644
--- a/src/mumble/mumble_en_GB.ts
+++ b/src/mumble/mumble_en_GB.ts
@@ -3045,10 +3045,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3080,6 +3076,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_eo.ts b/src/mumble/mumble_eo.ts
index e2173eba6..47b58d682 100644
--- a/src/mumble/mumble_eo.ts
+++ b/src/mumble/mumble_eo.ts
@@ -3020,10 +3020,6 @@ Are you sure you wish to replace your certificate?
         <translation>Pordo</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresoj</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Retejo</translation>
     </message>
@@ -3055,6 +3051,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Versio</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts
index 0fbe8ecbc..e544c284d 100644
--- a/src/mumble/mumble_es.ts
+++ b/src/mumble/mumble_es.ts
@@ -3053,10 +3053,6 @@ Are you sure you wish to replace your certificate?
         <translation>Puerto</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Direcciones</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Página web</translation>
     </message>
@@ -3088,6 +3084,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Versión</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_et.ts b/src/mumble/mumble_et.ts
index 96a70b8e4..0c45bc40a 100644
--- a/src/mumble/mumble_et.ts
+++ b/src/mumble/mumble_et.ts
@@ -3013,10 +3013,6 @@ Are you sure you wish to replace your certificate?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Aadressid</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Veebisait</translation>
     </message>
@@ -3048,6 +3044,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_eu.ts b/src/mumble/mumble_eu.ts
index 57d412d57..5ade70683 100644
--- a/src/mumble/mumble_eu.ts
+++ b/src/mumble/mumble_eu.ts
@@ -3023,10 +3023,6 @@ adierazten du.</translation>
         <translation>Portua</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Helbidea</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Web orria</translation>
     </message>
@@ -3058,6 +3054,14 @@ adierazten du.</translation>
         <source>Version</source>
         <translation>Bertsioa</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_fa_IR.ts b/src/mumble/mumble_fa_IR.ts
index 932621ab7..44e56fe08 100644
--- a/src/mumble/mumble_fa_IR.ts
+++ b/src/mumble/mumble_fa_IR.ts
@@ -3011,10 +3011,6 @@ Are you sure you wish to replace your certificate?
         <translation>پورت</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>ادرس ها</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>تارنما</translation>
     </message>
@@ -3046,6 +3042,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_fi.ts b/src/mumble/mumble_fi.ts
index 99be7893f..a5d30249d 100644
--- a/src/mumble/mumble_fi.ts
+++ b/src/mumble/mumble_fi.ts
@@ -3053,10 +3053,6 @@ Haluatko varmasti korvata varmenteen?
         <translation>Portti</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Osoitteet</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Nettisivu</translation>
     </message>
@@ -3088,6 +3084,14 @@ Haluatko varmasti korvata varmenteen?
         <source>Version</source>
         <translation>Versio</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts
index 25aa5d2aa..ae76c29cd 100644
--- a/src/mumble/mumble_fr.ts
+++ b/src/mumble/mumble_fr.ts
@@ -3053,10 +3053,6 @@ Are you sure you wish to replace your certificate?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresses</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Site internet</translation>
     </message>
@@ -3088,6 +3084,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Version</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_gl.ts b/src/mumble/mumble_gl.ts
index 14fdf5c17..5805bd8bc 100644
--- a/src/mumble/mumble_gl.ts
+++ b/src/mumble/mumble_gl.ts
@@ -3014,10 +3014,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3049,6 +3045,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_he.ts b/src/mumble/mumble_he.ts
index f40660b2c..8921de0e3 100644
--- a/src/mumble/mumble_he.ts
+++ b/src/mumble/mumble_he.ts
@@ -3050,10 +3050,6 @@ Are you sure you wish to replace your certificate?
         <translation>פורט</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>כתובות</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>אתר רשת</translation>
     </message>
@@ -3085,6 +3081,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>גירסא</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_hu.ts b/src/mumble/mumble_hu.ts
index cb090bf1f..6f93fc968 100644
--- a/src/mumble/mumble_hu.ts
+++ b/src/mumble/mumble_hu.ts
@@ -3042,10 +3042,6 @@ Biztos abban, hogy le akarja cserélni a tanúsítványát?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>IP-cím</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Honlap</translation>
     </message>
@@ -3077,6 +3073,14 @@ Biztos abban, hogy le akarja cserélni a tanúsítványát?
         <source>Version</source>
         <translation>Kiszolgáló verziója</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts
index 3f8988ee6..e5ec6f497 100644
--- a/src/mumble/mumble_it.ts
+++ b/src/mumble/mumble_it.ts
@@ -3053,10 +3053,6 @@ Sei sicuro di voler sostituire il tuo certificato?
         <translation>Porta</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Indirizzi</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Sito web</translation>
     </message>
@@ -3088,6 +3084,14 @@ Sei sicuro di voler sostituire il tuo certificato?
         <source>Version</source>
         <translation>Versione</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts
index 0da87bd48..9562f40d1 100644
--- a/src/mumble/mumble_ja.ts
+++ b/src/mumble/mumble_ja.ts
@@ -3048,10 +3048,6 @@ Are you sure you wish to replace your certificate?
         <translation>ポート</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>アドレス</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>WEBサイト</translation>
     </message>
@@ -3083,6 +3079,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>バージョン</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_ko.ts b/src/mumble/mumble_ko.ts
index fdde0735b..1ef725603 100644
--- a/src/mumble/mumble_ko.ts
+++ b/src/mumble/mumble_ko.ts
@@ -3052,10 +3052,6 @@ Are you sure you wish to replace your certificate?
         <translation>포트</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>주소</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>웹사이트</translation>
     </message>
@@ -3087,6 +3083,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>버전</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_lt.ts b/src/mumble/mumble_lt.ts
index 78de1ba2e..730ef4c58 100644
--- a/src/mumble/mumble_lt.ts
+++ b/src/mumble/mumble_lt.ts
@@ -3043,10 +3043,6 @@ Ar tikrai norite pakeisti savo liudijimą?
         <translation>Prievadas</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresai</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Tinklalapis</translation>
     </message>
@@ -3078,6 +3074,14 @@ Ar tikrai norite pakeisti savo liudijimą?
         <source>Version</source>
         <translation>Versija</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_nl.ts b/src/mumble/mumble_nl.ts
index f3ac26ab6..aa45b48b8 100644
--- a/src/mumble/mumble_nl.ts
+++ b/src/mumble/mumble_nl.ts
@@ -3053,10 +3053,6 @@ Weet je zeker dat je je certificaat wil vervangen?
         <translation>Poort</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adressen</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Website</translation>
     </message>
@@ -3088,6 +3084,14 @@ Weet je zeker dat je je certificaat wil vervangen?
         <source>Version</source>
         <translation>Versie</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_no.ts b/src/mumble/mumble_no.ts
index 548bb9f22..9c45395fa 100644
--- a/src/mumble/mumble_no.ts
+++ b/src/mumble/mumble_no.ts
@@ -3067,10 +3067,6 @@ Er du sikker på at du vil erstatte ditt sertifikat?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresser</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Nettside</translation>
     </message>
@@ -3102,6 +3098,14 @@ Er du sikker på at du vil erstatte ditt sertifikat?
         <source>Version</source>
         <translation>Versjon</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_oc.ts b/src/mumble/mumble_oc.ts
index 806bb9510..b43236440 100644
--- a/src/mumble/mumble_oc.ts
+++ b/src/mumble/mumble_oc.ts
@@ -3013,10 +3013,6 @@ Are you sure you wish to replace your certificate?
         <translation>Pòrt</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adreças</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Site web</translation>
     </message>
@@ -3048,6 +3044,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Version</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts
index 651cf11f5..acaab0e0b 100644
--- a/src/mumble/mumble_pl.ts
+++ b/src/mumble/mumble_pl.ts
@@ -3054,10 +3054,6 @@ Czy na pewno chcesz zastąpić swój bieżący certyfikat?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresy</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Strona WWW</translation>
     </message>
@@ -3089,6 +3085,14 @@ Czy na pewno chcesz zastąpić swój bieżący certyfikat?
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_pt_BR.ts b/src/mumble/mumble_pt_BR.ts
index cb3c16a20..fec63fcf9 100644
--- a/src/mumble/mumble_pt_BR.ts
+++ b/src/mumble/mumble_pt_BR.ts
@@ -3053,10 +3053,6 @@ Você tem certeza de que quer substituir o seu certificado?
         <translation>Porta</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Endereços</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Página web</translation>
     </message>
@@ -3088,6 +3084,14 @@ Você tem certeza de que quer substituir o seu certificado?
         <source>Version</source>
         <translation>Versão</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_pt_PT.ts b/src/mumble/mumble_pt_PT.ts
index 015e80a0a..7db642959 100644
--- a/src/mumble/mumble_pt_PT.ts
+++ b/src/mumble/mumble_pt_PT.ts
@@ -3053,10 +3053,6 @@ Tem certeza de que quer substituir o seu certificado?
         <translation>Porta</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Endereços</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Página web</translation>
     </message>
@@ -3088,6 +3084,14 @@ Tem certeza de que quer substituir o seu certificado?
         <source>Version</source>
         <translation>Versão</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_ro.ts b/src/mumble/mumble_ro.ts
index 0cc9a8ad5..d504239cb 100644
--- a/src/mumble/mumble_ro.ts
+++ b/src/mumble/mumble_ro.ts
@@ -3017,10 +3017,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3052,6 +3048,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts
index 2f662391f..cec2c460f 100644
--- a/src/mumble/mumble_ru.ts
+++ b/src/mumble/mumble_ru.ts
@@ -3054,10 +3054,6 @@ Are you sure you wish to replace your certificate?
         <translation>Порт</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>IP-адрес</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Веб-сайт</translation>
     </message>
@@ -3089,6 +3085,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Версия</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_si.ts b/src/mumble/mumble_si.ts
index b36e1066d..195dc02d7 100644
--- a/src/mumble/mumble_si.ts
+++ b/src/mumble/mumble_si.ts
@@ -2937,10 +2937,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3028,6 +3024,14 @@ Are you sure you wish to replace your certificate?
         <source>Failed to fetch server list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_sq.ts b/src/mumble/mumble_sq.ts
index 451d2b905..4d0404b5a 100644
--- a/src/mumble/mumble_sq.ts
+++ b/src/mumble/mumble_sq.ts
@@ -2939,10 +2939,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3030,6 +3026,14 @@ Are you sure you wish to replace your certificate?
         <source>Failed to fetch server list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_sv.ts b/src/mumble/mumble_sv.ts
index effc5e1c3..35bb785dc 100644
--- a/src/mumble/mumble_sv.ts
+++ b/src/mumble/mumble_sv.ts
@@ -3053,10 +3053,6 @@ Are you sure you wish to replace your certificate?
         <translation>Port</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adress</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Hemsida</translation>
     </message>
@@ -3088,6 +3084,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>Version</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_te.ts b/src/mumble/mumble_te.ts
index 74614a9f5..f1df73208 100644
--- a/src/mumble/mumble_te.ts
+++ b/src/mumble/mumble_te.ts
@@ -3024,10 +3024,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3059,6 +3055,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_th.ts b/src/mumble/mumble_th.ts
index 7b819b0c3..fbeed50b2 100644
--- a/src/mumble/mumble_th.ts
+++ b/src/mumble/mumble_th.ts
@@ -3011,10 +3011,6 @@ Are you sure you wish to replace your certificate?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3046,6 +3042,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_tr.ts b/src/mumble/mumble_tr.ts
index adfaaaa02..d8ee09426 100644
--- a/src/mumble/mumble_tr.ts
+++ b/src/mumble/mumble_tr.ts
@@ -3052,10 +3052,6 @@ Sertifikanızı değiştirmek istediğinize emin misiniz?
         <translation>Bağlantı noktası</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>Adresler</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Ağ sitesi</translation>
     </message>
@@ -3087,6 +3083,14 @@ Sertifikanızı değiştirmek istediğinize emin misiniz?
         <source>Version</source>
         <translation>Sürüm</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_uk.ts b/src/mumble/mumble_uk.ts
index 2e351e4fc..1dd78f483 100644
--- a/src/mumble/mumble_uk.ts
+++ b/src/mumble/mumble_uk.ts
@@ -3013,10 +3013,6 @@ Are you sure you wish to replace your certificate?
         <translation>Порт</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>Веб-сайт</translation>
     </message>
@@ -3048,6 +3044,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts
index ac943e600..bb54afc78 100644
--- a/src/mumble/mumble_zh_CN.ts
+++ b/src/mumble/mumble_zh_CN.ts
@@ -3052,10 +3052,6 @@ Are you sure you wish to replace your certificate?
         <translation>端口</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>地址</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>网页</translation>
     </message>
@@ -3087,6 +3083,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>版本</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_zh_HK.ts b/src/mumble/mumble_zh_HK.ts
index f8dc58d80..aeb51a2bc 100644
--- a/src/mumble/mumble_zh_HK.ts
+++ b/src/mumble/mumble_zh_HK.ts
@@ -3011,10 +3011,6 @@ Are you sure you wish to replace your certificate?
         <translation>連接埠</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3046,6 +3042,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>版本</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>
diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts
index 56d7dd015..5a2e8247f 100644
--- a/src/mumble/mumble_zh_TW.ts
+++ b/src/mumble/mumble_zh_TW.ts
@@ -3029,10 +3029,6 @@ Are you sure you wish to replace your certificate?
         <translation>埠號</translation>
     </message>
     <message>
-        <source>Addresses</source>
-        <translation>網址</translation>
-    </message>
-    <message>
         <source>Website</source>
         <translation>網站</translation>
     </message>
@@ -3064,6 +3060,14 @@ Are you sure you wish to replace your certificate?
         <source>Version</source>
         <translation>版本</translation>
     </message>
+    <message>
+        <source>IPv4 address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IPv6 address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectDialogEdit</name>