diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b5b1e3d9fd23c891f2ebafb31de133e784ec666..3df15f24d09f5d15c37b9a33600f3fe31a1c814e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,8 +19,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
   <plurals name="label_user_count">
-    <item quantity="one">%1$d Benutzer</item>
-    <item quantity="other">%1$d Benutzer</item>
+    <item quantity="one">%1$d Nutzer</item>
+    <item quantity="other">%1$d Nutzer</item>
   </plurals>
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Ein Android-Client für das dezentralen Quassel IRC Client.</string>
@@ -60,13 +60,13 @@
   <string name="label_disconnect">Verbindung trennen</string>
   <string name="label_edit_core">Account bearbeiten</string>
   <string name="label_edit_nick">Spitznamen bearbeiten</string>
-  <string name="label_edit_topic">Thema ändern</string>
-  <string name="label_edit_topic_long">Open dialog to change the channel topic</string>
+  <string name="label_edit_topic">Topic ändern</string>
+  <string name="label_edit_topic_long">Dialog öffnen um Topic zu ändern</string>
   <string name="label_filter_messages">Nachrichten filtern</string>
   <string name="label_finish">Fertig</string>
-  <string name="label_generate_crash_report">Crash Report erzeugen</string>
+  <string name="label_generate_crash_report">Absturzmeldung erzeugen</string>
   <string name="label_ignore">Ignorieren</string>
-  <string name="label_ignore_long">Add/remove user to/from ignore list</string>
+  <string name="label_ignore_long">Ignorierregel für Nutzer erstellen/löschen</string>
   <string name="label_info">Info</string>
   <string name="label_info_certificate">Zertifikat</string>
   <string name="label_info_channel">Kanalinformationen</string>
@@ -149,7 +149,7 @@
   <string name="label_unknown_sender">&lt;Unbekannt&gt;</string>
   <string name="label_update_user_password">Benutzernamen/Passwort ändern</string>
   <string name="label_use_default">Standardwerte benutzen</string>
-  <string name="label_user_count">Anzahl Nutzer</string>
+  <string name="label_user_count">Benutzeranzahl</string>
   <string name="label_website">Webseite</string>
   <string name="label_whitelist">Ignorieren</string>
   <string name="label_whitelist_certificates">Zertifikate</string>
@@ -191,14 +191,14 @@
 
   <string name="deceptive_network">Irreführendes IRC-Netzwerk</string>
   <string name="deceptive_network_freenode"><![CDATA[
-    <p>
-      Das Team dieses Netzwerkes hat die Kontrolle über die offiziellen Kanäle mehrerer Projekte gegen die Wünsche der Channel-Operatoren übernommen.
-      Ein Großteil dieser Projekte ist auf andere IRC-Netzwerke wie <a href="https://libera.chat/">libera.chat</a> und <a href="https://www.oftc.net/">OFTC</a> umgezogen.
-    </p>
-    <p>
-      Bitte verifiziere vor dem Betreten der Channels und dem Chatten, ob die Channels umgezogen sind oder ob sie von neue Moderatoren übernommen wurden.
-    </p>
-  ]]></string>
+<p>
+Das Team dieses Netzwerkes hat die Kontrolle über die offiziellen Kanäle mehrerer Projekte gegen die Wünsche der Channel-Operatoren übernommen.
+Ein Großteil dieser Projekte ist auf andere IRC-Netzwerke wie <a href="https://libera.chat/">libera.chat</a> und <a href="https://www.oftc.net/">OFTC</a> umgezogen.
+</p>
+<p>
+Bitte verifiziere vor dem Betreten der Channels und dem Chatten, ob die Channels umgezogen sind oder ob sie von neue Moderatoren übernommen wurden.
+</p>
+]]></string>
 
   <string name="label_missing_features">Fehlende Features</string>
   <string name="info_missing_features" tools:ignore="StringFormatCount">Deinem Core fehlen bestimmte Features die benötigt werden damit Quasseldroid korrekt funktionieren kann. Du solltest deinen Quassel Core auf Version %1$s oder neuer &lt;a href="https://quassel-irc.org&gt;updaten&lt;/a&gt;.</string>
diff --git a/app/src/main/res/values-de/strings_info.xml b/app/src/main/res/values-de/strings_info.xml
index 090b794424e82d6c89d4f3d69b394f4dbf306fdc..6483be3a0461aed60a2bd2f6b38a5634a17a86da 100644
--- a/app/src/main/res/values-de/strings_info.xml
+++ b/app/src/main/res/values-de/strings_info.xml
@@ -36,7 +36,6 @@
   <string name="label_core_connection_verified_by">Verbindung verifiziert von %1$s</string>
   <string name="label_core_connection_protocol">Die Verbindung verwendet %1$s</string>
   <string name="label_core_connection_ciphersuite">Die Verbindung ist mit %1$s verschlüsselt und authentifiziert und verwendet %2$s als Mechanismus für den Schlüsselaustausch</string>
-  <string name="label_core_connection_ciphersuite_13">Die Verbindung ist mit %1$s verschlüsselt und authentifiziert</string>
   <string name="label_core_connection_verified_by_unknown">Unbekannt</string>
   <string name="label_core_connection_insecure">Unsichere Verbindung</string>
 
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index c7d08544fe67e2d5155d1d8a6ebacf1c2cc39736..9ac49a34efc30ec236c7c03196992856d39b1174 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -35,10 +35,15 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Hell)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dunkel)</string>
   <string name="preference_theme_entry_dracula">Dracula</string>
+
   <string name="preference_input_enter_title">Eingabetaste auf Tastatur</string>
+
+  <string name="preference_deceptive_networks_title">Vor irreführenden Netzwerken warnen</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji-Auswahl</string>
   <string name="preference_input_enter_entry_send">Senden</string>
   <string name="preference_input_enter_entry_newline">Neue Zeile</string>
+
   <string name="preference_show_lag_title">Latenz anzeigen</string>
   <string name="preference_show_lag_summary">Zeigt die Gerät-Core-Latenz in der Statusleiste</string>
 
@@ -48,23 +53,18 @@
   <string name="preference_language_title">Sprache</string>
   <string name="preference_language_entry_auto">System-Standardsprache</string>
   <string name="preference_redirection_title">Nachrichtenumleitung</string>
-
   <string name="preference_redirection_user_notices_title">Benutzernotizen umleiten</string>
   <string name="preference_redirection_user_notices_summary">Zeigt Benutzernotizen im momentan geöffneten Chat an</string>
-
   <string name="preference_redirection_server_notices_title">Servernotizen umleiten</string>
   <string name="preference_redirection_server_notices_summary">Zeigt Servernotizen im momentan geöffneten Chat an</string>
 
   <string name="preference_redirection_errors_title">Fehler umleiten</string>
   <string name="preference_redirection_errors_summary">Zeigt Fehler im momentan geöffneten Chat an</string>
 
-
   <string name="preference_notifications_title">Benachrichtigungen</string>
-
   <string name="preference_notification_query_title">Direktnachrichten</string>
 
   <string name="preference_notification_channel_title">Räume</string>
-
   <string name="preference_notification_other_title">Andere Nachrichten</string>
 
   <string name="preference_notification_sound_title">Benachrichtigungston</string>
@@ -74,16 +74,14 @@
   <string name="preference_notification_light_title">LED</string>
 
   <string name="preference_notification_mark_read_on_swipe_title">Wegwischen einer Benachrichtigung markiert den Channel als gelesen</string>
-  <string name="preference_notification_mark_read_on_swipe_summary">Markiert alle Nachrichten in einem Channel als gelesen wenn eine Benachrichtigung für den Channel weggewischt wird</string>
 
+  <string name="preference_notification_mark_read_on_swipe_summary">Markiert alle Nachrichten in einem Channel als gelesen wenn eine Benachrichtigung für den Channel weggewischt wird</string>
   <string name="preference_notification_network_name_in_notification_title_title">Netzwerknamen in Benachrichtigungstitel anzeigen</string>
-
   <string name="preference_notification_show_all_activities_in_toolbar_title">Alle Aktivitäten in Toolbar markieren</string>
   <string name="preference_notification_show_all_activities_in_toolbar_summary">Zeigt eine farbige Meldung für alle Aktivitäten in der Toolbar</string>
-
   <string name="preference_notification_configure_title">Benachrichtigungen konfigurieren</string>
-
   <string name="preference_notifications_level_all">Alle Nachrichten</string>
+
   <string name="preference_notifications_level_highlight">Erwähnungen</string>
   <string name="preference_notifications_level_none">Niemals</string>
   <string name="preference_messages_title">Nachrichten</string>
@@ -91,33 +89,32 @@
   <string name="preference_monospace_title">Monospace-Schrift verwenden</string>
 
   <string name="preference_textsize_title">Schriftgröße</string>
-
   <string name="preference_show_seconds_title">Sekunden anzeigen</string>
-
   <string name="preference_use_24h_clock_title">24h-Format verwenden</string>
 
   <string name="preference_colorize_mirc_title">mIRC-Farben verwenden</string>
+
   <string name="preference_colorize_mirc_summaryon">Zeigt Farben und Formatierungen in Nachrichten an</string>
   <string name="preference_colorize_mirc_summaryoff">Farben und Formatierungen werden aus Nachrichten entfernt</string>
 
   <string name="preference_colorize_nicknames_title">Benutzernamen farblich hervorheben</string>
+
   <string name="preference_colorize_nicknames_entry_all">Alle Benutzernamen</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Alle außer Eigenem</string>
+
   <string name="preference_colorize_nicknames_entry_none">Keine</string>
   <string name="preference_show_prefix_title">Sendermodi anzeigen</string>
   <string name="preference_show_prefix_entry_all">Alle Modi</string>
