diff --git a/.tx/config b/.tx/config
index fac5a31f0c848139b907cd085974d91517b0140a..56bcd977599c4573ac24d37998d386f15efcde49 100644
--- a/.tx/config
+++ b/.tx/config
@@ -6,118 +6,140 @@ type = ANDROID
 source_file = app/src/main/res/values/strings_status.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_status.xml
+trans.fr = app/src/main/res/values-fr/strings_status.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_status.xml
+trans.nl = app/src/main/res/values-nl/strings_status.xml
 trans.lt = app/src/main/res/values-lt/strings_status.xml
 trans.pt = app/src/main/res/values-pt/strings_status.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_status.xml
 trans.sr = app/src/main/res/values-sr/strings_status.xml
-trans.fr = app/src/main/res/values-fr/strings_status.xml
 
 [quasseldroid-1.strings_errorxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_error.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_error.xml
+trans.fr = app/src/main/res/values-fr/strings_error.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_error.xml
+trans.nl = app/src/main/res/values-nl/strings_error.xml
 trans.lt = app/src/main/res/values-lt/strings_error.xml
 trans.pt = app/src/main/res/values-pt/strings_error.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_error.xml
 trans.sr = app/src/main/res/values-sr/strings_error.xml
-trans.fr = app/src/main/res/values-fr/strings_error.xml
 
 [quasseldroid-1.strings_defaultsxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_defaults.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_defaults.xml
+trans.fr = app/src/main/res/values-fr/strings_defaults.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_defaults.xml
+trans.nl = app/src/main/res/values-nl/strings_defaults.xml
 trans.lt = app/src/main/res/values-lt/strings_defaults.xml
 trans.pt = app/src/main/res/values-pt/strings_defaults.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_defaults.xml
 trans.sr = app/src/main/res/values-sr/strings_defaults.xml
-trans.fr = app/src/main/res/values-fr/strings_defaults.xml
 
 [quasseldroid-1.strings_formatxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_format.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_format.xml
+trans.fr = app/src/main/res/values-fr/strings_format.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_format.xml
+trans.nl = app/src/main/res/values-nl/strings_format.xml
 trans.lt = app/src/main/res/values-lt/strings_format.xml
 trans.pt = app/src/main/res/values-pt/strings_format.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_format.xml
 trans.sr = app/src/main/res/values-sr/strings_format.xml
-trans.fr = app/src/main/res/values-fr/strings_format.xml
 
 [quasseldroid-1.strings_preferencesxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_preferences.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_preferences.xml
+trans.fr = app/src/main/res/values-fr/strings_preferences.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_preferences.xml
+trans.nl = app/src/main/res/values-nl/strings_preferences.xml
 trans.lt = app/src/main/res/values-lt/strings_preferences.xml
 trans.pt = app/src/main/res/values-pt/strings_preferences.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_preferences.xml
 trans.sr = app/src/main/res/values-sr/strings_preferences.xml
-trans.fr = app/src/main/res/values-fr/strings_preferences.xml
 
 [quasseldroid-1.strings_messagesxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_messages.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_messages.xml
+trans.fr = app/src/main/res/values-fr/strings_messages.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_messages.xml
+trans.nl = app/src/main/res/values-nl/strings_messages.xml
 trans.lt = app/src/main/res/values-lt/strings_messages.xml
 trans.pt = app/src/main/res/values-pt/strings_messages.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_messages.xml
 trans.sr = app/src/main/res/values-sr/strings_messages.xml
-trans.fr = app/src/main/res/values-fr/strings_messages.xml
 
 [quasseldroid-1.stringsxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings.xml
+trans.fr = app/src/main/res/values-fr/strings.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings.xml
+trans.nl = app/src/main/res/values-nl/strings.xml
 trans.lt = app/src/main/res/values-lt/strings.xml
 trans.pt = app/src/main/res/values-pt/strings.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings.xml
 trans.sr = app/src/main/res/values-sr/strings.xml
-trans.fr = app/src/main/res/values-fr/strings.xml
 
 [quasseldroid-1.strings_setupxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_setup.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_setup.xml
+trans.fr = app/src/main/res/values-fr/strings_setup.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_setup.xml
+trans.nl = app/src/main/res/values-nl/strings_setup.xml
 trans.lt = app/src/main/res/values-lt/strings_setup.xml
 trans.pt = app/src/main/res/values-pt/strings_setup.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_setup.xml
 trans.sr = app/src/main/res/values-sr/strings_setup.xml
-trans.fr = app/src/main/res/values-fr/strings_setup.xml
 
 [quasseldroid-1.strings_contributorsxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_contributors.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_contributors.xml
+trans.fr = app/src/main/res/values-fr/strings_contributors.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_contributors.xml
+trans.nl = app/src/main/res/values-nl/strings_contributors.xml
 trans.lt = app/src/main/res/values-lt/strings_contributors.xml
 trans.pt = app/src/main/res/values-pt/strings_contributors.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_contributors.xml
 trans.sr = app/src/main/res/values-sr/strings_contributors.xml
-trans.fr = app/src/main/res/values-fr/strings_contributors.xml
 
 [quasseldroid-1.strings_infoxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_info.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_info.xml
+trans.fr = app/src/main/res/values-fr/strings_info.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_info.xml
+trans.nl = app/src/main/res/values-nl/strings_info.xml
 trans.lt = app/src/main/res/values-lt/strings_info.xml
 trans.pt = app/src/main/res/values-pt/strings_info.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_info.xml
 trans.sr = app/src/main/res/values-sr/strings_info.xml
-trans.fr = app/src/main/res/values-fr/strings_info.xml
 
 [quasseldroid-1.strings_settingsxml]
 type = ANDROID
 source_file = app/src/main/res/values/strings_settings.xml
 source_lang = en
 trans.de = app/src/main/res/values-de/strings_settings.xml
+trans.fr = app/src/main/res/values-fr/strings_settings.xml
+trans.fr_CA = app/src/main/res/values-fr-rCA/strings_settings.xml
+trans.nl = app/src/main/res/values-nl/strings_settings.xml
 trans.lt = app/src/main/res/values-lt/strings_settings.xml
 trans.pt = app/src/main/res/values-pt/strings_settings.xml
 trans.pt_BR = app/src/main/res/values-pt-rBR/strings_settings.xml
 trans.sr = app/src/main/res/values-sr/strings_settings.xml
-trans.fr = app/src/main/res/values-fr/strings_settings.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 41b469fd61581843d9df0c642ff31c8a33ab09d9..4e6822916f272c5b9ce4d979c116a5a2dc666237 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -63,7 +63,7 @@ android {
 
     signingConfig = signingConfigs.findByName("default")
 
-    resConfigs("en", "de", "lt", "pt")
+    resConfigs("en", "de", "fr-rCA", "lt", "pt")
 
     vectorDrawables.useSupportLibrary = true
 
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index b5387c98248283e3fd4292c678d533a23f27ffc8..1a9b9d71cb76e0b172e0c30e4f98e6e09f0774c8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -361,6 +361,14 @@ class AboutFragment : DaggerFragment() {
         name = "Janne Koschinski",
         language = R.string.preference_language_entry_de
       ),
+      Translator(
+        name = "xi <xi@nuxi.ca>",
+        language = R.string.preference_language_entry_fr_ca
+      ),
+      Translator(
+        name = "Noatak",
+        language = R.string.preference_language_entry_nl
+      ),
       Translator(
         name = "TDa_",
         language = R.string.preference_language_entry_lt
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dade7259508ebd3739f31553b53dd8031be2bf1e..9bd70f4ccd4238df3648045949874e2baaa064a3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,6 +26,7 @@
   <string name="connection_service_description">Hält eine Verbindung zum Core, um Benachrichtigungen und die Übertragung von Nachrichten zu ermöglichen</string>
 
   <string name="label_about">Über</string>
+  <string name="label_accept">Akzeptieren</string>
   <string name="label_avatar">Avatar</string>
   <string name="label_back">Zurück</string>
   <string name="label_buffer_name">Chatname</string>
@@ -107,9 +108,28 @@
   <string name="label_whois_long">Nutzerinformationen aktualisieren</string>
   <string name="label_yes">Ja</string>
 
+  <string name="label_feature_synchronizedmarkerline">Benötigt um die vorherige Position in Chats zu synchronisieren</string>
+  <string name="label_feature_saslauthentication">Benötigt für SASL</string>
+  <string name="label_feature_saslexternal">Benötigt für SASL mit Zertifikaten</string>
+  <string name="label_feature_hideinactivenetworks">Benötigt um inaktive Netzwerke aus Chatlisten auszublenden</string>
+  <string name="label_feature_passwordchange">Benötigt um Passwörter zu ändern.</string>
+  <string name="label_feature_capnegotiation">Benötigt für IRCv3-Features</string>
+  <string name="label_feature_verifyserverssl">Benötigt um das SSL-Zertifikat von IRC-Netzwerken zu verifizieren</string>
+  <string name="label_feature_customratelimits">Benötigt um benutzerdefinierte Grenzwerte für IRC-Netzwerke festzulegen</string>
+  <string name="label_feature_awayformattimestamp">Benötigt um benutzerdefinierte Zeitformate in Abwesenheitsnachrichten zu verwenden</string>
+  <string name="label_feature_bufferactivitysync">Benötigt um die Aktivität von Chats in Chatlisten zu sehen</string>
+  <string name="label_feature_coresidehighlights">Benötigt für Hervorhebungen</string>
+  <string name="label_feature_senderprefixes">Benötigt um die Präfixe (+, @) von Nutzern in Nachrichten zu sehen</string>
+  <string name="label_feature_remotedisconnect">Benötigt um die Verbindung eigener Clients aus der Ferne zu trennen</string>
+  <string name="label_feature_richmessages">Benötigt um Echtnamen oder IRCv3 oder Gravatar-Avatare in Nachrichten zu sehen.</string>
+  <string name="label_feature_backlogfiltertype">Benötigt um vergangene Benachrichtigungen nach dem Verbinden zu erhalten</string>
+
   <string name="notification_channel_connection_title">Verbindung</string>
   <string name="notification_channel_highlight_title">Erwähnungen</string>
 
+  <string name="label_missing_features">Fehlende Features</string>
+  <string name="info_missing_features">Deinem Core fehlen bestimmte Features die benötigt werden damit Quasseldroid korrekt funktionieren kann</string>
+
   <string name="buffer_delete_confirmation">Bist du sicher, dass du diesen Chat auf ewig löschen möchtest?</string>
 
   <string name="delete_confirmation">Bist du sicher, dass du dies auf ewig löschen möchtest? Dies kann nicht Rückgängig gemacht werden.</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d8c1daa8ca45dfc628e8d579ce8f5b0bc62daab
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <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="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="label_about">À Propos</string>
+  <string name="label_accept">Accepter</string>
+  <string name="label_avatar">Avatar</string>
+  <string name="label_back">Retour</string>
+  <string name="label_buffer_name">Nom du Tchat</string>
+  <string name="label_cancel">Annuler</string>
+  <string name="label_update_user_password">Mettre à Jour l\'Utilisateur ou le Mot de Passe</string>
+  <string name="label_certificates">Certificats</string>
+  <string name="label_close">Fermer</string>
+  <string name="label_colors_custom">Personnalisé</string>
+  <string name="label_colors_mirc">mIRC</string>
+  <string name="label_configure">Configurer</string>
+  <string name="label_connect">Connecter</string>
+  <string name="label_contributors">Contributeurs</string>
+  <string name="label_copy">Copier</string>
+  <string name="label_crashes">Crashes</string>
+  <string name="label_delete">Supprimer</string>
+  <string name="label_delete_all">Supprimer Tout</string>
+  <string name="label_disconnect">Déconnecter</string>
+  <string name="label_edit_nick">Changer le Nom d\'Utilisateur</string>
+  <string name="label_edit_topic">Changer le Topique</string>
+  <string name="label_edit_topic_long">Ouvrir un dialogue pour changer le topique de la chaîne</string>
+  <string name="label_filter_messages">Filtrer les Messages</string>
+  <string name="label_github">GitHub</string>
+  <string name="label_hide_perm">Cacher en Permanence</string>
+  <string name="label_hide_temp">Cacher Temporairement</string>
+  <string name="label_ignore">Ignorer</string>
+  <string name="label_ignore_long">Ajouter ou Supprimer des utilisateurs de la liste des utilisateurs ignorés</string>
+  <string name="label_info_channel">Détails de la Chaîne</string>
+  <string name="label_info_user">Détails des Utilisateurs</string>
+  <string name="label_input_history">Historique des Entrées</string>
+  <string name="label_join">Joindre</string>
+  <string name="label_join_long">Joindre la Chaîne</string>
+  <string name="label_libraries">Librairies</string>
+  <string name="label_license">Licence</string>
+  <string name="label_mark_read">Marquer Comme Lu</string>
+  <string name="label_mention">Mentionner</string>
+  <string name="label_mention_long">Copier le nom d\'utilisateur dans la zone de texte</string>
+  <string name="label_new_account">Nouveau Compte</string>
+  <string name="label_new_chatlist">Nouvelle Liste de Tchats</string>
+  <string name="label_new_highlight_rule">Nouvelle Règle de Highlight</string>
+  <string name="label_new_highlight_ignore_rule">Nouvelle Règle de Highlight à Ignorer</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 d\'Utilisateur</string>
+  <string name="label_new_server">Nouveau Serveur</string>
+  <string name="label_nicklist">Liste de Noms</string>
+  <string name="label_no">Non</string>
+  <string name="label_no_away_message">Aucuns Messages d\'Absence Disponibles</string>
+  <string name="label_no_sound">Aucun</string>
+  <string name="label_reply">Répondre</string>
+  <string name="label_reset">Réinitialiser</string>
+  <string name="label_open">Ouvrir</string>
+  <string name="label_part">Partir</string>
+  <string name="label_part_long">Partir de la Chaîne</string>
+  <string name="label_placeholder_message">Inscrivez un message…</string>
+  <string name="label_placeholder_topic">Inscrivez le Topique de la Chaîne…</string>
+  <string name="label_privacy_policy">Politique de Confidentialité</string>
+  <string name="label_query">Requêter</string>
+  <string name="label_query_long">Ouvrir une session privée avec cet utilisateur</string>
+  <string name="label_rename">Renommer</string>
+  <string name="label_save">Enregistrer</string>
+  <string name="label_select">Sélectionner</string>
+  <string name="label_settings">Paramètres</string>
+  <string name="label_settings_client">Paramètres du Client</string>
+  <string name="label_settings_core">Paramètres du Core</string>
+  <string name="label_share">Partager</string>
+  <string name="label_share_crashreport">Partager le Rapport du Crash</string>
+  <string name="label_show_hidden">Montrer les Objets Cachés</string>
+  <string name="label_topic">Topique de la Chaîne</string>
+  <string name="label_translators">Traducteurs</string>
+  <string name="label_unhide">Rendre Visible</string>
+  <string name="label_website">Site Web</string>
+  <string name="label_whitelist">Ignorer</string>
+  <string name="label_whitelist_ignore_date">La date d\'expiration est ignorée pour ce certificat</string>
+  <string name="label_whitelist_certificates">Certificats</string>
+  <string name="label_whitelist_hostnames">Hosts</string>
+  <string name="label_who">Who</string>
+  <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>
+  <string name="label_feature_saslauthentication">Requis pour le protocole SASL</string>
+  <string name="label_feature_saslexternal">Requis pour le protocole SASL avec certificats</string>
+  <string name="label_feature_hideinactivenetworks">Requis pour cacher les réseaux inactifs de la liste de tchats</string>
+  <string name="label_feature_passwordchange">Requis pour changer les mots de passe à partir du client</string>
+  <string name="label_feature_capnegotiation">Requis pour les capacités IRCv3</string>
+  <string name="label_feature_verifyserverssl">Requis pour vérifier les certificats SSL des réseaux IRC durant la connection</string>
+  <string name="label_feature_customratelimits">Requis pour spécifier des limites de fréquence personnalisées aux réseaux IRC</string>
+  <string name="label_feature_awayformattimestamp">Requis pour les marqueurs de temps personnalisés dans les messages d\'absence</string>
+  <string name="label_feature_bufferactivitysync">Requis pour voir l\'activité des tchats dans la liste de tchats</string>
+  <string name="label_feature_coresidehighlights">Requis pour les highlights</string>
+  <string name="label_feature_senderprefixes">Requis pour voir les préfixes de modes (+, @) des utilisateurs dans les messages</string>
+  <string name="label_feature_remotedisconnect">Requis pour déconnecter vos propres clients à distance</string>
+  <string name="label_feature_richmessages">Requis pour voir les vrais noms ou les avatars IRCv3 ou Gravatar dans les messages</string>
+  <string name="label_feature_backlogfiltertype">Requis pour recevoir des notifications antérieures après la connection</string>
+
+  <string name="notification_channel_connection_title">Connection</string>
+  <string name="notification_channel_highlight_title">Highlight</string>
+
+  <string name="label_missing_features">Fonctionnalités Manquantes</string>
+  <string name="info_missing_features">Votre Core manque certaines fonctionnalités qui sont requises pour que Quasseldroid marche correctement.</string>
+
+  <string name="buffer_delete_confirmation">Voulez-vous supprimer ce tchat en permanence?</string>
+
+  <string name="delete_confirmation">Êtes-vous surs que vous voulez supprimer ceci en permanence? Cette action ne peut pas être réparée.</string>
+  <string name="cancel_confirmation">Vous avez des changements non-sauvegardés. Voulez-vous les abandonner?</string>
+
+  <string name="info_copied_version">Version copiée au clipboard</string>
+
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_contributors.xml b/app/src/main/res/values-fr-rCA/strings_contributors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67dd52a0815b44c2913b00fa9ac58023dd07e141
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_contributors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="contributor_description_freqmod">Attentats de deserialization initiale du QDataStream</string>
+  <string name="contributor_description_sandsmark">Implementation du vieux protocole, (dé)sérialiseurs, (dé)moralisateur du projet</string>
+  <string name="contributor_description_magnuf">Vieille Interface</string>
+  <string name="contributor_description_kenji">Vieille Interface</string>
+  <string name="contributor_description_justjanne">Réécriture, Interface, Processeurs d\'Annotations, Backend</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_defaults.xml b/app/src/main/res/values-fr-rCA/strings_defaults.xml
new file mode 100644
index 0000000000000000000000000000000000000000..016cf3e4d70349b91a408e62cd96ddfb7b4a49f0
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_defaults.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+  
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+  
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="default_bufferviewconfig_name">Tous les Tchats</string>
+
+  <string name="default_identity_identity_name">Identité par Défaut</string>
+  <string name="default_identity_realname">Utilisateur IRC Quassel</string>
+  <string name="default_identity_awayreason">Parti pêcher.</string>
+  <string name="default_identity_autoawayreason">Pas ici. Non, vraiment. Pas ici!</string>
+  <string name="default_identity_detachawayreason">Tous les clients Quassel ont disparu de la surface de la Terre…</string>
+  <string name="default_identity_kickreason">La garderie est loin d\'ici!</string>
+  <string name="default_identity_partreason">https://quassel-irc.org - Tchattez confortablement. N\'importe-où.</string>
+  <string name="default_identity_quitreason">https://quassel-irc.org - Tchattez confortablement. N\'importe-où.</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_error.xml b/app/src/main/res/values-fr-rCA/strings_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..07a4007dd3b6157ae07a2744b2124430a18803b1
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_error.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="label_error_login">Erreur d\'Authentication</string>
+  <string name="label_error_setup">Erreur d\'Initalisation</string>
+  <string name="label_error_init">Erreur de Connection</string>
+  <string name="label_error_certificate">Erreur de Certificat</string>
+  <string name="label_error_certificate_no_certificate">Aucuns certificats disponibles</string>
+  <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>
+]]></string>
+  <string name="label_error_certificate_untrusted"><![CDATA[
+    <p>Le certificat avec l\'emprunte<br/>
+    <code>%1$s</code><br/>
+    n\'est pas fiable.</p>
+]]></string>
+  <string name="label_error_certificate_no_match"><![CDATA[
+    <p>Le certificat avec l\'emprunte<br/>
+    <code>%1$s</code><br/>
+    n\'est pas valide pour %2$s.</p>
+]]></string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_format.xml b/app/src/main/res/values-fr-rCA/strings_format.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47c2f4e37cb05a448151d5456cb4eed710fffbe9
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_format.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="label_bold">Gras</string>
+  <string name="label_italic">Italique</string>
+  <string name="label_strikethrough">Biffé</string>
+  <string name="label_underline">Souligné</string>
+  <string name="label_monospace">Monospace</string>
+  <string name="label_foreground">Couleur de l\'Avant-Plan</string>
+  <string name="label_background">Couleur de l\'Arrière-Plan</string>
+  <string name="label_clear_formatting">Restaurer les Formats par Défaut</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_info.xml b/app/src/main/res/values-fr-rCA/strings_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4f508a5cda5b22c0a8744ede9cf42a590f2cd2a
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_info.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="label_user_away">Absent</string>
+  <string name="label_user_away_reason">Raison</string>
+  <string name="label_user_identity">Identité</string>
+  <string name="label_user_account">Compte</string>
+  <string name="label_user_ident">Identité</string>
+  <string name="label_user_host">Hôte</string>
+  <string name="label_user_server">Serveur</string>
+
+  <string name="property_group_ircchannel_channel">Chaîne</string>
+  <string name="property_ircchannel_topic">Topique</string>
+  <string name="property_ircchannel_topic_action_edit">Changer le Topique</string>
+  <string name="property_ircchannel_topic_default">Aucun Topique</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_messages.xml b/app/src/main/res/values-fr-rCA/strings_messages.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8878979ff7e126a68e1534d5c174f06ab37dab84
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_messages.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="message_type_join">Joindre</string>
+  <string name="message_type_part">Partir</string>
+  <string name="message_type_quit">Quitter</string>
+  <string name="message_type_nick">Nom</string>
+  <string name="message_type_mode">Mode</string>
+  <string name="message_type_topic">Topique</string>
+  <string name="message_format_copy">[%1$s] %2$s</string>
+  <string name="message_format_copy_complex">[%1$s] &lt; %2$s&gt; %3$s</string>
+
+  <string name="message_format_action">— %1$s%2$s %3$s</string>
+  <string name="message_format_notice">[%1$s%2$s] %3$s</string>
+  <string name="message_format_nick">%1$s%2$s est maintenant connu selon: %3$s%4$s</string>
+  <string name="message_format_nick_self">Vous êtes maintenant connus selon: %1$s%2$s</string>
+  <string name="message_format_mode">Mode %1$s par %2$s%3$s</string>
+  <string name="message_format_join">%1$s%2$s a joint %3$s</string>
+  <string name="message_format_part_1">%1$s%2$s est parti</string>
+  <string name="message_format_part_2">%1$s%2$s est parti (%3$s)</string>
+  <string name="message_format_quit_1">%1$s%2$s a quitté</string>
+  <string name="message_format_quit_2">%1$s%2$s a quitté (%3$s)</string>
+  <string name="message_format_kick_1">%1$s a été expulsé %2$s%3$s</string>
+  <string name="message_format_kick_2">%1$s a été expulsé par %2$s%3$s (%4$s)</string>
+  <string name="message_format_kill_1">%1$s a été supprimé %2$s%3$s</string>
+  <string name="message_format_kill_2">%1$s a été supprimé par %2$s%3$s (%4$s)</string>
+  <plurals name="message_netsplit_join">
+    <item quantity="one">Netsplit entre %1$s et %2$s est terminé: %3$d nouvel utilisateur</item>
+    <item quantity="other">Netsplit entre %1$s et %2$s est terminé: %3$d nouveaux utilisateurs</item>
+  </plurals>
+  <plurals name="message_netsplit_quit">
+    <item quantity="one">Netsplit entre %1$s et %2$s: %3$d utilisateur a quitté</item>
+    <item quantity="other">Netsplit entre %1$s et %2$s: %3$d utilisateurs ont quittés</item>
+  </plurals>
+</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
new file mode 100644
index 0000000000000000000000000000000000000000..913f3c06a8a8ba889587f5a4e6629963059d4b02
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="preference_appearance_title">Apparences</string>
+
+  <string name="preference_theme_title">Thèmes</string>
+  <string name="preference_theme_entry_material_light">Material (Clair)</string>
+  <string name="preference_theme_entry_material_dark">Material (Sombre)</string>
+  <string name="preference_theme_entry_quassel_light">Quassel (Clair)</string>
+  <string name="preference_theme_entry_quassel_dark">Quassel (Sombre)</string>
+  <string name="preference_theme_entry_amoled">AMOLED</string>
+  <string name="preference_theme_entry_solarized_light">Solarized (Clair)</string>
+  <string name="preference_theme_entry_solarized_dark">Solarized (Sombre)</string>
+  <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>
+  <string name="preference_show_lag_summary">Montrer le lag entre le Client et le Core dans la barre d\'action</string>
+
+  <string name="preference_keep_screen_on_title">Garder l\'Écran Actif</string>
+  <string name="preference_keep_screen_on_summary">Prévenir l\'appareil de se mettre en veille pendant que l\'application est dans l\'avant-plan</string>
+
+  <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>
+
+  <string name="preference_notification_vibration_title">Vibration</string>
+
+  <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>
+
+  <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_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>
+  <string name="preference_show_irccloud_avatars_summary">Montrer, pour les utilisateurs sans avatars, leur avatar IRCCloud si possible</string>
+
+  <string name="preference_show_gravatar_avatars_title">Montrer les Avatars Gravatar</string>
+  <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_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>
+
+  <string name="preference_larger_emoji_title">Réactions Plus Grosses</string>
+  <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_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_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_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>
+
+  <string name="preference_page_size_title">Taille de la Page</string>
+  <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_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>
diff --git a/app/src/main/res/values-fr-rCA/strings_settings.xml b/app/src/main/res/values-fr-rCA/strings_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96f59fd0ab9515c645b71eeb8decb3be8bee447a
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_settings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="settings_networks_title">Réseaux</string>
+  <string name="settings_network_title">Réseaux</string>
+  <string name="settings_network_network_name">Noms de Réseaux</string>
+  <string name="settings_network_identity">Identités</string>
+  <string name="settings_network_sasl_enabled">SASL</string>
+  <string name="settings_network_sasl_account">Compte</string>
+  <string name="settings_network_sasl_password">Mot de Passe</string>
+  <string name="settings_network_autoidentify_enabled">S\'Identifier Automatiquement</string>
+  <string name="settings_network_autoidentify_service">Service</string>
+  <string name="settings_network_autoidentify_password">Mot de Passe</string>
+  <string name="settings_network_connection">Connection</string>
+  <string name="settings_network_perform">Performer</string>
+  <string name="settings_network_rejoin_channels">Rejoindre les Chaînes</string>
+  <string name="settings_network_autoreconnect_enabled">Reconnection Automatique</string>
+  <string name="settings_network_autoreconnect_interval">Intervalle</string>
+  <string name="settings_network_autoreconnect_interval_unit">secondes</string>
+  <string name="settings_network_autoreconnect_attempts">Attentats Maximales</string>
+  <string name="settings_network_autoreconnect_unlimited">Attentats Illimités</string>
+  <string name="settings_network_customratelimits_enabled">Limite de Fréquence Personnalisée</string>
+  <string name="settings_network_customratelimits_burstsize">Grosseur des Rafales</string>
+  <string name="settings_network_customratelimits_unlimited">Illimité</string>
+  <string name="settings_network_customratelimits_delay">Délais</string>
+  <string name="settings_network_customratelimits_interval_unit">secondes</string>
+
+  <string name="settings_networkserver_title">Serveur du Réseau</string>
+  <string name="settings_networkserver_connection">Connection</string>
+  <string name="settings_networkserver_host">Hôte</string>
+  <string name="settings_networkserver_port">Port</string>
+  <string name="settings_networkserver_ssl_enabled">Utiliser SSL</string>
+  <string name="settings_networkserver_ssl_verify">Vérifier SSL</string>
+  <string name="settings_networkserver_password">Mot de Passe</string>
+  <string name="settings_networkserver_proxy_enabled">Utiliser un Proxy</string>
+  <string name="settings_networkserver_proxy_type">Type</string>
+  <string name="settings_networkserver_proxy_type_http">HTTP</string>
+  <string name="settings_networkserver_proxy_type_socks5">SOCKS 5</string>
+  <string name="settings_networkserver_proxy_host">Hôte</string>
+  <string name="settings_networkserver_proxy_port">Port</string>
+  <string name="settings_networkserver_proxy_user">Nom d\'Utilisateur</string>
+  <string name="settings_networkserver_proxy_pass">Mot de Passe</string>
+
+  <string name="settings_identities_title">Identités</string>
+  <string name="settings_identity_title">Identité</string>
+  <string name="settings_identity_names">Noms</string>
+  <string name="settings_identity_identity_name">Nom d\'Identité</string>
+  <string name="settings_identity_real_name">Nom Réel</string>
+  <string name="settings_identity_ident">Identité</string>
+  <string name="settings_identity_nick">Nom d\'Utilisateur</string>
+  <string name="settings_identity_nicks">Noms d\'Utilisateur</string>
+  <string name="settings_identity_messages">Messages</string>
+  <string name="settings_identity_kick_reason">Raison d\'Expulsion</string>
+  <string name="settings_identity_part_reason">Raison de Départure</string>
+  <string name="settings_identity_quit_reason">Raison de Déconnection</string>
+  <string name="settings_identity_away">Messages d\'Absence</string>
+  <string name="settings_identity_away_reason">Message d\'Absence</string>
+  <string name="settings_identity_detach_away">Absent si Détaché</string>
+  <string name="settings_identity_detach_away_reason">Message d\'Absence Quand Détaché</string>
+
+  <string name="settings_chatlists_title">Listes de Tchats</string>
+  <string name="settings_chatlist_title">Liste de Tchats</string>
+  <string name="settings_chatlist_ui">Interface Usagé</string>
+  <string name="settings_chatlist_buffer_view_name">Nom</string>
+  <string name="settings_chatlist_show_search">Montrer la Recherche</string>
+  <string name="settings_chatlist_sort_alphabetically">Trier Par Ordre Alphabétique</string>
+  <string name="settings_chatlist_add_new_buffers_automatically">Ajouter les nouveaux tchats automatiquement</string>
+  <string name="settings_chatlist_network">Réseau</string>
+  <string name="settings_chatlist_show_status_buffer">Montrer le Status</string>
+  <string name="settings_chatlist_types">Types de Tchats</string>
+  <string name="settings_chatlist_show_channels">Montrer les Chaînes</string>
+  <string name="settings_chatlist_show_queries">Montrer les Requêtes</string>
+  <string name="settings_chatlist_activity">Activité</string>
+  <string name="settings_chatlist_minimum_activity_no_activity">Aucune Activité</string>
+  <string name="settings_chatlist_minimum_activity_other_activity">Autre Activité</string>
+  <string name="settings_chatlist_minimum_activity_new_message">Nouveau Message</string>
+  <string name="settings_chatlist_minimum_activity_highlight">Highlight</string>
+  <string name="settings_chatlist_hide_inactive_buffers">Cacher les Tchats Inactifs</string>
+  <string name="settings_chatlist_hide_inactive_networks">Cacher les Réseaux Inactifs</string>
+
+  <string name="settings_ignorelist_title">Liste d\'Utilisateurs Ignorés</string>
+
+  <string name="settings_ignoreitem_title">Règle à Ignorer</string>
+  <string name="settings_ignoreitem_enabled">Activé</string>
+  <string name="settings_ignoreitem_ignorerule">Règle à Ignorer</string>
+  <string name="settings_ignoreitem_isregex">Expression Régulière</string>
+  <string name="settings_ignoreitem_type">Type</string>
+  <string name="settings_ignoreitem_type_sender">Expéditeur</string>
+  <string name="settings_ignoreitem_type_message">Message</string>
+  <string name="settings_ignoreitem_type_ctcp">Ctcp</string>
+  <string name="settings_ignoreitem_strictness">Rigueur</string>
+  <string name="settings_ignoreitem_strictness_soft">Dynamique</string>
+  <string name="settings_ignoreitem_strictness_hard">Permanente</string>
+  <string name="settings_ignoreitem_scope">Périmètre</string>
+  <string name="settings_ignoreitem_scope_global">Global</string>
+  <string name="settings_ignoreitem_scope_network">Seulement sur le Réseau</string>
+  <string name="settings_ignoreitem_scope_channel">Seulement sur la Chaîne</string>
+  <string name="settings_ignoreitem_scoperule">Règle de Périmètre</string>
+
+  <string name="settings_highlightlist_title">Highlights</string>
+  <string name="settings_highlightlist_highlight_nick">Highlights de Nom</string>
+  <string name="settings_highlightlist_highlight_nick_all_nicks">Tous les Noms de l\'Identité</string>
+  <string name="settings_highlightlist_highlight_nick_current_nick">Nom Utilisé</string>
+  <string name="settings_highlightlist_highlight_nick_none">Aucun</string>
+  <string name="settings_highlightlist_nicks_case_sensitive">Sensible à la Casse</string>
+  <string name="settings_highlightlist_rules">Règles de Highlights</string>
+  <string name="settings_highlightlist_ignore_rules">Règles de Highlights Ignorés</string>
+
+  <string name="settings_highlightrule_title">Règle de Highlight</string>
+  <string name="settings_highlightrule_enabled">Activé</string>
+  <string name="settings_highlightrule_name">Nom</string>
+  <string name="settings_highlightrule_regular_expression">Expression Régulière</string>
+  <string name="settings_highlightrule_case_sensitive">Sensible à la Casse</string>
+  <string name="settings_highlightrule_sender">Expéditeur</string>
+  <string name="settings_highlightrule_channel">Chaîne</string>
+
+  <string name="settings_aliaslist_title">Pseudonymes</string>
+
+  <string name="settings_aliasitem_title">Pseudonyme</string>
+  <string name="settings_aliasitem_name">Nom</string>
+  <string name="settings_aliasitem_expansion">Expansion</string>
+
+  <string name="settings_networkconfig_title">Configuration IRC</string>
+  <string name="settings_networkconfig_ping_timeout">Détection de Timeout du Ping</string>
+  <string name="settings_networkconfig_ping_interval">Intervalle de Ping</string>
+  <string name="settings_networkconfig_ping_interval_unit">secondes</string>
+  <string name="settings_networkconfig_max_ping_count">Déconnecter après</string>
+  <string name="settings_networkconfig_max_ping_count_unit">pings manqués</string>
+  <string name="settings_networkconfig_auto_who">Requête d\'Informations Automatique sur Utilisateurs</string>
+  <string name="settings_networkconfig_auto_who_interval">Intervalle de Mise à Jour</string>
+  <string name="settings_networkconfig_auto_who_interval_unit">secondes</string>
+  <string name="settings_networkconfig_auto_who_nick_limit">Ignorer les chaînes avec plus de</string>
+  <string name="settings_networkconfig_auto_who_nick_limit_unit">utilisateurs</string>
+  <string name="settings_networkconfig_auto_who_delay">Délais minimum entre requêtes</string>
+  <string name="settings_networkconfig_auto_who_delay_unit">secondes</string>
+  <string name="settings_networkconfig_standard_ctcp">CTCP conforme aux standards</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rCA/strings_setup.xml b/app/src/main/res/values-fr-rCA/strings_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..974f5f70c9d2a9a7df5a3616cbb2c5ad9a7285ba
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_setup.xml
@@ -0,0 +1,82 @@
+<!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <!-- Account Selection -->
+  <string name="slide_account_select_title">Sélectionner un Compte</string>
+  <string name="slide_account_select_description">Veuillez sélectionner un compte à partir de la liste, ou en ajouter un</string>
+  <string name="label_user_on_host">%1$s sur %2$s:%3$d</string>
+
+  <!-- Account Connection -->
+  <string name="slide_account_connection_title">Connection</string>
+  <string name="slide_account_connection_description">Premièrement, choisissez le serveur où votre Core est hébergé.</string>
+
+  <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>
+
+  <!-- Account User -->
+  <string name="slide_account_user_title">Votre Compte</string>
+  <string name="slide_account_user_description">Maintenant, veuillez entrer le nom d\'utilisateur et le mot de passe pour votre compte sur le Core. Si vous venez de créer ce core, nous allons le créer pour vous.</string>
+
+  <string name="label_account_user">Nom d\'Utilisateur</string>
+  <string name="label_account_pass">Mot de Passe</string>
+
+  <string name="hint_invalid_user">Le nom d\'utilisateur ne peut pas être vide</string>
+
+  <!-- Account Name -->
+  <string name="slide_account_name_title">Personnaliser le nom du compte</string>
+  <string name="slide_account_name_description">Donnez un nom à ce compte</string>
+
+  <string name="label_account_name">Nom de compte</string>
+
+  <string name="hint_invalid_name">Le nom ne peut pas être vide</string>
+
+  <!-- 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>
+
+  <!-- Core Backend Select -->
+  <string name="slide_core_backend_select_title">Sélectionner le protocole de gestion des données</string>
+  <string name="slide_core_backend_select_description">Veuillez sélectionner une base de donnée que le Core utilisera pour entreposer les messages reçus et autres données.</string>
+
+  <!-- Core Backend Config -->
+  <string name="slide_core_backend_setup_title">Configurer le protocole de gestion des données</string>
+  <string name="slide_core_backend_setup_description">Veuillez configurer la base de donnée sélectionnée.</string>
+
+  <!-- User Identity -->
+  <string name="slide_user_identity_title">Configurer l\'Identité</string>
+  <string name="slide_user_identity_description">Veuillez choisir un nom d\'utilisateur</string>
+
+  <string name="hint_invalid_nick">Pas un nom valide</string>
+
+  <!-- User Network -->
+  <string name="slide_user_network_title">Configuration du Réseau IRC</string>
+  <string name="slide_user_network_description">Sélectionner un réseau IRC où vous connecter.</string>
+
+  <string name="label_network_custom">Autre Réseau…</string>
+
+  <!-- User Channels -->
+  <string name="slide_user_channels_title">Configuration des Chaînes</string>
+  <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-fr-rCA/strings_status.xml b/app/src/main/res/values-fr-rCA/strings_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac4726757c6eac2561da9b81f9257fca20596d50
--- /dev/null
+++ b/app/src/main/res/values-fr-rCA/strings_status.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+  <string name="label_status_disconnected">Déconnecté</string>
+  <string name="label_status_connecting">Connection en Cours</string>
+  <string name="label_status_handshake">Négotiation SSL/TLS</string>
+  <string name="label_status_init">Initialization</string>
+  <string name="label_status_connected">Connecté</string>
+  <string name="label_status_closed">Connection Perdue</string>
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 424ce29c13a108214d41f501574b8014212686a2..9c05f5b5437450982246bba7b832b8cbda580369 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -26,6 +26,7 @@
   <string name="connection_service_description">Palaiko ryšį su jūsų branduoliu, jog būtų galima siųsti žinutes ir gauti pranešimus.</string>
 
   <string name="label_about">Apie</string>
+  <string name="label_accept">Priimti</string>
   <string name="label_avatar">Avataras</string>
   <string name="label_back">Atgal</string>
   <string name="label_buffer_name">Buferio pavadinimas</string>
@@ -94,6 +95,7 @@
   <string name="label_share_crashreport">Dalintis klaidos ataskaita</string>
   <string name="label_show_hidden">Rodyti paslėptus</string>
   <string name="label_topic">Kanalo tema</string>
+  <string name="label_translators">Vertėjai</string>
   <string name="label_unhide">Rodyti</string>
   <string name="label_website">Tinklalapis</string>
   <string name="label_whitelist">Ignoruoti</string>
@@ -106,9 +108,28 @@
   <string name="label_whois_long">Atnaujinti vartotojo informaciją</string>
   <string name="label_yes">Taip</string>
 
+  <string name="label_feature_synchronizedmarkerline">Reikalinga norint sinchronizuoti poziciją kanaluose</string>
+  <string name="label_feature_saslauthentication">Reikalinga SASL</string>
+  <string name="label_feature_saslexternal">Reikalinga SASL su certifikatais</string>
+  <string name="label_feature_hideinactivenetworks">Reikalinga norint paslėpti neaktyvius tinklus iš pokalbių sarašų</string>
+  <string name="label_feature_passwordchange">Reikalinga norint keisti slaptažodžius per klientą</string>
+  <string name="label_feature_capnegotiation">Reikalinga norint turėti IRCv3 funkcionalumą</string>
+  <string name="label_feature_verifyserverssl">Reikalinga norint patvirtinti IRC tinklų, prie kurių jūs prisijungėte, SSL certifikatą</string>
+  <string name="label_feature_customratelimits">Reikalinga norint nustatyti suasmenintus siuntimo limitus IRC tinklams</string>
+  <string name="label_feature_awayformattimestamp">Reikalinga suasmeninto formato laiko žymėms neaktyvumo žinutėse</string>
+  <string name="label_feature_bufferactivitysync">Reikalinga norint matyti pokalbių aktyvumą jų saraše</string>
+  <string name="label_feature_coresidehighlights">Reikalinga paryškinimams</string>
+  <string name="label_feature_senderprefixes">Reikalinga norint matyti naudotoju priešdėlių rėžimus (+, @) žinutėse</string>
+  <string name="label_feature_remotedisconnect">Reikalinga jūsų klientų nuotoliniam atsijungimui</string>
+  <string name="label_feature_richmessages">Reikalinga norint matyti tikruosius vardus ar IRCv3/Gravatar avatarus žinutėse</string>
+  <string name="label_feature_backlogfiltertype">Reikalinga norint gauti senus pranešimus po prisijungimo</string>
+
   <string name="notification_channel_connection_title">Ryšys</string>
   <string name="notification_channel_highlight_title">Pažymėta</string>
 
+  <string name="label_missing_features">Trūkstamos funkcijos</string>
+  <string name="info_missing_features">Jūsų branduolyje trūksta funkcijų kurios užtikrintų sklandų Quasseldroid darbą</string>
+
   <string name="buffer_delete_confirmation">Ar norite ištrinti šį buferį visam laikui?</string>
 
   <string name="delete_confirmation">Ar tikrai norite ištrinti visam laikui? Šio veiksmo anuliuoti negalima.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_contributors.xml b/app/src/main/res/values-nl/strings_contributors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_contributors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_defaults.xml b/app/src/main/res/values-nl/strings_defaults.xml
new file mode 100644
index 0000000000000000000000000000000000000000..99253b7ee9f5a05a8a7e8026a0d3ca2f31efd42e
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_defaults.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+  
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+  
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_error.xml b/app/src/main/res/values-nl/strings_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_error.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_format.xml b/app/src/main/res/values-nl/strings_format.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_format.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_info.xml b/app/src/main/res/values-nl/strings_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_messages.xml b/app/src/main/res/values-nl/strings_messages.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_messages.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_preferences.xml b/app/src/main/res/values-nl/strings_preferences.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_preferences.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_settings.xml b/app/src/main/res/values-nl/strings_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_setup.xml b/app/src/main/res/values-nl/strings_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4f6d7cf2fbee285e2e1b72eab61900e086143bc2
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_setup.xml
@@ -0,0 +1,20 @@
+<!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-nl/strings_status.xml b/app/src/main/res/values-nl/strings_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..393cae785096134c4db7660c04ac2898abdd8eb3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings_status.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..c5690e73cab09b6f0446371cb87149c31a6031e0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,4 +17,17 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <string name="app_description">Um cliente baseado em Android para o cliente decentralizado Quassel IRC.</string>
+  <string name="app_description_long">Quassel é um cliente IRC distribuído e decentralizado, escrito usando C++ e Qt. Quasseldroid é um cliente em Kotlin puro para o núcleo Quassel, permitindo você conectar ao seu núcleo Quassel usando seu celular Android™.</string>
+
+  <string name="connection_service_title">Serviço de Conexão</string>
+  <string name="connection_service_description">Mantém a conexão ao seu núcleo para possibilitar notificações, e transmitir mensagens.</string>
+
+  <string name="label_about">Sobre</string>
+  <string name="label_accept">Aceito</string>
+  <string name="label_avatar">Avatar</string>
+  <string name="label_back">Voltar</string>
+  <string name="label_cancel">Cancelar</string>
+  <string name="label_certificates">Certificados</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index de4e6104ef97566591549c1a0a5cc65bf0ef646e..7fe985d52d7934bd77b8577ee677eb4d08f34009 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -20,15 +20,16 @@
 <resources>
   <string name="app_name">QuasselDroid</string>
   <string name="app_description">Um cliente baseado no Android para o cliente de IRC Quassel descentralizado.</string>
-  <string name="app_description_long">Quassel é um cliente IRC distribuído e descentralizado, escrito usando C++ e Qt. O Quasseldroid é um cliente escrito puramente em kotlin para o núcleo Quassel, permitindo que você se ligue ao seu núcleo Quassel usando seu telemóvel Android™.</string>
+  <string name="app_description_long">Quassel é um cliente IRC distribuído e descentralizado, escrito usando C++ e Qt. O Quasseldroid é um cliente escrito puramente em kotlin para o núcleo Quassel, permitindo que você se ligue ao seu núcleo Quassel usando o seu telemóvel Android™.</string>
 
   <string name="connection_service_title">Serviço de Ligação</string>
   <string name="connection_service_description">Mantém uma ligação com o seu núcleo para permitir notificações e transmissão de mensagens.</string>
 
   <string name="label_about">Sobre</string>
+  <string name="label_accept">Aceitar</string>
   <string name="label_avatar">Avatar</string>
   <string name="label_back">Voltar</string>
-  <string name="label_buffer_name">Nome do Chat</string>
+  <string name="label_buffer_name">Nome da Janela</string>
   <string name="label_cancel">Cancelar</string>
   <string name="label_update_user_password">Actualizar Utilizador/Senha</string>
   <string name="label_certificates">Certificados</string>
@@ -65,7 +66,7 @@
   <string name="label_new_account">Adicionar Conta</string>
   <string name="label_new_chatlist">Adicionar Lista de Chats</string>
   <string name="label_new_highlight_rule">Nova Regra de Menções</string>
-  <string name="label_new_highlight_ignore_rule">Nova Regra de Ignore de Menções</string>
+  <string name="label_new_highlight_ignore_rule">Nova Regra para Ignorar Menções</string>
   <string name="label_new_identity">Adicionar Identidade</string>
   <string name="label_new_network">Adicionar Rede</string>
   <string name="label_new_nick">Adicionar Alcunha</string>
@@ -94,6 +95,7 @@
   <string name="label_share_crashreport">Partilhar Relatório de Crash</string>
   <string name="label_show_hidden">Mostrar oculto</string>
   <string name="label_topic">Tópico do Canal</string>
+  <string name="label_translators">Tradutores</string>
   <string name="label_unhide">Tornar Visível</string>
   <string name="label_website">Site</string>
   <string name="label_whitelist">Ignorar</string>
@@ -106,10 +108,29 @@
   <string name="label_whois_long">Atualizar informações de utilizador</string>
   <string name="label_yes">Sim</string>
 
+  <string name="label_feature_synchronizedmarkerline">Necessário para sincronizar a última posição nos canais</string>
+  <string name="label_feature_saslauthentication">Necessario para SASL</string>
+  <string name="label_feature_saslexternal">Necessário para SASL com certificados</string>
+  <string name="label_feature_hideinactivenetworks">Obrigatório para ocultar redes inativas das listas de chats</string>
+  <string name="label_feature_passwordchange">Necessário para alterar senhas a partir do cliente</string>
+  <string name="label_feature_capnegotiation">Necessário para recursos do IRCv3</string>
+  <string name="label_feature_verifyserverssl">Necessário para verificar o certificado SSL das redes de IRC às quais você se conecta</string>
+  <string name="label_feature_customratelimits">Necessário para limites personalizados para redes de IRC</string>
+  <string name="label_feature_awayformattimestamp">Necessário para personalização de data/hora em mensagens de ausencia</string>
+  <string name="label_feature_bufferactivitysync">Obrigatório para ver a atividade de chats na lista de chats</string>
+  <string name="label_feature_coresidehighlights">Obrigatório para menções</string>
+  <string name="label_feature_senderprefixes">Necessário para ver os modos de prefixo (+, @) dos utilizadores nas mensagens</string>
+  <string name="label_feature_remotedisconnect">Necessário para desconexões remotas de seus próprios clientes</string>
+  <string name="label_feature_richmessages">Necessário para ver nomes reais ou avatares do IRCV3 ou do Gravatar em mensagens</string>
+  <string name="label_feature_backlogfiltertype">Obrigatório para receber notificações passadas após a conexão</string>
+
   <string name="notification_channel_connection_title">Ligação</string>
   <string name="notification_channel_highlight_title">Menção</string>
 
-  <string name="buffer_delete_confirmation">Você deseja excluir este chat permanentemente?</string>
+  <string name="label_missing_features">Recursos Ausentes</string>
+  <string name="info_missing_features">O seu núcleo tem em falta recursos que são necessários para o QuasselDroid funcionar corretamente.</string>
+
+  <string name="buffer_delete_confirmation">Você deseja excluir esta janela permanentemente?</string>
 
   <string name="delete_confirmation">Tem certeza de que deseja excluir isto permanentemente? Isto não pode ser revertido.</string>
   <string name="cancel_confirmation">Você tem alterações não guardadas. Você deseja descartá-las?</string>
diff --git a/app/src/main/res/values-pt/strings_preferences.xml b/app/src/main/res/values-pt/strings_preferences.xml
index c452dd7f1c3bcfed09aa10b8e1d12ec8d4fd9cb3..c82d8a199f4cb75eecfcfca17a08af97c12e9c57 100644
--- a/app/src/main/res/values-pt/strings_preferences.xml
+++ b/app/src/main/res/values-pt/strings_preferences.xml
@@ -93,6 +93,8 @@
 
   <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>
   <string name="preference_show_irccloud_avatars_summary">Mostra a utilizadores sem avatar, o avatar IRCCloud correspondente, se disponível</string>
 
@@ -139,7 +141,7 @@
   <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 um chat 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_connection_title">Ligação</string>
diff --git a/app/src/main/res/values-pt/strings_settings.xml b/app/src/main/res/values-pt/strings_settings.xml
index 14f0210e56831a79e77603bc81f53af5cf954205..da917e16ef4e955db7f1f998c47db33f50358b21 100644
--- a/app/src/main/res/values-pt/strings_settings.xml
+++ b/app/src/main/res/values-pt/strings_settings.xml
@@ -83,7 +83,7 @@
   <string name="settings_chatlist_sort_alphabetically">Ordenar Alfabeticamente</string>
   <string name="settings_chatlist_add_new_buffers_automatically">Adicionar novos chats automaticamente</string>
   <string name="settings_chatlist_network">Rede</string>
-  <string name="settings_chatlist_show_status_buffer">Mostrar Janela de Estado</string>
+  <string name="settings_chatlist_show_status_buffer">Mostrar Janela de Servidor</string>
   <string name="settings_chatlist_types">Tipos de Chats</string>
   <string name="settings_chatlist_show_channels">Mostrar Canais</string>
   <string name="settings_chatlist_show_queries">Mostrar Mensagens Privadas</string>
@@ -97,9 +97,9 @@
 
   <string name="settings_ignorelist_title">Lista de Ignorados</string>
 
-  <string name="settings_ignoreitem_title">Regra de Ignorar</string>
+  <string name="settings_ignoreitem_title">Regra para Ignorar</string>
   <string name="settings_ignoreitem_enabled">Activado</string>
-  <string name="settings_ignoreitem_ignorerule">Regra de Ignorar</string>
+  <string name="settings_ignoreitem_ignorerule">Regra para Ignorar</string>
   <string name="settings_ignoreitem_isregex">Expressão Regular</string>
   <string name="settings_ignoreitem_type">Tipo</string>
   <string name="settings_ignoreitem_type_sender">Remetente</string>
@@ -121,7 +121,7 @@
   <string name="settings_highlightlist_highlight_nick_none">Nenhum</string>
   <string name="settings_highlightlist_nicks_case_sensitive">Sensível a Maiúsculas e Minúsculas</string>
   <string name="settings_highlightlist_rules">Regras de Menções</string>
-  <string name="settings_highlightlist_ignore_rules">Regras de Ignorar Menções</string>
+  <string name="settings_highlightlist_ignore_rules">Regras para Ignorar Menções</string>
 
   <string name="settings_highlightrule_title">Regra de Menção</string>
   <string name="settings_highlightrule_enabled">Activado</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 823a191ec9b29d7e201e88e017ab2cb1a42e0e77..28f2d180a4b4c6c085bb25120a6878b4cc9a2b4c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,7 +121,7 @@
   <string name="label_feature_awayformattimestamp">Required for custom formatted timestamps in away messages</string>
   <string name="label_feature_bufferactivitysync">Required for seeing activity of chats in the chat list</string>
   <string name="label_feature_coresidehighlights">Required for highlights</string>
-  <string name="label_feature_senderprefixes">Required for seeing prefix modes (+, @) of users in channels</string>
+  <string name="label_feature_senderprefixes">Required for seeing prefix modes (+, @) of users in messages</string>
   <string name="label_feature_remotedisconnect">Required for remote disconnects of your own clients</string>
   <string name="label_feature_richmessages">Required for seeing real names or IRCv3 or Gravatar avatars in messages</string>
   <string name="label_feature_backlogfiltertype">Required for receiving past notifications after connecting</string>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 648460d008443bb62ba0715e314c84339e57bea5..362383ff5586859c6e3a621ee1fd9d4ef4d753cf 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -71,7 +71,7 @@
   </string-array>
 
   <string name="preference_show_lag_key" translatable="false">show_lag</string>
-  <string name="preference_show_lag_title">Show lag</string>
+  <string name="preference_show_lag_title">Show Lag</string>
   <string name="preference_show_lag_summary">Displays the lag between client and core in the action bar</string>
 
   <string name="preference_keep_screen_on_key" translatable="false">keep_screen_on</string>
@@ -83,6 +83,9 @@
   <string name="preference_language_entry_auto">System Default</string>
   <string name="preference_language_entry_en" translatable="false">English</string>
   <string name="preference_language_entry_de" translatable="false">Deutsch</string>
+  <string name="preference_language_entry_fr" translatable="false">Français</string>
+  <string name="preference_language_entry_fr_ca" translatable="false">Français (Canadien)</string>
+  <string name="preference_language_entry_nl" translatable="false">Nederlands</string>
   <string name="preference_language_entry_lt" translatable="false">Lietuvių</string>
   <string name="preference_language_entry_pt" translatable="false">Português</string>
   <string name="preference_language_entry_pt_br" translatable="false">Português (Brasil)</string>
@@ -91,6 +94,9 @@
     <item>@string/preference_language_entry_auto</item>
     <item>@string/preference_language_entry_en</item>
     <item>@string/preference_language_entry_de</item>
+    <!--<item>@string/preference_language_entry_fr</item>-->
+    <item>@string/preference_language_entry_fr_ca</item>
+    <!--<item>@string/preference_language_entry_nl</item>-->
     <item>@string/preference_language_entry_lt</item>
     <item>@string/preference_language_entry_pt</item>
     <!--<item>@string/preference_language_entry_pt_br</item>-->
@@ -100,6 +106,9 @@
     <item />
     <item>en</item>
     <item>de</item>
+    <!--<item>fr</item>-->
+    <item>fr_ca</item>
+    <!--<item>nl</item>-->
     <item>lt</item>
     <item>pt</item>
     <!--<item>pt_BR</item>-->