diff --git a/app/src/main/res/values-fr-rCA/strings_error.xml b/app/src/main/res/values-fr-rCA/strings_error.xml
index 6bbc41d2fd831bd0a1b6f83a3fc5a4ccb5bd74ff..8b838a28125ac54593f08c7d7e744a0e73c5a78d 100644
--- a/app/src/main/res/values-fr-rCA/strings_error.xml
+++ b/app/src/main/res/values-fr-rCA/strings_error.xml
@@ -26,7 +26,8 @@
   <string name="label_error_certificate_no_hostname">Aucuns hostnames disponibles</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>Le certificat avec l\'emprunte <br/>
-    <code>%1$s</code>est seulement valide de %2$sà %3$s</p>
+    <code>%1$s</code><br/>
+    est seulement valide de %2$sà %3$s</p>
 ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>Le certificat avec l\'emprunte<br/>
diff --git a/app/src/main/res/values-fr-rCA/strings_setup.xml b/app/src/main/res/values-fr-rCA/strings_setup.xml
index 085747cf3f4b05fe547f4bf034c3a0c6b25f9ada..1d8900d19fdde5a66fe1336c6c574ab320c549ba 100644
--- a/app/src/main/res/values-fr-rCA/strings_setup.xml
+++ b/app/src/main/res/values-fr-rCA/strings_setup.xml
@@ -31,7 +31,6 @@
 
   <string name="label_connection_host">Hôte</string>
   <string name="label_connection_port">Port</string>
-
   <string name="hint_invalid_host">Pas un nom d\'hôte valide</string>
   <string name="hint_invalid_port">Pas un port valide</string>
 
@@ -52,8 +51,6 @@
 
   <string name="hint_invalid_name">Le nom ne peut pas être vide</string>
 
-  <!-- Core Setup -->
-
   <!-- Core Authenticator Select -->
   <string name="slide_core_authenticator_select_title">Sélectionnez un protocole d\'authentication</string>
   <string name="slide_core_authenticator_select_description">Veuillez sélectionner un protocole d\'authentication pour le Core Quassel, utiliser pour authentiquer les utilisateurs.</string>
@@ -83,4 +80,5 @@
   <string name="slide_user_channels_description">Sélectionnez les chaînes que vous voulez joindre.</string>
 
   <string name="label_channels">Chaînes</string>
+
 </resources>
diff --git a/app/src/main/res/values-it/strings_error.xml b/app/src/main/res/values-it/strings_error.xml
index eb4d5253eb32d64c24f737523daa4867c08732bf..a09e431229046ffe801a8080e271eaeff43c4170 100644
--- a/app/src/main/res/values-it/strings_error.xml
+++ b/app/src/main/res/values-it/strings_error.xml
@@ -28,7 +28,8 @@
   <string name="label_error_certificate_no_hostname">Nessun nome host disponibile</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>Il certificato con l’impronta<br/>
-    <code>%1$s</code> è valido esclusivamente da %2$s a %3$s</p>
+    <code>%1$s</code><br/>
+    è valido esclusivamente dal %2$s al %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>Il certificato con l’impronta<br/>
diff --git a/app/src/main/res/values-it/strings_info.xml b/app/src/main/res/values-it/strings_info.xml
index 80fc2b25acea5e6fed274fa5b76bac396937681b..eeecb2f8adc7da5bba2c40b9ed6041635f80e736 100644
--- a/app/src/main/res/values-it/strings_info.xml
+++ b/app/src/main/res/values-it/strings_info.xml
@@ -33,6 +33,8 @@
   <string name="label_core_online_since">In linea da %1$s</string>
   <string name="label_core_connected_since">Connesso da %1$s</string>
   <string name="label_core_connection_verified_by">Connessione verificata da %1$s</string>
+  <string name="label_core_connection_protocol">La connessione utilizza %1$s</string>
+  <string name="label_core_connection_ciphersuite">La connessione è crittografata ed autenticata con %1$s ed utilizza %2$s come meccanismo di scambio delle chiavi</string>
   <string name="label_core_connection_verified_by_unknown">Sconosciuto</string>
   <string name="label_core_connection_insecure">Connessione insicura</string>
 
diff --git a/app/src/main/res/values-lt/strings_error.xml b/app/src/main/res/values-lt/strings_error.xml
index 8b7d04502dd311a4212f92bfb00eff0c741b6c85..5a3457f0d06f95174f67165b377035c69f7a0aed 100644
--- a/app/src/main/res/values-lt/strings_error.xml
+++ b/app/src/main/res/values-lt/strings_error.xml
@@ -26,7 +26,8 @@
   <string name="label_error_certificate_no_hostname">Nėra tinkamo hostname</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>Certifikatas su atspaudu<br/>