+
   <string name="preference_show_prefix_entry_highest">Höchsten Modus</string>
   <string name="preference_show_prefix_entry_none">Keine</string>
   <string name="preference_hostmask_actions_title">Hostmaske in Aktionen</string>
   <string name="preference_hostmask_actions_summary">Zeigt Ident und Host in Betreten/Verlassen-Nachrichten</string>
-
   <string name="preference_nicks_on_new_line_title">Separate Spitznamen</string>
-  <string name="preference_nicks_on_new_line_summary">Zeigt Spitznamen in einer eigenen Zeile an</string>
 
+  <string name="preference_nicks_on_new_line_summary">Zeigt Spitznamen in einer eigenen Zeile an</string>
   <string name="preference_show_realnames_title">Echtnamen anzeigen</string>
-
   <string name="preference_show_avatars_title">Avatare anzeigen</string>
-
   <string name="preference_square_avatars_title">Quadratische Avatare</string>
 
   <string name="preference_show_irccloud_avatars_title">IRCCloud Avatare anzeigen</string>
@@ -127,8 +124,8 @@
   <string name="preference_show_gravatar_avatars_summary">Zeigt für Nutzer ohne Avatare den Gravatar-Avatar an, falls verfügbar</string>
 
   <string name="preference_show_matrix_avatars_title">Matrix Avatare anzeigen</string>
-  <string name="preference_show_matrix_avatars_summary">Zeigt für Nutzer ohne Avatare den Matrix-Avatar an, falls verfügbar</string>
 
+  <string name="preference_show_matrix_avatars_summary">Zeigt für Nutzer ohne Avatare den Matrix-Avatar an, falls verfügbar</string>
   <string name="preference_time_at_end_title">Rechts-Ausgerichtete Zeit</string>
   <string name="preference_time_at_end_summary">Zeigt die Zeit rechts in Nachrichten an</string>
 
@@ -141,49 +138,46 @@
   <string name="preference_replace_emoji_title">Emoji Shortcodes ersetzen</string>
   <string name="preference_replace_emoji_summary">Ersetzt Shortcodes wie :+1: oder :like: durch Emoji</string>
 
-
   <string name="preference_autocomplete_title">Autovervollständigung</string>
-
   <string name="preference_autocomplete_sender_doubleclick_title">Sender-Autovervollständigung</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Vervollständigt den Sender einer Nachricht, wenn auf diese doppelgeklickt wird</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Vervollständigt den Sender einer Nachricht, wenn auf diese doppelgeklickt wird</string>
   <string name="preference_autocomplete_button_title">Autovervollständigungsknopf</string>
-  <string name="preference_autocomplete_button_summary">Zeigt einen Knopf um Namen und Chats zu vervollständigen</string>
 
+  <string name="preference_autocomplete_button_summary">Zeigt einen Knopf um Namen und Chats zu vervollständigen</string>
   <string name="preference_autocomplete_doubletap_title">Doppelclick-Autocomplete</string>
-  <string name="preference_autocomplete_doubletap_summary">Vervollständigt Namen und Chats automatisch, wenn auf das Eingabefeld doppelgeklickt wird</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Vervollständigt Namen und Chats automatisch, wenn auf das Eingabefeld doppelgeklickt wird</string>
   <string name="preference_autocomplete_auto_title">Automatisch anzeigen</string>
+
+
   <string name="preference_autocomplete_auto_summary">Vervollständigt Namen und Chats automatischen nach den ersten 3 Buchstaben</string>
 
   <string name="preference_autocomplete_prefix_title">Nach Präfix anzeigen</string>
   <string name="preference_autocomplete_prefix_summary">Vervollständigt Namen und Chats automatisch nach einem @ oder #</string>
 
   <string name="preference_autocomplete_nicks_title">Autovervollständigung für  Spitznamen</string>
-
   <string name="preference_autocomplete_buffers_title">Autovervollständigung für  Chats</string>
-
   <string name="preference_autocomplete_aliases_title">Autovervollständigung für  Aliase</string>
 
   <string name="preference_autocomplete_emoji_title">Autovervollständigung für Emoji</string>
-
-
   <string name="preference_backlog_title">Verlauf</string>
 
   <string name="preference_page_size_title">Seitengröße</string>
   <string name="preference_page_size_summary">Anzahl an Nachrichten die pro Mal geladen und im Speicher gehalten werden</string>
 
   <string name="preference_initial_amount_title">Anfängliche Verlaufsgröße</string>
-  <string name="preference_initial_amount_summary">Anzahl an Nachrichten die beim ersten Öffnen eines Chats geladen werden</string>
 
+  <string name="preference_initial_amount_summary">Anzahl an Nachrichten die beim ersten Öffnen eines Chats geladen werden</string>
   <string name="preference_clear_cache_title">Nachrichten-Cache leeren</string>
-
   <string name="preference_connection_title">Verbindung</string>
 
   <string name="preference_show_notification_title">Benachrichtigung anzeigen</string>
+
+
   <string name="preference_show_notification_summary">Zeigt eine permanente Benachrichtigung an, damit Quasseldroid durchgehend verbunden bleiben kann</string>
 
   <string name="preference_ignore_network_changes_title">Netzwerkänderung ignorieren</string>
   <string name="preference_ignore_network_changes_summary">Hindert Quasseldroid daran, bei Netzwerkänderungen automatisch die Verbindung neu herzustellen</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 6b3a96e483bcade364b497d4ef9c16747fa46dd2..27257882af3c810077b37ac670d21f55d54e399d 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -17,9 +17,9 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_description">An Android-based client for the decentralised Quassel IRC client.</string>
-  <string name="app_description_long">Quassel is a distributed, decentralised IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
 
+  <string name="app_description_long">Quassel is a distributed, decentralised IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
   <string name="label_feature_synchronizedmarkerline">Required for synchronising the last position in channels</string>
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-en-rGB/strings_info.xml b/app/src/main/res/values-en-rGB/strings_info.xml
index 8dd7d377467c042e001568c8d47116c1e10e8c3f..425ceeb0438438a08775eef4bd6c603249f8dd89 100644
--- a/app/src/main/res/values-en-rGB/strings_info.xml
+++ b/app/src/main/res/values-en-rGB/strings_info.xml
@@ -17,4 +17,5 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  </resources>
diff --git a/app/src/main/res/values-en-rGB/strings_preferences.xml b/app/src/main/res/values-en-rGB/strings_preferences.xml
index cf3aca7da096994954c1c154e9f0c2f501db7ee6..26f07f93a25dcde6bb7fd023b3754f2339e0457d 100644
--- a/app/src/main/res/values-en-rGB/strings_preferences.xml
+++ b/app/src/main/res/values-en-rGB/strings_preferences.xml
@@ -19,10 +19,11 @@
 
 <resources>
   <string name="preference_notification_show_all_activities_in_toolbar_summary">Displays a coloured bubble in the toolbar for all chat activities</string>
-
   <string name="preference_colorize_mirc_title">Use mIRC Colours</string>
+
   <string name="preference_colorize_mirc_summaryon">Show mIRC colours in messages</string>
   <string name="preference_colorize_mirc_summaryoff">Strip mIRC colours from messages</string>
 
   <string name="preference_colorize_nicknames_title">Colourise nicknames</string>
-</resources>
+
+  </resources>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 76036c9f0c078afef22c04c1f671ab6ea0c15857..de87eaebb7877d0cb4cf03b36196aab9380f36fe 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -17,14 +17,14 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Un client Android pour Quassel, un client IRC décentralisé.</string>
-  <string name="app_description_long">Quassel est un client IRC distribué et décentralisé, écrit en C++ et en Qt. Quasseldroid est un client pour le Quassel Core écrit purement en Kotlin, vous offrant la possibilité de vous connecter à un Quassel Core avec votre téléphone Android™.</string>
 
+  <string name="app_description_long">Quassel est un client IRC distribué et décentralisé, écrit en C++ et en Qt. Quasseldroid est un client pour le Quassel Core écrit purement en Kotlin, vous offrant la possibilité de vous connecter à un Quassel Core avec votre téléphone Android™.</string>
   <string name="connection_service_title">Service de Connection</string>
-  <string name="connection_service_description">Maintient une connection a un Core pour recevoir des notifications et transmettre des messages.</string>
 
+  <string name="connection_service_description">Maintient une connection a un Core pour recevoir des notifications et transmettre des messages.</string>
   <string name="label_about">À Propos</string>
   <string name="label_accept">Accepter</string>
   <string name="label_avatar">Avatar</string>
@@ -104,6 +104,7 @@
   <string name="label_who_long">Mettre à jour les informations sur tous les utilisateurs</string>
   <string name="label_whois">Whois</string>
   <string name="label_whois_long">Mettre à jour les informations sur l\'utilisateur</string>
+
   <string name="label_yes">Oui</string>
 
   <string name="label_feature_synchronizedmarkerline">Requis pour synchroniser la dernière position du tchat dans les chaînes</string>
@@ -129,4 +130,4 @@
 
   <string name="info_copied_version">Version copiée au clipboard</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_preferences.xml b/app/src/main/res/values-fr-rCA/strings_preferences.xml
index ecd5d9c387c649a5898a5098f56a4d6ecd647d70..e9f6a1f80ab5cc5b4e10c04ba446836c9ce4f9bc 100644
--- a/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -31,7 +31,9 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Clair)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Sombre)</string>
   <string name="preference_theme_entry_dracula">Dracula</string>
+
   <string name="preference_input_enter_title">Entrez une clef à partir du clavier</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji</string>
   <string name="preference_input_enter_entry_send">Envoyer</string>
   <string name="preference_show_lag_title">Montrer le lag</string>
@@ -43,11 +45,9 @@
   <string name="preference_language_title">Langue</string>
   <string name="preference_language_entry_auto">Défauts du Système</string>
   <string name="preference_notifications_title">Notifications</string>
-
   <string name="preference_notification_query_title">Messages Privés</string>
 
   <string name="preference_notification_channel_title">Messages de la Chaîne</string>
-
   <string name="preference_notification_other_title">Autres Messages</string>
 
   <string name="preference_notification_sound_title">Son de Notifications</string>
@@ -57,8 +57,8 @@
   <string name="preference_notification_light_title">LED</string>
 
   <string name="preference_notification_configure_title">Configurer les Notifications</string>
-
   <string name="preference_notifications_level_all">Tous les Messages</string>
+
   <string name="preference_notifications_level_highlight">Mentions</string>
   <string name="preference_notifications_level_none">Jamais</string>
   <string name="preference_messages_title">Messages</string>
@@ -66,33 +66,32 @@
   <string name="preference_monospace_title">Utiliser une Police Monospace</string>
 
   <string name="preference_textsize_title">Grosseur du Texte</string>
-
   <string name="preference_show_seconds_title">Montrer les Secondes</string>
-
   <string name="preference_use_24h_clock_title">Utiliser une Horloge 24h</string>
 
   <string name="preference_colorize_mirc_title">Utiliser les Couleurs mIRC</string>
+
   <string name="preference_colorize_mirc_summaryon">Montrer les couleurs de style mIRC dans les messages</string>
   <string name="preference_colorize_mirc_summaryoff">Enlever les couleurs de style mIRC des messages</string>
 
   <string name="preference_colorize_nicknames_title">Colorier les noms d\'utilisateur</string>
+
   <string name="preference_colorize_nicknames_entry_all">Tous les noms</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Tous les noms sauf le mien</string>
+
   <string name="preference_colorize_nicknames_entry_none">Aucuns noms</string>
   <string name="preference_show_prefix_title">Montrer les modes en préfixe</string>
   <string name="preference_show_prefix_entry_all">Tous les modes</string>
+
   <string name="preference_show_prefix_entry_highest">Seulement le plus haut mode</string>
   <string name="preference_show_prefix_entry_none">Aucuns modes</string>
   <string name="preference_hostmask_actions_title">Montrer le Hostmask dans les actions</string>
   <string name="preference_hostmask_actions_summary">Montrer le nom!identité@hôte complet dans les messages de style join/part/quit</string>
-
   <string name="preference_nicks_on_new_line_title">Séparer les noms d\'utilisateur</string>
-  <string name="preference_nicks_on_new_line_summary">Montrer les noms d\'utilisateur sur une ligne séparée</string>
 
+  <string name="preference_nicks_on_new_line_summary">Montrer les noms d\'utilisateur sur une ligne séparée</string>
   <string name="preference_show_realnames_title">Montrer les Noms Réels</string>
-
   <string name="preference_show_avatars_title">Montrer les Avatars</string>
-
   <string name="preference_square_avatars_title">Avatars Carrés</string>
 
   <string name="preference_show_irccloud_avatars_title">Montrer les Avatars IRCCloud</string>
@@ -102,8 +101,8 @@
   <string name="preference_show_gravatar_avatars_summary">Montrer, pour les utilisateurs sans avatar, leur Gravatar si possible</string>
 
   <string name="preference_show_matrix_avatars_title">Montrer les Avatars Matrix</string>
-  <string name="preference_show_matrix_avatars_summary">Montrer, pour les utilisateurs sans avatars, leur avatar Matrix si possible.</string>
 
+  <string name="preference_show_matrix_avatars_summary">Montrer, pour les utilisateurs sans avatars, leur avatar Matrix si possible.</string>
   <string name="preference_time_at_end_title">Marqueurs de temps alignés à droite</string>
   <string name="preference_time_at_end_summary">Aligner les marqueurs de temps à la fin de chaque message</string>
 
@@ -111,26 +110,25 @@
   <string name="preference_larger_emoji_summary">Grossir les emoji si le message ne contient que des emojis</string>
 
   <string name="preference_autocomplete_title">Auto-Complétion</string>
-
   <string name="preference_autocomplete_sender_doubleclick_title">Auto-Complétion de l\'expéditeur</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Double-cliquer sur un message pour auto-compléter à partir de son expéditeur</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Double-cliquer sur un message pour auto-compléter à partir de son expéditeur</string>
   <string name="preference_autocomplete_button_title">Bouton d\'Auto-Complétion</string>
-  <string name="preference_autocomplete_button_summary">Montrer un bouton à gauche de la zone de texte qui initie la complétion</string>
 
+  <string name="preference_autocomplete_button_summary">Montrer un bouton à gauche de la zone de texte qui initie la complétion</string>
   <string name="preference_autocomplete_doubletap_title">Tapez deux fois pour auto-compléter</string>
-  <string name="preference_autocomplete_doubletap_summary">Suggérer des noms et des chaînes après un clique double dans la zone de texte</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Suggérer des noms et des chaînes après un clique double dans la zone de texte</string>
   <string name="preference_autocomplete_auto_title">Montrer automatiquement</string>
+
+
   <string name="preference_autocomplete_auto_summary">Suggérer des noms et des chaînes après avoir entré les 3 premiers caractères</string>
 
   <string name="preference_autocomplete_prefix_title">Montrer après le préfixe</string>
   <string name="preference_autocomplete_prefix_summary">Suggérer des noms et des chaînes après @ ou #</string>
 
   <string name="preference_autocomplete_nicks_title">Auto-Compléter les Noms d\'Utilisateurs</string>
-
   <string name="preference_autocomplete_buffers_title">Auto-Compléter les Tchats</string>
-
   <string name="preference_autocomplete_aliases_title">Auto-Compléter les Commandes</string>
 
   <string name="preference_backlog_title">Messages Antérieurs Affichés</string>
@@ -139,11 +137,13 @@
   <string name="preference_page_size_summary">Le nombre de messages affichés et gardés en mémoire en un temps donné</string>
 
   <string name="preference_initial_amount_title">Montant Initial</string>
-  <string name="preference_initial_amount_summary">Nombre de messages à montrer quand le tchat est initialement ouvert</string>
 
+  <string name="preference_initial_amount_summary">Nombre de messages à montrer quand le tchat est initialement ouvert</string>
   <string name="preference_connection_title">Connection</string>
 
   <string name="preference_show_notification_title">Montrer la notification</string>
+
+
   <string name="preference_show_notification_summary">Garde Quasseldroid connecté en permanence en montrant une notification persistante</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4def8cf5cfdc981086731605a5be012afb783752..1466f6157119a9d9c845289b30a3080fb6b8dc6f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,14 +17,14 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Un client basé sur Android pour décentraliser le client Quassel IRC.</string>
-  <string name="app_description_long">Quassel est un client IRC distribué et décentralisé, écrit en C++ et en Qt. Quasseldroid est un client pour Quassel core en pure kotlin, vous permettant de vous connecter à votre Quassel core en utilisant votre téléphone Android™.</string>
 
+  <string name="app_description_long">Quassel est un client IRC distribué et décentralisé, écrit en C++ et en Qt. Quasseldroid est un client pour Quassel core en pure kotlin, vous permettant de vous connecter à votre Quassel core en utilisant votre téléphone Android™.</string>
   <string name="connection_service_title">Service de connexion</string>
-  <string name="connection_service_description">Garder une connexion au core pour permettre les notifications et transmettre des messages.</string>
 
+  <string name="connection_service_description">Garder une connexion au core pour permettre les notifications et transmettre des messages.</string>
   <string name="label_about">À propos</string>
   <string name="label_accept">Accepter</string>
   <string name="label_acknowledgements">Remerciements</string>
@@ -74,4 +74,45 @@
   <string name="label_join_long">Joindre le salon</string>
   <string name="label_libraries">Librairies</string>
   <string name="label_license">Licence</string>