-    <code>%1$s</code> galioja tik nuo %2$s iki %3$s</p>
+    <code>%1$s</code><br/>
+    galioja tik nuo %2$s iki %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>Certifikatas su atspaudu<br/>
diff --git a/app/src/main/res/values-lt/strings_setup.xml b/app/src/main/res/values-lt/strings_setup.xml
index 59b7fc86707b90c2451ef43571344812ef6626e4..1f5ebb60db88ffca162e5d8757f935d5a1b97df2 100644
--- a/app/src/main/res/values-lt/strings_setup.xml
+++ b/app/src/main/res/values-lt/strings_setup.xml
@@ -31,7 +31,6 @@
 
   <string name="label_connection_host">Host</string>
   <string name="label_connection_port">Port</string>
-
   <string name="hint_invalid_host">Netinkamas Hostname</string>
   <string name="hint_invalid_port">Netinkamas Port</string>
 
@@ -52,8 +51,6 @@
 
   <string name="hint_invalid_name">Pavadinimas negali būti tuščias</string>
 
-  <!-- Core Setup -->
-
   <!-- Core Authenticator Select -->
   <string name="slide_core_authenticator_select_title">Pasirinkite autentifikacijos Backend</string>
   <string name="slide_core_authenticator_select_description">Pasirinkite autentifikacijos backend Quassel Branduoliui naudoti autentifikuojant vartotojus.</string>
@@ -83,4 +80,5 @@
   <string name="slide_user_channels_description">Pasirinkite į kuriuos kanalus jungtis.</string>
 
   <string name="label_channels">Kanalai</string>
+
 </resources>
diff --git a/app/src/main/res/values-pt/strings_error.xml b/app/src/main/res/values-pt/strings_error.xml
index aee8c27391017cdc867ce0b39d45345578e6048d..8a06705e48ae17d0fc3af8e17f7c3c241217dbfc 100644
--- a/app/src/main/res/values-pt/strings_error.xml
+++ b/app/src/main/res/values-pt/strings_error.xml
@@ -28,7 +28,8 @@
   <string name="label_error_certificate_no_hostname">Nenhum anfitrião disponível</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>O certificado com impressão digital<br/>
-    <code>%1$s</code> só é válido a partir de %2$s até %3$s</p>
+    <code>%1$s</code><br/>
+    só é válido a partir de %2$s até %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>O certificado com impressão digital<br/>
diff --git a/app/src/main/res/values-sr/strings_error.xml b/app/src/main/res/values-sr/strings_error.xml
index 5ac17749bb13a938d62189ce2e6677a710220e99..cf55e5c7206516ce1486c28dc13edc1120e4db6c 100644
--- a/app/src/main/res/values-sr/strings_error.xml
+++ b/app/src/main/res/values-sr/strings_error.xml
@@ -26,7 +26,8 @@
   <string name="label_error_certificate_no_hostname">Hostname nije dostupno</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>Sertifikat sa otiskom<br/>
-    <code>%1$s</code> je važeći od %2$s do %3$s</p>
+    <code>%1$s</code><br/>
+    je važeći od %2$s do %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>Sertifikat sa otiskom<br/>
diff --git a/app/src/main/res/values-sr/strings_setup.xml b/app/src/main/res/values-sr/strings_setup.xml
index d47d00352c24cda7d7bd0124ae8c0ceb61bbcdaf..3a2d906c8758875c51dd5eccce1659c1f1a23f09 100644
--- a/app/src/main/res/values-sr/strings_setup.xml
+++ b/app/src/main/res/values-sr/strings_setup.xml
@@ -31,7 +31,6 @@
 
   <string name="label_connection_host">Host</string>
   <string name="label_connection_port">Port</string>
-
   <string name="hint_invalid_host">Neispravan hostname</string>
   <string name="hint_invalid_port">Port nije validan</string>
 
@@ -52,8 +51,6 @@
 
   <string name="hint_invalid_name">Ime ne može biti prazno</string>
 
-  <!-- Core Setup -->
-
   <!-- Core Authenticator Select -->
   <string name="slide_core_authenticator_select_title">Odaberi backend za proveru identiteta</string>
   <string name="slide_core_authenticator_select_description">Molimo odaberite backend za proveru identiteta koji će Quassel Core koristiti za identifikovanje korisnika.</string>
@@ -83,4 +80,5 @@
   <string name="slide_user_channels_description">Odaberite kojim kanalima želite da se pridružite.</string>
 
   <string name="label_channels">Kanali</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings_error.xml b/app/src/main/res/values/strings_error.xml
index 66ad90d7b3291934fe88d04a11995207c3f617ae..e392a9a70b39ccaddece52ef33a780fd22a4c6e0 100644
--- a/app/src/main/res/values/strings_error.xml
+++ b/app/src/main/res/values/strings_error.xml
@@ -28,7 +28,8 @@
   <string name="label_error_certificate_no_hostname">No hostname available</string>
   <string name="label_error_certificate_invalid"><![CDATA[
     <p>The certificate with fingerprint<br/>
-    <code>%1$s</code> is only valid from %2$s to %3$s</p>
+    <code>%1$s</code><br/>
+    is only valid from %2$s to %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
     <p>The certificate with fingerprint<br/>