-</resources>
+  <string name="label_mark_read">Marquer lu</string>
+  <string name="label_mention">Mentionner</string>
+  <string name="label_network">Réseau</string>
+  <string name="label_new_account">Nouveau compte</string>
+  <string name="label_new_chatlist">Nouvelle liste de discussion</string>
+  <string name="label_new_identity">Nouvelle identité</string>
+  <string name="label_new_network">Nouveau réseau</string>
+  <string name="label_new_nick">Nouveau nom</string>
+  <string name="label_new_server">Nouveau serveur</string>
+  <string name="label_next">Suivant</string>
+  <string name="label_nick">Utilisateur</string>
+  <string name="label_nicklist">Liste des utilisateurs</string>
+  <string name="label_no">Non</string>
+  <string name="label_no_sound">Aucun</string>
+  <string name="label_open">Ouvrir</string>
+  <string name="label_part">Quitter</string>
+  <string name="label_part_long">Quitter le salon</string>
+  <string name="label_password_change">Changer le mot de passe</string>
+  <string name="label_password_error_wrong">Mauvais mot de passe</string>
+  <string name="label_password_new">Nouveau mot de passe</string>
+  <string name="label_password_old">Ancien mot de passe</string>
+  <string name="label_password_repeat">Répéter mot de passe</string>
+  <string name="label_permanently_archived">Archivé en permanence</string>
+  <string name="label_permanently_archived_empty">Vous n\'avez pas de chat archivés en permanence</string>
+  <string name="label_placeholder_message">Écrire un message</string>
+  <string name="label_placeholder_topic">Décrire le sujet du salon</string>
+  <string name="label_privacy_policy">Politique de confidentialité</string>
+  <string name="label_query">Requête</string>
+  <string name="label_query_long">Ouvrir un chat privé avec un utilisateur</string>
+  <string name="label_query_medium">Ouvrir un chat privé</string>
+  <string name="label_rename">Renommer</string>
+  <string name="label_reorder">Réorganiser</string>
+  <string name="label_reply">Réponse</string>
+  <string name="label_reset">Réinitialiser</string>
+  <string name="label_save">Sauvegarder</string>
+  <string name="label_saving">En sauvegarde...</string>
+  <string name="label_search">Rechercher...</string>
+  <string name="label_search_buffer">Rechercher des chats</string>
+  <string name="label_search_channels">Rechercher des salons</string>
+  <string name="label_select">Sélectionner</string>
+  <string name="label_send">Envoyer</string>
+  </resources>
diff --git a/app/src/main/res/values-fr/strings_info.xml b/app/src/main/res/values-fr/strings_info.xml
index 8dd7d377467c042e001568c8d47116c1e10e8c3f..425ceeb0438438a08775eef4bd6c603249f8dd89 100644
--- a/app/src/main/res/values-fr/strings_info.xml
+++ b/app/src/main/res/values-fr/strings_info.xml
@@ -17,4 +17,5 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  </resources>
diff --git a/app/src/main/res/values-fr/strings_preferences.xml b/app/src/main/res/values-fr/strings_preferences.xml
index 8dd7d377467c042e001568c8d47116c1e10e8c3f..425ceeb0438438a08775eef4bd6c603249f8dd89 100644
--- a/app/src/main/res/values-fr/strings_preferences.xml
+++ b/app/src/main/res/values-fr/strings_preferences.xml
@@ -17,4 +17,5 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d9dfed1ea745b60fe470a988b5b15da1791d3343..aee5b598b20baaaefa30096d5dd33c1dfc6cec92 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -18,10 +18,6 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <plurals name="label_user_count">
-    <item quantity="one">%1$d utente</item>
-    <item quantity="other">%1$d utenti</item>
-  </plurals>
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Un client Android per utilizzare IRC in modo decentralizzato con Quassel.</string>
 
@@ -147,7 +143,6 @@
   <string name="label_unknown_sender">&lt;Sconosciuto&gt;</string>
   <string name="label_update_user_password">Aggiorna il nome utente e la password</string>
   <string name="label_use_default">Utilizza i valori predefiniti</string>
-  <string name="label_user_count">Numero di utenti</string>
   <string name="label_website">Sito web</string>
   <string name="label_whitelist">Ignora</string>
   <string name="label_whitelist_certificates">Certificati</string>
diff --git a/app/src/main/res/values-it/strings_info.xml b/app/src/main/res/values-it/strings_info.xml
index bf26b3df8bee582da413e1ee50c47a298e7f80a0..fb262774bf8935aa371fc318ed59466c52fd0e3d 100644
--- a/app/src/main/res/values-it/strings_info.xml
+++ b/app/src/main/res/values-it/strings_info.xml
@@ -36,7 +36,6 @@
   <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_ciphersuite_13">La connessione è crittografata ed autenticata con %1$s</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-it/strings_preferences.xml b/app/src/main/res/values-it/strings_preferences.xml
index ec5ee329daf05aca2b7e43313b98c5963e233513..464a9fcd56bcbe08e1a55d19de7988bd29b5679d 100644
--- a/app/src/main/res/values-it/strings_preferences.xml
+++ b/app/src/main/res/values-it/strings_preferences.xml
@@ -35,10 +35,13 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Chiaro)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Scuro)</string>
   <string name="preference_theme_entry_dracula">Dracula</string>
+
   <string name="preference_input_enter_title">Tasto invio della tastiera</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji</string>
   <string name="preference_input_enter_entry_send">Invio</string>
   <string name="preference_input_enter_entry_newline">A capo</string>
+
   <string name="preference_show_lag_title">Mostra latenza</string>
   <string name="preference_show_lag_summary">Mostra il ritardo tra il client ed il core nella barra delle azioni</string>
 
@@ -48,23 +51,18 @@
   <string name="preference_language_title">Lingua</string>
   <string name="preference_language_entry_auto">Predefinita di sistema</string>
   <string name="preference_redirection_title">Reindirizzamento messaggi</string>
-
   <string name="preference_redirection_user_notices_title">Reindirizzare avvisi utente</string>
   <string name="preference_redirection_user_notices_summary">Mostra gli avvisi utente nel canale in uso</string>
-
   <string name="preference_redirection_server_notices_title">Reindirizzare avvisi server</string>
   <string name="preference_redirection_server_notices_summary">Mostra gli avvisi del server nel canale in uso</string>
 
   <string name="preference_redirection_errors_title">Reindirizzare errori</string>
   <string name="preference_redirection_errors_summary">Mostra gli errori nel canale in uso</string>
 
-
   <string name="preference_notifications_title">Notifiche</string>
-
   <string name="preference_notification_query_title">Messaggi privati</string>
 
   <string name="preference_notification_channel_title">Messaggi del canale</string>
-
   <string name="preference_notification_other_title">Altri messaggi</string>
 
   <string name="preference_notification_sound_title">Suono di notifica</string>
@@ -74,16 +72,14 @@
   <string name="preference_notification_light_title">LED</string>
 
   <string name="preference_notification_mark_read_on_swipe_title">Considera canale letto allo swipe sulle notifiche</string>
-  <string name="preference_notification_mark_read_on_swipe_summary">Imposta tutti i messaggi del canale come letti allo swipe della notifica per il canale</string>
 
+  <string name="preference_notification_mark_read_on_swipe_summary">Imposta tutti i messaggi del canale come letti allo swipe della notifica per il canale</string>
   <string name="preference_notification_network_name_in_notification_title_title">Mostra il nome della rete nel titolo delle notifiche</string>
-
   <string name="preference_notification_show_all_activities_in_toolbar_title">Segna tutte le attività nella barra degli strumenti</string>
   <string name="preference_notification_show_all_activities_in_toolbar_summary">Mostra una bolla colorata nella barra degli strumenti per l’attività di qualunque chat</string>
-
   <string name="preference_notification_configure_title">Configura notifiche</string>
-
   <string name="preference_notifications_level_all">Tutti i messaggi</string>
+
   <string name="preference_notifications_level_highlight">Solo se menzionato</string>
   <string name="preference_notifications_level_none">Mai</string>
   <string name="preference_messages_title">Messaggi</string>
@@ -91,33 +87,32 @@
   <string name="preference_monospace_title">Usa carattere a spaziatura fissa</string>
 
   <string name="preference_textsize_title">Dimensione del testo</string>
-
   <string name="preference_show_seconds_title">Mostra secondi</string>
-
   <string name="preference_use_24h_clock_title">Usa orologio 24 ore</string>
 
   <string name="preference_colorize_mirc_title">Usa colori di mIRC</string>
+
   <string name="preference_colorize_mirc_summaryon">Mostra i colori di mIRC nei messaggi</string>
   <string name="preference_colorize_mirc_summaryoff">Rimuovi i colori di mIRC dai messaggi</string>
 
   <string name="preference_colorize_nicknames_title">Nick colorati</string>
+
   <string name="preference_colorize_nicknames_entry_all">Tutti i nick</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Tutti tranne il proprio nick</string>
+
   <string name="preference_colorize_nicknames_entry_none">Nessun nick</string>
   <string name="preference_show_prefix_title">Mostra modi utente come prefisso</string>
   <string name="preference_show_prefix_entry_all">Tutti i modi utente</string>
+
   <string name="preference_show_prefix_entry_highest">Solo il modo più alto</string>
   <string name="preference_show_prefix_entry_none">Nessun modo</string>
   <string name="preference_hostmask_actions_title">Mostra identità completa nelle azioni</string>
   <string name="preference_hostmask_actions_summary">Mostra nick!ident@host nei messaggi di entrata, uscita e disconnessione</string>
-
   <string name="preference_nicks_on_new_line_title">Separa nick degli utenti</string>
-  <string name="preference_nicks_on_new_line_summary">Mostra nick degli utenti su una riga separata</string>
 
+  <string name="preference_nicks_on_new_line_summary">Mostra nick degli utenti su una riga separata</string>
   <string name="preference_show_realnames_title">Mostra nomi reali</string>
-
   <string name="preference_show_avatars_title">Mostra avatar</string>
-
   <string name="preference_square_avatars_title">Avatar quadrati</string>
 
   <string name="preference_show_irccloud_avatars_title">Mostra avatar di IRCCloud</string>
@@ -127,8 +122,8 @@
   <string name="preference_show_gravatar_avatars_summary">Per gli utenti privi di avatar mostra quello di Gravatar, se disponibile</string>
 
   <string name="preference_show_matrix_avatars_title">Mostra avatar di Matrix</string>
-  <string name="preference_show_matrix_avatars_summary">Per gli utenti privi di avatar mostra quello di Matrix, se disponibile</string>
 
+  <string name="preference_show_matrix_avatars_summary">Per gli utenti privi di avatar mostra quello di Matrix, se disponibile</string>
   <string name="preference_time_at_end_title">Ora dei messaggi allineata a destra</string>
   <string name="preference_time_at_end_summary">Allinea l’ora dei messaggi alla fine di ogni messaggio</string>
 
@@ -141,49 +136,46 @@
   <string name="preference_replace_emoji_title">Sostitiuisci abbreviazioni con emoji</string>
   <string name="preference_replace_emoji_summary">Sostituisci automaticamente le abbreviazioni come :+1: o :like: con emoji</string>
 
-
   <string name="preference_autocomplete_title">Completamento automatico</string>
-
   <string name="preference_autocomplete_sender_doubleclick_title">Completa automaticamente il mittente</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Fai doppio clic su un messaggio per completare automaticamente il mittente</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Fai doppio clic su un messaggio per completare automaticamente il mittente</string>
   <string name="preference_autocomplete_button_title">Pulsante di completamento automatico</string>
-  <string name="preference_autocomplete_button_summary">Mostra un pulsante a sinistra della riga di input per attivare il completamento</string>
 
+  <string name="preference_autocomplete_button_summary">Mostra un pulsante a sinistra della riga di input per attivare il completamento</string>
   <string name="preference_autocomplete_doubletap_title">Doppio tocco per completare automaticamente</string>
-  <string name="preference_autocomplete_doubletap_summary">Suggerisci nick e canali dopo al doppio clic del campo di input</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Suggerisci nick e canali dopo al doppio clic del campo di input</string>
   <string name="preference_autocomplete_auto_title">Mostra automaticamente</string>
+
+
   <string name="preference_autocomplete_auto_summary">Suggerisci nick e canali dopo aver inserito i primi 3 caratteri</string>
 
   <string name="preference_autocomplete_prefix_title">Mostra dopo il prefisso</string>
   <string name="preference_autocomplete_prefix_summary">Suggerisci nick e canali dopo aver scritto @ o #</string>
 
   <string name="preference_autocomplete_nicks_title">Completa nick automaticamente</string>
-
   <string name="preference_autocomplete_buffers_title">Completa automaticamente chat</string>
-
   <string name="preference_autocomplete_aliases_title">Completa automaticamente comandi</string>
 
   <string name="preference_autocomplete_emoji_title">Completa automaticamente emoji</string>
-
-
   <string name="preference_backlog_title">Registro storico</string>
 
   <string name="preference_page_size_title">Dimensioni della pagina</string>
   <string name="preference_page_size_summary">Il numero di messaggi caricati e conservati in memoria contemporaneamente</string>
 
   <string name="preference_initial_amount_title">Quantità iniziale</string>
-  <string name="preference_initial_amount_summary">Numero di messaggi da caricare all’apertura di una chat la prima volta</string>
 
+  <string name="preference_initial_amount_summary">Numero di messaggi da caricare all’apertura di una chat la prima volta</string>
   <string name="preference_clear_cache_title">Cancella cache registro storico</string>
-
   <string name="preference_connection_title">Connessione</string>
 
   <string name="preference_show_notification_title">Mostra notifica</string>
+
+
   <string name="preference_show_notification_summary">Mantiene Quasseldroid sempre collegato mostrando una notifica permanente</string>
 
   <string name="preference_ignore_network_changes_title">Ignora cambi di rete</string>
   <string name="preference_ignore_network_changes_summary">Interrompi la riconnessione automatica di Quasseldroid se la rete cambia</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 06a98b5d085fb83c297a1fceffa00dab7d78653b..9605fc76ef8e53cc91ff0eb8d2cb711f1cd0bffe 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -18,12 +18,6 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <plurals name="label_user_count" tools:ignore="UnusedQuantity">
-    <item quantity="one">%1$d vartotojas</item>
-    <item quantity="few">%1$d vartotojai</item>
-    <item quantity="many">%1$d vartotojų</item>
-    <item quantity="other">%1$d vartotojų</item>
-  </plurals>
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Android klientas decentralizuotam Quassel IRC klientui.</string>
 
@@ -147,7 +141,6 @@
   <string name="label_unknown_sender">&lt;Nežinoma&gt;</string>
   <string name="label_update_user_password">Atnaujinti Vartotoją/Slaptažodį</string>
   <string name="label_use_default">Naudoti numatytas parinktis</string>
-  <string name="label_user_count">Vartotojų skaičius</string>
   <string name="label_website">Tinklalapis</string>
   <string name="label_whitelist">Ignoruoti</string>
   <string name="label_whitelist_certificates">Sertifikatai</string>
@@ -200,4 +193,4 @@
   <string name="info_copied_version">Versija nukopijuota į atmintinę</string>
 
   <string name="advertisement_support_patreon">Padėkite mums toliau plėtoti šią programėlę prisidėdami per Patreon</string>
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-lt/strings_info.xml b/app/src/main/res/values-lt/strings_info.xml
index 54ae9fa0dc139e3094e2dd7941532ed9611aa37e..acc6d5301d9b92302435e14c579914c050cab1ca 100644
--- a/app/src/main/res/values-lt/strings_info.xml
+++ b/app/src/main/res/values-lt/strings_info.xml
@@ -36,7 +36,6 @@
   <string name="label_core_connection_verified_by">Ryšys patvirtintas %1$s</string>
   <string name="label_core_connection_protocol">Šis ryšys naudoja %1$s</string>
   <string name="label_core_connection_ciphersuite">Šis ryšys yra užkoduotas ir autentifikuotas naudojant %1$s, ir naudoja %2$s raktų apsikeitimui</string>
-  <string name="label_core_connection_ciphersuite_13">Šis ryšys yra užkoduotas ir autentifikuotas naudojant %1$s</string>
   <string name="label_core_connection_verified_by_unknown">Nežinoma</string>
   <string name="label_core_connection_insecure">Nesaugus ryšys</string>
 
diff --git a/app/src/main/res/values-lt/strings_preferences.xml b/app/src/main/res/values-lt/strings_preferences.xml
index 5648607f8cd4dbf73cdc4b8bf065b3ec2a2686d1..2cadcd841f23a805160b5d2ddc8700fb96388ff3 100644
--- a/app/src/main/res/values-lt/strings_preferences.xml
+++ b/app/src/main/res/values-lt/strings_preferences.xml
@@ -35,10 +35,13 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Šviesi)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Tamsi)</string>
   <string name="preference_theme_entry_dracula">Dracula</string>
+
   <string name="preference_input_enter_title">Enter mygtuko elgsena</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji pasirinkimas</string>
   <string name="preference_input_enter_entry_send">Siųsti žinutę</string>
   <string name="preference_input_enter_entry_newline">Nauja eilutė</string>
+
   <string name="preference_show_lag_title">Rodyti delsimą</string>
   <string name="preference_show_lag_summary">Veiksmų juostoje matysite kiek klijentas atsilieka nuo branduolio</string>
 
@@ -48,11 +51,9 @@
   <string name="preference_language_title">Kalba</string>
   <string name="preference_language_entry_auto">Sistemos numatyta</string>
   <string name="preference_notifications_title">Pranešimai</string>
-
   <string name="preference_notification_query_title">Tiesioginės žinutės</string>
 
   <string name="preference_notification_channel_title">Kanalo žinutės</string>
-
   <string name="preference_notification_other_title">Kitos žinutės</string>
 
   <string name="preference_notification_sound_title">Pranešimo garsas</string>
@@ -62,16 +63,14 @@
   <string name="preference_notification_light_title">LED Lemputė</string>
 
   <string name="preference_notification_mark_read_on_swipe_title">Pažymėti kaip perskaitytą nubraukus pranešimus</string>
-  <string name="preference_notification_mark_read_on_swipe_summary">Pažymi visas kanalo žinutes kaip perskaitytas, kai yra nubraukiamas pranešimas iš kanalo</string>
 
+  <string name="preference_notification_mark_read_on_swipe_summary">Pažymi visas kanalo žinutes kaip perskaitytas, kai yra nubraukiamas pranešimas iš kanalo</string>
   <string name="preference_notification_network_name_in_notification_title_title">Rodyti tinklo pavadinimą pranešimų antraštėje</string>
-
   <string name="preference_notification_show_all_activities_in_toolbar_title">Pažymėti visas veiklas įrankių juostoje</string>
   <string name="preference_notification_show_all_activities_in_toolbar_summary">Pokalbyje atsiradus bet kokiai veiklai, rodys spalvotą burbulą įrankių juostoje</string>
-
   <string name="preference_notification_configure_title">Pranešimų nustatymai</string>
-
   <string name="preference_notifications_level_all">Visos žinutės</string>
+
   <string name="preference_notifications_level_highlight">Paminėjimai</string>
   <string name="preference_notifications_level_none">Niekada</string>
   <string name="preference_messages_title">Žinutės</string>
@@ -79,33 +78,32 @@
   <string name="preference_monospace_title">Naudoti Monospace šriftą</string>
 
   <string name="preference_textsize_title">Teksto dydis</string>
-
   <string name="preference_show_seconds_title">Rodyti sekundes</string>
-
   <string name="preference_use_24h_clock_title">Naudoti 24h formatą</string>
 
   <string name="preference_colorize_mirc_title">Naudoti mIRC spalvas</string>
+
   <string name="preference_colorize_mirc_summaryon">Rodyti mIRC spalvas žinutėse</string>
   <string name="preference_colorize_mirc_summaryoff">Naikinti mIRC spalvas iš žinučių</string>
 
   <string name="preference_colorize_nicknames_title">Spalvoti slapyvardžiai</string>
+
   <string name="preference_colorize_nicknames_entry_all">Visus</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Visus, išskyrus savo</string>
+
   <string name="preference_colorize_nicknames_entry_none">Nei vieno</string>
   <string name="preference_show_prefix_title">Rodyti Sendermodes</string>
   <string name="preference_show_prefix_entry_all">Visus</string>
+
   <string name="preference_show_prefix_entry_highest">Aukščiausią</string>
   <string name="preference_show_prefix_entry_none">Nei vieno</string>
   <string name="preference_hostmask_actions_title">Rodyti Hostmask veiksmuose</string>
   <string name="preference_hostmask_actions_summary">Rodyti nick!ident@host prisijungimo/atsijungimo/išėjimo žinutėse</string>
-
   <string name="preference_nicks_on_new_line_title">Išskirti slapyvardžius</string>
-  <string name="preference_nicks_on_new_line_summary">Rodyti slapyvardžius atskiroje eilutėje</string>
 
+  <string name="preference_nicks_on_new_line_summary">Rodyti slapyvardžius atskiroje eilutėje</string>
   <string name="preference_show_realnames_title">Rodyti tikrus vardus</string>
-
   <string name="preference_show_avatars_title">Rodyti Avatarus</string>
-
   <string name="preference_square_avatars_title">Neapvalinti Avatarų</string>
 
   <string name="preference_show_irccloud_avatars_title">Rodyti IRCCloud Avatarus</string>
@@ -115,8 +113,8 @@
   <string name="preference_show_gravatar_avatars_summary">Jei galima, vartotojams be Avataro rodys jų Gravatar alternatyvą</string>
 
   <string name="preference_show_matrix_avatars_title">Rodyti Matrix Avatarus</string>
-  <string name="preference_show_matrix_avatars_summary">Jei galima, vartotojams be Avataro rodys jų Matrix alternatyvą</string>
 
+  <string name="preference_show_matrix_avatars_summary">Jei galima, vartotojams be Avataro rodys jų Matrix alternatyvą</string>
   <string name="preference_time_at_end_title">Laiko žymes lygiuoti dešinėje</string>
   <string name="preference_time_at_end_summary">Lygiuoja laiko žymes kiekvienos žinutės pabaigoje</string>
 
@@ -129,46 +127,43 @@
   <string name="preference_replace_emoji_title">Pakeisti Emoji trumpuosius kodus</string>
   <string name="preference_replace_emoji_summary">Automatiškai pakeičia trumpuosius kodus, tokius kaip :+1: ar :like: į Emoji</string>
 
-
   <string name="preference_autocomplete_title">Automatinis užbaigimas</string>
-
   <string name="preference_autocomplete_sender_doubleclick_title">Siuntėjo auto-įvedimas</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Du kart paspauskite ant žinutės jog būtų automatiškai įvestas jos siuntėjas</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Du kart paspauskite ant žinutės jog būtų automatiškai įvestas jos siuntėjas</string>
   <string name="preference_autocomplete_button_title">Auto-užbaigimo mygtukas</string>
-  <string name="preference_autocomplete_button_summary">Eilutės kairėje rodys įvedimo mygtuką, kuris automatiškai užbaigia žodį</string>
 
+  <string name="preference_autocomplete_button_summary">Eilutės kairėje rodys įvedimo mygtuką, kuris automatiškai užbaigia žodį</string>
   <string name="preference_autocomplete_doubletap_title">Automatiškai užbaigti po dvigubo paspaudimo</string>
-  <string name="preference_autocomplete_doubletap_summary">Pasiūlyti slapyvardžius ir kanalus du kart paspaudus ant įvedimo laukelio</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Pasiūlyti slapyvardžius ir kanalus du kart paspaudus ant įvedimo laukelio</string>
   <string name="preference_autocomplete_auto_title">Siūlyti automatiškai</string>
+
+
   <string name="preference_autocomplete_auto_summary">Siūlyti slapyvardžius ir kanalus įvedus pirmas 3 raides</string>
 
   <string name="preference_autocomplete_prefix_title">Siūlyti po simbolio</string>
   <string name="preference_autocomplete_prefix_summary">Siūlyti slapyvardžius ir kanalus įvedus @ arba #</string>
 
   <string name="preference_autocomplete_nicks_title">Auto-užbaigti slapyvardžius</string>
-
   <string name="preference_autocomplete_buffers_title">Auto-užbaigti pokalbius</string>
-
   <string name="preference_autocomplete_aliases_title">Auto-užbaigti komandas</string>
 
   <string name="preference_autocomplete_emoji_title">Automatiškai užbaigti Emoji</string>
-
-
   <string name="preference_backlog_title">Žinučių žurnalas</string>
 
   <string name="preference_page_size_title">Atminties dydis</string>
   <string name="preference_page_size_summary">Žinučių kiekis, kuris bus užkrautas ir laikomas atmintyje</string>
 
   <string name="preference_initial_amount_title">Pradinis dydis</string>
-  <string name="preference_initial_amount_summary">Žinučių kiekis, kuris bus užkraunamas pirmą kartą atvėrus buferį</string>
 
+  <string name="preference_initial_amount_summary">Žinučių kiekis, kuris bus užkraunamas pirmą kartą atvėrus buferį</string>
   <string name="preference_clear_cache_title">Išvalyti senų pokalbių talpyklą</string>
-
   <string name="preference_connection_title">Ryšys</string>
 
   <string name="preference_show_notification_title">Rodyti aktyvųjį pranešimą</string>
+
+
   <string name="preference_show_notification_summary">Išlaikys Quasseldroid įjungtą, rodant pastovų pranešimą</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8320e40ff1cc7acee6fd1c5be5b2b2d6857eb9f1..792738a0c58313c5541c37314d896cb01702c3b7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -17,10 +17,9 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Quasseldroid</string>
   <string name="connection_service_description">Houdt een verbinding met je core om meldingen mogelijk te maken en berichten te verzenden. </string>
-
   <string name="label_about">Over</string>
   <string name="label_ascending">Oplopend</string>
   <string name="label_authors">Auteurs</string>
@@ -78,4 +77,4 @@
   <string name="label_translators">Vertalers</string>
   <string name="label_yes">Ja</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-nl/strings_info.xml b/app/src/main/res/values-nl/strings_info.xml
index 8dd7d377467c042e001568c8d47116c1e10e8c3f..425ceeb0438438a08775eef4bd6c603249f8dd89 100644
--- a/app/src/main/res/values-nl/strings_info.xml
+++ b/app/src/main/res/values-nl/strings_info.xml
@@ -17,4 +17,5 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  </resources>
diff --git a/app/src/main/res/values-nl/strings_preferences.xml b/app/src/main/res/values-nl/strings_preferences.xml
index 8dd7d377467c042e001568c8d47116c1e10e8c3f..425ceeb0438438a08775eef4bd6c603249f8dd89 100644
--- a/app/src/main/res/values-nl/strings_preferences.xml
+++ b/app/src/main/res/values-nl/strings_preferences.xml
@@ -17,4 +17,5 @@
   with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a201091700e00b3eaa904d56bdad14cd5b6caa8e..47abf66088ad2a3d504135ce2789caf566c83c03 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -18,10 +18,6 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <plurals name="label_user_count">
-    <item quantity="one">%1$d utilizadores</item>
-    <item quantity="other">%1$d utilizadores</item>
-  </plurals>
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Um cliente baseado no Android para o cliente de IRC Quassel descentralizado.</string>
 
@@ -108,6 +104,7 @@
   <string name="label_password_old">Antiga palavra-passe</string>
   <string name="label_password_repeat">Confirme a palavra-passe</string>
   <string name="label_permanently_archived">Arquivado Permanentemente</string>
+  <string name="label_permanently_archived_empty">Você não tem conversas permanentemente arquivadas</string>
   <string name="label_permanently_archived_long"> Chats permanentemente arquivados ficam escondidos até que escolha desarquiva-los manualmente.</string>
   <string name="label_placeholder_message">Escrever uma mensagem…</string>
   <string name="label_placeholder_topic">Descreva o tópico do canal…</string>
@@ -138,6 +135,7 @@
   <string name="label_sort">Ordenar</string>
   <string name="label_source">Fonte</string>
   <string name="label_temporarily_archived">Arquivado temporariamente</string>
+  <string name="label_temporarily_archived_empty">Você não tem conversas permanentemente arquivadas</string>
   <string name="label_temporarily_archived_long">  Chats arquivados temporariamente serão mostrados novamente assim que tenham uma mensagem nova.</string>
   <string name="label_topic">Tópico do Canal</string>
   <string name="label_translators">Tradutores</string>
@@ -145,7 +143,6 @@
   <string name="label_unknown_sender">&lt;Desconhecido&gt;</string>
   <string name="label_update_user_password">Actualizar Utilizador/Senha</string>
   <string name="label_use_default">Utilizar Padrão</string>
-  <string name="label_user_count">Contagem de utilizadores</string>
   <string name="label_website">Site</string>
   <string name="label_whitelist">Ignorar</string>
   <string name="label_whitelist_certificates">Certificados</string>
@@ -198,4 +195,5 @@
   <string name="info_copied_version">Versão copiada para a área de transferência</string>
 
   <string name="advertisement_support_patreon">Por favor, ajudem a apoiar o desenvolvimento deste aplicativo através de Patreon</string>
+  <string name="advertisement_support_button">Suporte o desenvolvimento do App</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings_info.xml b/app/src/main/res/values-pt/strings_info.xml
index 1e377ba156cf5797ee4fecca6bfc04e8fc8c2f76..5308e888744b683d71082458eb98ddd625846303 100644
--- a/app/src/main/res/values-pt/strings_info.xml
+++ b/app/src/main/res/values-pt/strings_info.xml
@@ -36,7 +36,6 @@
   <string name="label_core_connection_verified_by">Ligação verificada por %1$s</string>
   <string name="label_core_connection_protocol">A ligação utiliza %1$s</string>
   <string name="label_core_connection_ciphersuite">A ligação é encriptada e autenticada utilizando %1$s e usa  %2$s como mecanismo de troca de chaves</string>
-  <string name="label_core_connection_ciphersuite_13">A ligação é encriptada e autenticada utilizando %1$s</string>
   <string name="label_core_connection_verified_by_unknown">Desconhecido</string>
   <string name="label_core_connection_insecure">Ligação insegura</string>
 
diff --git a/app/src/main/res/values-pt/strings_preferences.xml b/app/src/main/res/values-pt/strings_preferences.xml
index c6d2e2cd9b047d865f1190ba47b0251b24027e92..a9ac63740c70425f25a7e71f0af24428657321df 100644
--- a/app/src/main/res/values-pt/strings_preferences.xml
+++ b/app/src/main/res/values-pt/strings_preferences.xml
@@ -35,9 +35,13 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Claro)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Escuro)</string>
   <string name="preference_theme_entry_dracula">Dracula</string>
+
   <string name="preference_input_enter_title">Tecla enter no teclado</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji</string>
   <string name="preference_input_enter_entry_send">Enviar</string>
+  <string name="preference_input_enter_entry_newline">Nova Linha</string>
+
   <string name="preference_show_lag_title">Mostrar atraso</string>
   <string name="preference_show_lag_summary">Exibe o atraso entre o cliente e o núcleo na barra de ação</string>
 
@@ -46,12 +50,19 @@
 
   <string name="preference_language_title">Idioma</string>
   <string name="preference_language_entry_auto">Padrão do Sistema</string>
-  <string name="preference_notifications_title">Notificações</string>
+  <string name="preference_redirection_title">Redirecionamento de mensagens</string>
+  <string name="preference_redirection_user_notices_title">Redirecionar os avisos ao usuário</string>
+  <string name="preference_redirection_user_notices_summary">Exibe avisos do usuário no canal atualmente aberto</string>
+  <string name="preference_redirection_server_notices_title">Redirecionar os avisos de servidor</string>
+  <string name="preference_redirection_server_notices_summary">Exibe os avisos do servidor no canal atualmente aberto</string>
+
+  <string name="preference_redirection_errors_title">Redirecionar erros</string>
+  <string name="preference_redirection_errors_summary">Exibe erros no canal atualmente aberto</string>
 
+  <string name="preference_notifications_title">Notificações</string>
   <string name="preference_notification_query_title">Mensagens Privadas</string>
 
   <string name="preference_notification_channel_title">Mensagens de Canal</string>
-
   <string name="preference_notification_other_title">Outras Mensagens</string>
 
   <string name="preference_notification_sound_title">Som de Notificaçao</string>
@@ -61,16 +72,14 @@
   <string name="preference_notification_light_title">LED</string>
 
   <string name="preference_notification_mark_read_on_swipe_title">Marcar canal como lido ao desmarcar notificações</string>
-  <string name="preference_notification_mark_read_on_swipe_summary">Marca todas as mensagens como lidas quando uma notificação do canal é desmarcada</string>
 
+  <string name="preference_notification_mark_read_on_swipe_summary">Marca todas as mensagens como lidas quando uma notificação do canal é desmarcada</string>
   <string name="preference_notification_network_name_in_notification_title_title">Mostra o nome da rede nas notificações</string>
-
   <string name="preference_notification_show_all_activities_in_toolbar_title">Mostra toda a actividade na barra de tarefas</string>
   <string name="preference_notification_show_all_activities_in_toolbar_summary">Mostra uma bolha colorida na barra de ferramentas para todas as actividades de chat</string>
-
   <string name="preference_notification_configure_title">Configurar Notificações</string>
-
   <string name="preference_notifications_level_all">Todas as Mensagens</string>
+
   <string name="preference_notifications_level_highlight">Menções</string>
   <string name="preference_notifications_level_none">Nunca</string>
   <string name="preference_messages_title">Mensagens</string>
@@ -78,33 +87,32 @@
   <string name="preference_monospace_title">Usar Fonte Monospace</string>
 
   <string name="preference_textsize_title">Tamanho do Texto</string>
-
   <string name="preference_show_seconds_title">Mostrar Segundos</string>
-
   <string name="preference_use_24h_clock_title">Usar Relógio de 24h</string>
 
   <string name="preference_colorize_mirc_title">Usar Cores do mIRC</string>
+
   <string name="preference_colorize_mirc_summaryon">Mostrar cores do mIRC nas mensagens</string>
   <string name="preference_colorize_mirc_summaryoff">Remover as cores do mIRC das mensagens</string>
 
   <string name="preference_colorize_nicknames_title">Colorir nicknames</string>
+
   <string name="preference_colorize_nicknames_entry_all">Todos os nicks</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Todos menos o próprio nick</string>
+
   <string name="preference_colorize_nicknames_entry_none">Nenhum nick</string>
   <string name="preference_show_prefix_title">Mostrar modos de utilizador</string>
   <string name="preference_show_prefix_entry_all">Todos os modos</string>
+
   <string name="preference_show_prefix_entry_highest">Modo mais alto</string>
   <string name="preference_show_prefix_entry_none">Nenhum modo</string>
   <string name="preference_hostmask_actions_title">Mostrar Máscara de anfitrião em ações</string>
   <string name="preference_hostmask_actions_summary">Mostra nick!ident@hostname em mensagens de entrada/saída/desconexão</string>
-
   <string name="preference_nicks_on_new_line_title">Separar Nicknames</string>
-  <string name="preference_nicks_on_new_line_summary">Mostrar nicknames numa linha separada</string>
 
+  <string name="preference_nicks_on_new_line_summary">Mostrar nicknames numa linha separada</string>
   <string name="preference_show_realnames_title">Mostrar Nomes Reais</string>
-
   <string name="preference_show_avatars_title">Mostrar Avatares</string>
-
   <string name="preference_square_avatars_title">Avatares Quadrados</string>
 
   <string name="preference_show_irccloud_avatars_title">Mostrar Avatares IRCCloud</string>
@@ -114,8 +122,8 @@
   <string name="preference_show_gravatar_avatars_summary">Mostra a utilizadores sem avatar, o avatar Gravatar correspondente, se disponível</string>
 
   <string name="preference_show_matrix_avatars_title">Mostrar Avatares Matrix</string>
-  <string name="preference_show_matrix_avatars_summary">Mostra a utilizadores sem avatar, o avatar Matrix correspondente, se disponível</string>
 
+  <string name="preference_show_matrix_avatars_summary">Mostra a utilizadores sem avatar, o avatar Matrix correspondente, se disponível</string>
   <string name="preference_time_at_end_title">Hora Alinhada à Direita</string>
   <string name="preference_time_at_end_summary">Alinha a hora no final de cada mensagem</string>
 
@@ -125,42 +133,49 @@
   <string name="preference_highlight_own_messages_title">Marcar próprias mensagens</string>
   <string name="preference_highlight_own_messages_summary">Mostra as suas mensagens de forma mais proeminente</string>
 
-  <string name="preference_autocomplete_title">Autocompletar</string>
+  <string name="preference_replace_emoji_title">Substitua os Emoji de texto para Emoji</string>
+  <string name="preference_replace_emoji_summary">Substitua automaticamente os código de texto, tais como :+1: ou :like: com emoji</string>
 
+  <string name="preference_autocomplete_title">Autocompletar</string>
   <string name="preference_autocomplete_sender_doubleclick_title">Preenchimento Automático do Remetente</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Clique duas vezes numa mensagem para preencher automaticamente o remetente</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Clique duas vezes numa mensagem para preencher automaticamente o remetente</string>
   <string name="preference_autocomplete_button_title">Botão Auto-completação</string>
-  <string name="preference_autocomplete_button_summary">Mostra um botão à esquerda da caixa de digitação que aciona auto-completação</string>
 
+  <string name="preference_autocomplete_button_summary">Mostra um botão à esquerda da caixa de digitação que aciona auto-completação</string>
   <string name="preference_autocomplete_doubletap_title">Tocar para autocompletar</string>
-  <string name="preference_autocomplete_doubletap_summary">Sugere nicks e canais após clicar duas vezes na caixa de digitação</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Sugere nicks e canais após clicar duas vezes na caixa de digitação</string>
   <string name="preference_autocomplete_auto_title">Mostrar automaticamente</string>
+
+
   <string name="preference_autocomplete_auto_summary">Sugere nicks e canais depois de inserir os 3 primeiros caracteres</string>
 
   <string name="preference_autocomplete_prefix_title">Mostrar após prefixo</string>
   <string name="preference_autocomplete_prefix_summary">Sugere nicks e canais depois de inserir @ ou #</string>
 
   <string name="preference_autocomplete_nicks_title">Preenchimento Automático de Nicknames</string>
-
   <string name="preference_autocomplete_buffers_title">Preenchimento Automático de Chats</string>
-
   <string name="preference_autocomplete_aliases_title">Preenchimento Automático de Comandos</string>
 
+  <string name="preference_autocomplete_emoji_title">Autocomplete Emoji</string>
   <string name="preference_backlog_title">Histórico</string>
 
   <string name="preference_page_size_title">Tamanho da página</string>
   <string name="preference_page_size_summary">O número de mensagens carregadas e mantidas na memória de cada vez</string>
 
   <string name="preference_initial_amount_title">Quantidade inicial</string>
-  <string name="preference_initial_amount_summary">Número de mensagens para carregar ao abrir uma janela pela primeira vez</string>
 
+  <string name="preference_initial_amount_summary">Número de mensagens para carregar ao abrir uma janela pela primeira vez</string>
   <string name="preference_clear_cache_title">Limpar Cache do Historico</string>
-
   <string name="preference_connection_title">Ligação</string>
 
   <string name="preference_show_notification_title">Mostrar notificação</string>
+
+
   <string name="preference_show_notification_summary">Mantém o Quasseldroid sempre conectado, mostrando uma notificação persistente</string>
 
-</resources>
+  <string name="preference_ignore_network_changes_title">Ignorar alterações na rede</string>
+  <string name="preference_ignore_network_changes_summary">Previna Quasseldroid de reconectar-se automaticamente se a rede mudar</string>
+
+  </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a1a888dbbdfa75edec6e913053fdd38459e370f9..80fc018e95f42dcfc307b94c8290d79cae5b4c03 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -20,11 +20,11 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Android baziran klijent za decentralizovani Quassel IRC klijent.</string>
-  <string name="app_description_long">Quassel je distribuirani, decentralizovani IRC klijent, napisan koristeći C++ i Qt. Quasseldroid je klijent za Quassel jezgro napisan u Kotlinu, koji vam omogućava povezivanje na Quassel jezgro koristeći svoj Android™ telefon.</string>
 
+  <string name="app_description_long">Quassel je distribuirani, decentralizovani IRC klijent, napisan koristeći C++ i Qt. Quasseldroid je klijent za Quassel jezgro napisan u Kotlinu, koji vam omogućava povezivanje na Quassel jezgro koristeći svoj Android™ telefon.</string>
   <string name="connection_service_title">Usluga Povezivanja</string>
-  <string name="connection_service_description">Održava vezu sa vašim jezgrom što omogućava dobijanje obaveštenja i slanje poruka.</string>
 
+  <string name="connection_service_description">Održava vezu sa vašim jezgrom što omogućava dobijanje obaveštenja i slanje poruka.</string>
   <string name="label_about">O aplikaciji</string>
   <string name="label_accept">Prihvati</string>
   <string name="label_autocomplete">Automatsko dovršavanje</string>
@@ -111,6 +111,7 @@
   <string name="label_who_long">Ažuriraj korisničke informacije svakog korisnika</string>
   <string name="label_whois">Whois</string>
   <string name="label_whois_long">Ažuriraj korisničke informacije</string>
+
   <string name="label_yes">Da</string>
 
   <string name="label_feature_synchronizedmarkerline">Potrebno za sinhronizovanje poslednje pozicije u kanalima</string>
@@ -145,4 +146,4 @@
   <string name="info_copied_version">Verzija kopirana u klipbord</string>
 
   <string name="advertisement_support_patreon">Molimo Vas da podržite razvoj ove aplikacije na Patreonu</string>
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-sr/strings_preferences.xml b/app/src/main/res/values-sr/strings_preferences.xml
index f5da5691118b85a43139c346cb12c2e640e4d214..e7c8487620f0ccbdc9412335eedf728806896d49 100644
--- a/app/src/main/res/values-sr/strings_preferences.xml
+++ b/app/src/main/res/values-sr/strings_preferences.xml
@@ -35,7 +35,9 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Svijetlo)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Tamno)</string>
   <string name="preference_theme_entry_dracula">Drakula</string>
+
   <string name="preference_input_enter_title">Funkcija \"Enter\" dugmeta na tastaturi</string>
+
   <string name="preference_input_enter_entry_emoji">Emoji</string>
   <string name="preference_input_enter_entry_send">Pošalji</string>
   <string name="preference_show_lag_title">Prikazuj kašnjenje</string>
@@ -47,11 +49,9 @@
   <string name="preference_language_title">Jezik</string>
   <string name="preference_language_entry_auto">Sistemski zadato</string>
   <string name="preference_notifications_title">Obavještenja</string>
-
   <string name="preference_notification_query_title">Direktne poruke</string>
 
   <string name="preference_notification_channel_title">Poruke kanala</string>
-
   <string name="preference_notification_other_title">Druge poruke</string>
 
   <string name="preference_notification_sound_title">Zvuk obaveštenja</string>
@@ -61,11 +61,11 @@
   <string name="preference_notification_light_title">LED</string>
 
   <string name="preference_notification_mark_read_on_swipe_title">Označi kanal pročitanim pri uklanjanju notifikacija</string>
-  <string name="preference_notification_mark_read_on_swipe_summary">Označava sve poruke u kanalu pročitanim kada je notifikacija vezana za kanal uklonjena</string>
 
+  <string name="preference_notification_mark_read_on_swipe_summary">Označava sve poruke u kanalu pročitanim kada je notifikacija vezana za kanal uklonjena</string>
   <string name="preference_notification_configure_title">Podesi obavještenja</string>
-
   <string name="preference_notifications_level_all">Sve poruke</string>
+
   <string name="preference_notifications_level_highlight">Spominjanja</string>
   <string name="preference_notifications_level_none">Nikad</string>
   <string name="preference_messages_title">Poruke</string>
@@ -73,33 +73,32 @@
   <string name="preference_monospace_title">Koristi monospace font</string>
 
   <string name="preference_textsize_title">Veličina teksta</string>
-
   <string name="preference_show_seconds_title">Prikazuj sekunde</string>
-
   <string name="preference_use_24h_clock_title">Koristi 24-časovni sat</string>
 
   <string name="preference_colorize_mirc_title">Koristi mIRC boje</string>
+
   <string name="preference_colorize_mirc_summaryon">Prikazuj mIRC boje u porukama</string>
   <string name="preference_colorize_mirc_summaryoff">Ukloni mIRC boje sa poruka</string>
 
   <string name="preference_colorize_nicknames_title">Oboji nadimke</string>
+
   <string name="preference_colorize_nicknames_entry_all">Svi nadimci</string>
   <string name="preference_colorize_nicknames_entry_all_but_mine">Svi sem sopstvenog nadimka</string>
+
   <string name="preference_colorize_nicknames_entry_none">Nijedan nadimak</string>
   <string name="preference_show_prefix_title">Prikazuj mod pošiljaoca</string>
   <string name="preference_show_prefix_entry_all">Svi modovi</string>
+
   <string name="preference_show_prefix_entry_highest">Najviši mod</string>
   <string name="preference_show_prefix_entry_none">Nijedan mod</string>
   <string name="preference_hostmask_actions_title">Prikazuj Hostmask u komandama</string>
   <string name="preference_hostmask_actions_summary">Prikaži čitav nick!ident@host u join/part/quit porukama</string>
-
   <string name="preference_nicks_on_new_line_title">Razdvoji nadimke</string>
-  <string name="preference_nicks_on_new_line_summary">Prikazuje nadimke na odvojenoj liniji</string>
 
+  <string name="preference_nicks_on_new_line_summary">Prikazuje nadimke na odvojenoj liniji</string>
   <string name="preference_show_realnames_title">Prikazuj Realname</string>
-
   <string name="preference_show_avatars_title">Prikazuj avatare</string>
-
   <string name="preference_square_avatars_title">Kvadratni avatari</string>
 
   <string name="preference_show_irccloud_avatars_title">Prikazuj IRCCloud avatare</string>
@@ -109,8 +108,8 @@
   <string name="preference_show_gravatar_avatars_summary">Prikazuje korisnicima bez avatara njihov Gravatar, ako je dostupan</string>
 
   <string name="preference_show_matrix_avatars_title">Prikazuj Matrix avatare</string>
-  <string name="preference_show_matrix_avatars_summary">Prikazuje korisnicima bez avatara njihov Matrix avatar, ako je dostupan</string>
 
+  <string name="preference_show_matrix_avatars_summary">Prikazuje korisnicima bez avatara njihov Matrix avatar, ako je dostupan</string>
   <string name="preference_time_at_end_title">Desno poravnata vremenska oznaka</string>
   <string name="preference_time_at_end_summary">Poravnava vremenske oznake na kraju svake poruke</string>
 
@@ -121,26 +120,25 @@
   <string name="preference_highlight_own_messages_summary">Prikazuje vaše poruke upadljivije</string>
 
   <string name="preference_autocomplete_title">Automatsko dovršavanje</string>
-
   <string name="preference_autocomplete_sender_doubleclick_title">Automatsko dovršavanje pošiljaoca</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Dupli dodir na poruku za automatsko dovršavanje njenog pošaljioca</string>
 
+  <string name="preference_autocomplete_sender_doubleclick_summary">Dupli dodir na poruku za automatsko dovršavanje njenog pošaljioca</string>
   <string name="preference_autocomplete_button_title">Dugme za automatsko dovršavanje</string>
-  <string name="preference_autocomplete_button_summary">Prikazuje dugme sa leve strane polja unos koje pokreće automatsko dovršavanje</string>
 
+  <string name="preference_autocomplete_button_summary">Prikazuje dugme sa leve strane polja unos koje pokreće automatsko dovršavanje</string>
   <string name="preference_autocomplete_doubletap_title">Dupli dodir za automatsko dovršavanje</string>
-  <string name="preference_autocomplete_doubletap_summary">Predloži nadimke i kanale posle duplog dodira na polje za unos</string>
 
+  <string name="preference_autocomplete_doubletap_summary">Predloži nadimke i kanale posle duplog dodira na polje za unos</string>
   <string name="preference_autocomplete_auto_title">Prikazuj automatski</string>
+
+
   <string name="preference_autocomplete_auto_summary">Predloži nadimke i kanale posle unosa prva 3 znaka</string>
 
   <string name="preference_autocomplete_prefix_title">Prikaži posle prefiksa</string>
   <string name="preference_autocomplete_prefix_summary">Predloži nadimke i kanale posle unosa @ ili #</string>
 
   <string name="preference_autocomplete_nicks_title">Automatski dovrši nadimke</string>
-
   <string name="preference_autocomplete_buffers_title">Automatski dovrši razgovore</string>
-
   <string name="preference_autocomplete_aliases_title">Automatski dovrši komande</string>
 
   <string name="preference_backlog_title">Zaostale poruke</string>
@@ -149,11 +147,13 @@
   <string name="preference_page_size_summary">Broj poruka učitanih i zadržanih u memoriji</string>
 
   <string name="preference_initial_amount_title">Početna količina</string>
-  <string name="preference_initial_amount_summary">Broj poruka koje će biti učitane pri prvom otvaranju bafera</string>
 
+  <string name="preference_initial_amount_summary">Broj poruka koje će biti učitane pri prvom otvaranju bafera</string>
   <string name="preference_connection_title">Veza</string>
 
   <string name="preference_show_notification_title">Prikazuj obavještenja</string>
+
+
   <string name="preference_show_notification_summary">Održava Quasseldroid povezanim koristeći trajno obaveštenje</string>
 
-</resources>
+  </resources>