i18n: plural strings

Remove some unused strings

Signed-off-by: R4SAS <r4sas@i2pmail.org>

11 files changed, 1419 insertions, 1289 deletions

diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
index efb6881..3757be4 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
@@ -132,7 +132,7 @@ public class ChannelSearchProvider extends ContentProvider {
 
         for(int x=0;x<channels.size();x++) {
             IChannel channel = channels.get(x);
-            cursor.addRow(new Object[] { x, INTENT_DATA_CHANNEL, channel.getName(), R.drawable.ic_action_channels, getContext().getString(R.string.search_channel_users, channel.getSubchannelUserCount()), channel.getId() });
+            cursor.addRow(new Object[] { x, INTENT_DATA_CHANNEL, channel.getName(), R.drawable.ic_action_channels, getContext().getResources().getQuantityString(R.plurals.search_channel_users, channel.getSubchannelUserCount(), channel.getSubchannelUserCount()), channel.getId() });
         }
 
         for(int x=0;x<users.size();x++) {
diff --git a/app/src/main/java/se/lublin/mumla/service/MumlaMessageNotification.java b/app/src/main/java/se/lublin/mumla/service/MumlaMessageNotification.java
index 82bf418..2786096 100644
--- a/app/src/main/java/se/lublin/mumla/service/MumlaMessageNotification.java
+++ b/app/src/main/java/se/lublin/mumla/service/MumlaMessageNotification.java
@@ -63,7 +63,7 @@ public class MumlaMessageNotification {
         mUnreadMessages.add(message);
 
         NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle();
-        style.setBigContentTitle(mContext.getString(R.string.notification_unread_many, mUnreadMessages.size()));
+        style.setBigContentTitle(mContext.getResources().getQuantityString(R.plurals.notification_unread_many, mUnreadMessages.size(), mUnreadMessages.size()));
         for (IMessage m : mUnreadMessages) {
             String line = mContext.getString(R.string.notification_message, m.getActorName(), m.getMessage());
             style.addLine(line);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ca0d0e5..2821499 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,224 +1,242 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_open">Drawer öffnen</string>
-  <string name="drawer_close">Drawer schließen</string>
-  <string name="drawer_not_connected">Nicht verbunden</string>
-  <string name="drawer_server">Server</string>
-  <string name="drawer_tokens">Zugriffscodes</string>
-  <string name="drawer_pinned">Gepinnte Kanäle</string>
-  <string name="drawer_header_servers">Server</string>
-  <string name="drawer_favorites">Favoriten</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">Öffentliche Server</string>
-  <!--Chat formatting-->
-  <string name="chat_message_tree">(Baum)</string>
-  <string name="chat_message_channel">(Kanal)</string>
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">Admin</string>
-  <string name="user_menu_kick">Kicken</string>
-  <string name="user_menu_ban">Bannen</string>
-  <string name="user_menu_mute">Stumm</string>
-  <string name="user_menu_deafen">Taub</string>
-  <string name="user_menu_move">Verschieben</string>
-  <string name="user_menu_priority_speaker">Bevorzugter Sprecher</string>
-  <string name="user_menu_local_mute">Lokal Stumm</string>
-  <string name="user_menu_ignore_messages">Nachrichten ignorieren</string>
-  <string name="user_menu_change_comment">Kommentar ändern</string>
-  <string name="user_menu_view_comment">Kommentar anzeigen</string>
-  <string name="user_menu_reset_comment">Kommentar zurücksetzen</string>
-  <string name="user_menu_send_message">Nachricht senden</string>
-  <string name="user_menu_information">Informationen</string>
-  <string name="user_menu_register">Registrieren</string>
-  <string name="user_menu_registered">Registriert</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Pin</string>
-  <!--Comment Fragment-->
-  <string name="comment_view">Anzeigen</string>
-  <string name="comment_edit_source">Quelltext bearbeiten</string>
-  <string name="comment_view_source">Quelltext anzeigen</string>
-  <!--Server Info Fragment-->
-  <string name="control_channel">Steuerkanal</string>
-  <string name="tcp_encryption_mode">Verschlüsselt mit 256 Bit AES256-SHA</string>
-  <string name="voice_channel">Sprachkanal</string>
-  <string name="udp_encryption_mode">Verschlüsselt mit 128 Bit OCB-AES128</string>
-  <string name="audio_bandwidth">Audiobandbreite</string>
-  <string name="server_info_protocol">Protokoll %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_latency">%.2f ms Latenz</string>
-  <string name="server_info_host">Gegenstelle %1$s (Port %2$d)</string>
-  <string name="server_info_codec">Codec: %s</string>
-  <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
-  <string name="server_info_current_bandwidth">Aktuell %.1f kbit/s</string>
-  <!--Server matching-->
-  <string name="server_match">Server suchen</string>
-  <string name="server_match_progress">Einen Server finden…</string>
-  <string name="server_match_found">Server gefunden</string>
-  <string name="server_match_not_found">Server nicht gefunden</string>
-  <string name="server_match_expand_country">Konnte keinen optimalen Server in Ihrem Land finden. Suche auf die ganze Welt ausweiten?</string>
-  <string name="server_match_info">Name: %1$s\nHost: %2$s:%3$d\nBenutzer: %4$d / %5$d\nVersion: %6$s \nLand: %7$s \nLatenz: %8$d ms</string>
-  <string name="server_match_description">Mumla kann automatisch nach einem leeren Server suchen, optimiert nach Serverstandort, Version und Latenz.</string>
-  <!--Common-->
-  <string name="channels">Kanäle</string>
-  <string name="no_servers">Keine Server hinzugefügt.\nDrücken Sie den \'Hinzufügen\' Knopf in der Action Bar, um zu beginnen.</string>
-  <string name="server_add">Server hinzufügen</string>
-  <string name="server_password">Passwort</string>
-  <string name="server_username">Benutzername</string>
-  <string name="server_port">Port</string>
-  <string name="server_host">Adresse</string>
-  <string name="server_label">Beschriftung</string>
-  <string name="connecting">Verbinden</string>
-  <string name="connecting_to_server">Zu Server %s verbinden</string>
-  <string name="fragment_chat">Chat</string>
-  <string name="fragment_channel">Kanal</string>
-  <string name="menu_settings">Einstellungen</string>
-  <string name="ptt">Push-To-Talk</string>
-  <string name="mute">Stumm stellen</string>
-  <string name="deafen">Taub stellen</string>
-  <string name="disconnect">Verbindung trennen</string>
-  <string name="disconnectSure">Sind Sie sicher, dass Sie die Verbindung mit %s trennen möchten?</string>
-  <string name="save">Speichern</string>
-  <string name="add">Hinzufügen</string>
-  <string name="preferences">Einstellungen</string>
-  <string name="togglelocalmute">lokale Stummschaltung wechseln</string>
-  <string name="chat">Chat</string>
-  <string name="perm_denied">Zugriff verweigert!</string>
-  <string name="connectionRefused">Verbindung abgelehnt</string>
-  <string name="confirm_delete_server">Sind sie sicher, dass Sie diesen Server entfernen möchten?</string>
-  <string name="confirm_delete_channel">Sind Sie sicher, dass Sie diesen Kanal entfernen möchten?</string>
-  <string name="disconnected">Getrennt</string>
-  <string name="kicked_message">Vom Server gekickt.\nGrund: %s</string>
-  <string name="loading">Lade…</string>
-  <string name="reset_key">Taste zurücksetzen</string>
-  <string name="externalStorageUnavailable">Externer Speicher nicht verfügbar, kann Zertifikat nicht laden</string>
-  <string name="addFavorite">Favorit hinzufügen</string>
-  <string name="removeFavorite">Favorit entfernen</string>
-  <string name="viewFavorites">Zeige Favoriten</string>
-  <string name="favorites">Favoriten</string>
-  <string name="favoriteRemoved">Favorit entfernt.</string>
-  <string name="favoriteAdded">Favorit hinzugefügt.</string>
-  <string name="noFavorites">Keine Favoriten gespeichert.</string>
-  <string name="accessTokens">Zugriffscodes</string>
-  <string name="accessAdd">Zugriffscode hinzufügen</string>
-  <string name="pushToTalkHint">(checkbox setzen zum einrasten der Taste)</string>
-  <string name="messageReceived">Neue Nachricht</string>
-  <string name="generateCert">Zertifikat erzeugen</string>
-  <string name="generateCertSuccess">Ihr Zertifikat wurde generiert und als %s gespeichert!</string>
-  <string name="generateCertFailure">Erzeugung des Zertifikat fehlgeschlagen.</string>
-  <string name="generateCertProgress">Erzeuge Zertifikat…</string>
-  <string name="search">Suche</string>
-  <string name="searchHint">Suche nach Kanälen und Benutzern</string>
-  <string name="undocumentedWakeLock">Leider kann auf deinem Gerät der Proximity Sensor nicht genutzt werden um den Standby zu verhindern. Bitte ändere den Modus zu \'Freisprechen\'.</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="recordingVolume">Aufnahmelautstärke Boost</string>
-  <string name="quickConnect">Schnell verbinden</string>
-  <string name="connect">Verbinden</string>
-  <string name="connectToServer">Verbinde zum Server</string>
-  <string name="edit">Bearbeiten</string>
-  <string name="remove">Entfernen</string>
-  <string name="delete">Löschen</string>
-  <string name="retry">Erneut versuchen</string>
-  <string name="messageToUser">Schreibe Nachricht an \'%s\'</string>
-  <string name="messageToChannel">Schreibe Nachricht an Kanal \'%s\'</string>
-  <string name="online">Online</string>
-  <string name="offline">Offline</string>
-  <string name="clearChat">Chatverlauf löschen</string>
-  <string name="connected">Verbunden</string>
-  <string name="mumlaConnected">Mumla ist verbunden</string>
-  <string name="mumlaConnecting">Mumla verbindet</string>
-  <string name="mumlaDisconnected">Mumla wurde getrennt</string>
-  <string name="lostConnection">Verbindung zum Server wurde unterbrochen.</string>
-  <string name="resume">Wiederaufnehmen</string>
-  <string name="channel">Kanal</string>
-  <string name="user">Benutzer</string>
-  <string name="server">Server</string>
-  <string name="chat_notify_moved">%1$s wurde von %3$s aus %2$s verschoben.</string>
-  <string name="chat_notify_muted_deafened">Stumm und taub.</string>
-  <string name="chat_notify_muted">Stumm.</string>
-  <string name="chat_notify_unmuted">Nicht stumm.</string>
-  <string name="chat_notify_unmuted_undeafened">Nicht stumm und nicht taub.</string>
-  <string name="chat_notify_now_muted_deafened">%s ist jetzt stumm und taub.</string>
-  <string name="chat_notify_now_muted">%s ist jetzt stumm.</string>
-  <string name="chat_notify_now_unmuted">%s ist jetzt nicht mehr stumm.</string>
-  <string name="chat_notify_now_unmuted_undeafened">%s ist jetzt nicht mehr stumm und nicht mehr taub.</string>
-  <string name="chat_notify_connected">%s ist verbunden.</string>
-  <string name="chat_notify_disconnected">%s hat den Server verlassen.</string>
-  <string name="unknown">Unbekannt</string>
-  <string name="server_list_title_favorite">Favoriten</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="server_list_title_public_internet">Internet – Öffentlich</string>
-  <string name="ping">Ping</string>
-  <string name="sort">Sortierung</string>
-  <string name="sortBy">Sortieren nach…</string>
-  <string name="name">Name</string>
-  <string name="country">Land</string>
-  <string name="share">Teilen</string>
-  <string name="description">Beschreibung</string>
-  <string name="shareMessage">Treten Sie diesem Server mit Mumla bei! %s</string>
-  <string name="noServerInfo">Pingen um Informationen abzurufen</string>
-  <string name="status_notify_muted_and_deafened">Stumm und taub.</string>
-  <string name="status_notify_muted">Stumm.</string>
-  <string name="comment">Kommentar</string>
-  <string name="close">Schließen</string>
-  <string name="retrieving">Empfangen…</string>
-  <string name="search_name">Name</string>
-  <string name="search_country">Land</string>
-  <string name="preferences_immutable">Diese Einstellung kann nicht geändert werden, solange Sie mit einem Server verbunden sind.</string>
-  <string name="fullscreen">Vollbild</string>
-  <string name="fullscreen_chat">Chat</string>
-  <string name="fullscreen_channel">Kanal</string>
-  <string name="fetchingServers">Bitte warten, die Liste der öffentlichen Server wird abgerufen.</string>
-  <string name="information">Informationen</string>
-  <string name="register">Selbst registrieren</string>
-  <string name="userControl">Benutzersteuerung</string>
-  <string name="registerSelfSuccess">Registrierungsanfrage gesendet</string>
-  <string name="error_fetching_servers">Fehler beim Abrufen der Server!\nÜberprüfen Sie ihre Internetverbindung.</string>
-  <string name="coming_soon">Diese Funktion ist demnächst verfügbar.</string>
-  <string name="search_channel_users">%d Benutzer</string>
-  <string name="reconnecting">Wiederverbinden in %d Sekunden.</string>
-  <string name="tapToReconnect">Zum Wiederverbinden drücken</string>
-  <string name="overlay">Overlay</string>
-  <string name="hint_reason">Grund</string>
-  <string name="hint_ptt">Push-To-Talk</string>
-  <string name="hint_ptt_summary">Drücken Sie diese Taste zum Sprechen. Doppelt drücken zum Einrasten.</string>
-  <string name="hint_server_add">Willkommen bei Mumla</string>
-  <string name="hint_server_add_summary">Drücken Sie auf \'+\' in der Aktionsleiste um einen Server in den Favoriten zu hinterlegen.</string>
-  <string name="hint_switching">Zwischen den Ansichten wechseln</string>
-  <string name="hint_switching_summary">Diese Schaltflächen oder Wischgesten verwenden, um zwischen der Chat- und Kanalansicht zu wechseln.</string>
-  <string name="action_settings">Einstellungen</string>
-  <string name="reconnect">Wiederverbinden</string>
-  <string name="reconnect_dialog_message">Sie sind bereits mit einem Server verbunden. Möchten Sie zu diesem Server wechseln?</string>
-  <string name="confirm_reset_comment">Kommentar von %s wirklich zurücksetzen?</string>
-  <string name="confirm">Bestätigen</string>
-  <string name="expand">Erweitern</string>
-  <string name="temporary">Temporär</string>
-  <string name="position">Position</string>
-  <string name="channel_edit">Kanal bearbeiten</string>
-  <string name="channel_add">Kanal hinzufügen</string>
-  <string name="tts_failed">TTS konnte nicht gestartet werden</string>
-  <string name="mumble_url_parse_failed">Konnte Mumble URL nicht verarbeiten!</string>
-  <string name="first_run_generate_certificate_title">Willkommen in Mumla!</string>
-  <string name="first_run_generate_certificate">Es wird sehr empfohlen ein Zertifikat zu generieren. Manche Server setzen ein Zertifikat voraus.</string>
-  <string name="generate">Generieren</string>
-  <string name="certificate_not_valid">Zertifikat \'%s\' konnte nicht geladen werden!</string>
-  <string name="invalid_password">Ungültiges Passwort.</string>
-  <string name="send_message">Nachricht senden.</string>
-  <string name="channel_menu_view_description">Beschreibung anzeigen</string>
-  <string name="untrusted_certificate">Nicht vertrauenswürdiges Zertifikat</string>
-  <string name="allow">Erlauben</string>
-  <string name="trust_added">Zertifikat zur Vertrauensdatenbank hinzugefügt</string>
-  <string name="trust_add_failed">Fehler beim Hinzufügen des Zertifikats zur Vertrauensdatenbank!</string>
-  <string name="trust_cleared">Vertrauensdatenbank geleert</string>
-  <string name="cancelled">Abgebrochen</string>
-  <string name="transmit_mode">Übertragungsmethode</string>
-  <string name="current_chat_target">Aktuelles Ziel</string>
-  <string name="channel_join">Betreten</string>
-  <string name="certificate_info">Allgemeiner Name:\n%1$s\n\nGültig von:\n%2$s\n\nGültig bis:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
-  <string name="invalid_host">Ungültiger Host</string>
-  <string name="invalid_port_range">Ungültiger Port (1-65535)</string>
-  <string name="invalid_username">Ungültiger Benutzername</string>
-  <string name="cancel_reconnect">Neuverbinden abbrechen</string>
-  <string name="attempting_reconnect">Fehler: %s.\n\n Versuche erneut zu verbinden…</string>
-  <string name="default_">Standard</string>
+    <!--Drawer pane-->
+    <string name="drawer_open">Drawer öffnen</string>
+    <string name="drawer_close">Drawer schließen</string>
+    <string name="drawer_not_connected">Nicht verbunden</string>
+    <string name="drawer_server">Server</string>
+    <string name="drawer_tokens">Zugriffscodes</string>
+    <string name="drawer_pinned">Gepinnte Kanäle</string>
+    <string name="drawer_header_servers">Server</string>
+    <string name="drawer_favorites">Favoriten</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">Öffentliche Server</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_tree">(Baum)</string>
+    <string name="chat_message_channel">(Kanal)</string>
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">Admin</string>
+    <string name="user_menu_kick">Kicken</string>
+    <string name="user_menu_ban">Bannen</string>
+    <string name="user_menu_mute">Stumm</string>
+    <string name="user_menu_deafen">Taub</string>
+    <string name="user_menu_move">Verschieben</string>
+    <string name="user_menu_priority_speaker">Bevorzugter Sprecher</string>
+    <string name="user_menu_local_mute">Lokal Stumm</string>
+    <string name="user_menu_ignore_messages">Nachrichten ignorieren</string>
+    <string name="user_menu_change_comment">Kommentar ändern</string>
+    <string name="user_menu_view_comment">Kommentar anzeigen</string>
+    <string name="user_menu_reset_comment">Kommentar zurücksetzen</string>
+    <string name="user_menu_send_message">Nachricht senden</string>
+    <string name="user_menu_information">Informationen</string>
+    <string name="user_menu_register">Registrieren</string>
+    <string name="user_menu_registered">Registriert</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Pin</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_view">Anzeigen</string>
+    <string name="comment_edit_source">Quelltext bearbeiten</string>
+    <string name="comment_view_source">Quelltext anzeigen</string>
+
+    <!--Server Info Fragment-->
+    <string name="control_channel">Steuerkanal</string>
+    <string name="tcp_encryption_mode">Verschlüsselt mit 256 Bit AES256-SHA</string>
+    <string name="voice_channel">Sprachkanal</string>
+    <string name="udp_encryption_mode">Verschlüsselt mit 128 Bit OCB-AES128</string>
+    <string name="audio_bandwidth">Audiobandbreite</string>
+    <string name="server_info_protocol">Protokoll %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_latency">%.2f ms Latenz</string>
+    <string name="server_info_host">Gegenstelle %1$s (Port %2$d)</string>
+    <string name="server_info_codec">Codec: %s</string>
+    <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
+    <string name="server_info_current_bandwidth">Aktuell %.1f kbit/s</string>
+
+    <!--Server matching-->
+    <string name="server_match">Server suchen</string>
+    <string name="server_match_progress">Einen Server finden…</string>
+    <string name="server_match_found">Server gefunden</string>
+    <string name="server_match_not_found">Server nicht gefunden</string>
+    <string name="server_match_expand_country">Konnte keinen optimalen Server in Ihrem Land finden. Suche auf die ganze Welt ausweiten?</string>
+    <string name="server_match_info">Name: %1$s\nHost: %2$s:%3$d\nBenutzer: %4$d / %5$d\nVersion: %6$s \nLand: %7$s \nLatenz: %8$d ms</string>
+    <string name="server_match_description">Mumla kann automatisch nach einem leeren Server suchen, optimiert nach Serverstandort, Version und Latenz.</string>
+
+    <!--Common-->
+    <string name="channels">Kanäle</string>
+    <string name="no_servers">Keine Server hinzugefügt.\nDrücken Sie den \'Hinzufügen\' Knopf in der Action Bar, um zu beginnen.</string>
+    <string name="server_add">Server hinzufügen</string>
+    <string name="server_password">Passwort</string>
+    <string name="server_username">Benutzername</string>
+    <string name="server_port">Port</string>
+    <string name="server_host">Adresse</string>
+    <string name="server_label">Beschriftung</string>
+    <string name="connecting">Verbinden</string>
+    <string name="connecting_to_server">Zu Server %s verbinden</string>
+    <string name="fragment_chat">Chat</string>
+    <string name="fragment_channel">Kanal</string>
+    <string name="menu_settings">Einstellungen</string>
+    <string name="ptt">Push-To-Talk</string>
+    <string name="mute">Stumm stellen</string>
+    <string name="deafen">Taub stellen</string>
+    <string name="disconnect">Verbindung trennen</string>
+    <string name="disconnectSure">Sind Sie sicher, dass Sie die Verbindung mit %s trennen möchten?</string>
+    <string name="save">Speichern</string>
+    <string name="add">Hinzufügen</string>
+    <string name="preferences">Einstellungen</string>
+    <string name="togglelocalmute">lokale Stummschaltung wechseln</string>
+    <string name="chat">Chat</string>
+    <string name="perm_denied">Zugriff verweigert!</string>
+    <string name="connectionRefused">Verbindung abgelehnt</string>
+    <string name="confirm_delete_server">Sind sie sicher, dass Sie diesen Server entfernen möchten?</string>
+    <string name="confirm_delete_channel">Sind Sie sicher, dass Sie diesen Kanal entfernen möchten?</string>
+    <string name="disconnected">Getrennt</string>
+    <string name="kicked_message">Vom Server gekickt.\nGrund: %s</string>
+    <string name="loading">Lade…</string>
+    <string name="reset_key">Taste zurücksetzen</string>
+    <string name="externalStorageUnavailable">Externer Speicher nicht verfügbar, kann Zertifikat nicht laden</string>
+    <string name="addFavorite">Favorit hinzufügen</string>
+    <string name="removeFavorite">Favorit entfernen</string>
+    <string name="viewFavorites">Zeige Favoriten</string>
+    <string name="favorites">Favoriten</string>
+    <string name="favoriteRemoved">Favorit entfernt.</string>
+    <string name="favoriteAdded">Favorit hinzugefügt.</string>
+    <string name="noFavorites">Keine Favoriten gespeichert.</string>
+    <string name="accessTokens">Zugriffscodes</string>
+    <string name="accessAdd">Zugriffscode hinzufügen</string>
+    <string name="pushToTalkHint">(checkbox setzen zum einrasten der Taste)</string>
+    <string name="messageReceived">Neue Nachricht</string>
+    <string name="generateCert">Zertifikat erzeugen</string>
+    <string name="generateCertSuccess">Ihr Zertifikat wurde generiert und als %s gespeichert!</string>
+    <string name="generateCertFailure">Erzeugung des Zertifikat fehlgeschlagen.</string>
+    <string name="generateCertProgress">Erzeuge Zertifikat…</string>
+    <string name="search">Suche</string>
+    <string name="searchHint">Suche nach Kanälen und Benutzern</string>
+    <string name="undocumentedWakeLock">Leider kann auf deinem Gerät der Proximity Sensor nicht genutzt werden um den Standby zu verhindern. Bitte ändere den Modus zu \'Freisprechen\'.</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="recordingVolume">Aufnahmelautstärke Boost</string>
+    <string name="quickConnect">Schnell verbinden</string>
+    <string name="connect">Verbinden</string>
+    <string name="connectToServer">Verbinde zum Server</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="remove">Entfernen</string>
+    <string name="delete">Löschen</string>
+    <string name="retry">Erneut versuchen</string>
+    <string name="messageToUser">Schreibe Nachricht an \'%s\'</string>
+    <string name="messageToChannel">Schreibe Nachricht an Kanal \'%s\'</string>
+    <string name="online">Online</string>
+    <string name="offline">Offline</string>
+    <string name="clearChat">Chatverlauf löschen</string>
+    <string name="connected">Verbunden</string>
+    <string name="mumlaConnected">Mumla ist verbunden</string>
+    <string name="mumlaConnecting">Mumla verbindet</string>
+    <string name="mumlaDisconnected">Mumla wurde getrennt</string>
+    <string name="lostConnection">Verbindung zum Server wurde unterbrochen.</string>
+    <string name="resume">Wiederaufnehmen</string>
+    <string name="channel">Kanal</string>
+    <string name="user">Benutzer</string>
+    <string name="server">Server</string>
+    <string name="chat_notify_moved">%1$s wurde von %3$s aus %2$s verschoben.</string>
+    <string name="chat_notify_muted_deafened">Stumm und taub.</string>
+    <string name="chat_notify_muted">Stumm.</string>
+    <string name="chat_notify_unmuted">Nicht stumm.</string>
+    <string name="chat_notify_unmuted_undeafened">Nicht stumm und nicht taub.</string>
+    <string name="chat_notify_now_muted_deafened">%s ist jetzt stumm und taub.</string>
+    <string name="chat_notify_now_muted">%s ist jetzt stumm.</string>
+    <string name="chat_notify_now_unmuted">%s ist jetzt nicht mehr stumm.</string>
+    <string name="chat_notify_now_unmuted_undeafened">%s ist jetzt nicht mehr stumm und nicht mehr taub.</string>
+    <string name="chat_notify_connected">%s ist verbunden.</string>
+    <string name="chat_notify_disconnected">%s hat den Server verlassen.</string>
+    <string name="unknown">Unbekannt</string>
+    <string name="server_list_title_favorite">Favoriten</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="server_list_title_public_internet">Internet – Öffentlich</string>
+    <string name="ping">Ping</string>
+    <string name="sort">Sortierung</string>
+    <string name="sortBy">Sortieren nach…</string>
+    <string name="name">Name</string>
+    <string name="country">Land</string>
+    <string name="share">Teilen</string>
+    <string name="description">Beschreibung</string>
+    <string name="shareMessage">Treten Sie diesem Server mit Mumla bei! %s</string>
+    <string name="noServerInfo">Pingen um Informationen abzurufen</string>
+    <string name="status_notify_muted_and_deafened">Stumm und taub.</string>
+    <string name="status_notify_muted">Stumm.</string>
+    <string name="comment">Kommentar</string>
+    <string name="close">Schließen</string>
+    <string name="retrieving">Empfangen…</string>
+    <string name="search_name">Name</string>
+    <string name="search_country">Land</string>
+    <string name="preferences_immutable">Diese Einstellung kann nicht geändert werden, solange Sie mit einem Server verbunden sind.</string>
+    <string name="fullscreen">Vollbild</string>
+    <string name="fullscreen_chat">Chat</string>
+    <string name="fullscreen_channel">Kanal</string>
+    <string name="fetchingServers">Bitte warten, die Liste der öffentlichen Server wird abgerufen.</string>
+    <string name="information">Informationen</string>
+    <string name="register">Selbst registrieren</string>
+    <string name="userControl">Benutzersteuerung</string>
+    <string name="registerSelfSuccess">Registrierungsanfrage gesendet</string>
+    <string name="error_fetching_servers">Fehler beim Abrufen der Server!\nÜberprüfen Sie ihre Internetverbindung.</string>
+    <string name="coming_soon">Diese Funktion ist demnächst verfügbar.</string>
+    <string name="tapToReconnect">Zum Wiederverbinden drücken</string>
+    <string name="overlay">Overlay</string>
+    <string name="hint_reason">Grund</string>
+    <string name="hint_ptt">Push-To-Talk</string>
+    <string name="hint_ptt_summary">Drücken Sie diese Taste zum Sprechen. Doppelt drücken zum Einrasten.</string>
+    <string name="hint_server_add">Willkommen bei Mumla</string>
+    <string name="hint_server_add_summary">Drücken Sie auf \'+\' in der Aktionsleiste um einen Server in den Favoriten zu hinterlegen.</string>
+    <string name="hint_switching">Zwischen den Ansichten wechseln</string>
+    <string name="hint_switching_summary">Diese Schaltflächen oder Wischgesten verwenden, um zwischen der Chat- und Kanalansicht zu wechseln.</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="reconnect">Wiederverbinden</string>
+    <string name="reconnect_dialog_message">Sie sind bereits mit einem Server verbunden. Möchten Sie zu diesem Server wechseln?</string>
+    <string name="confirm_reset_comment">Kommentar von %s wirklich zurücksetzen?</string>
+    <string name="confirm">Bestätigen</string>
+    <string name="expand">Erweitern</string>
+    <string name="temporary">Temporär</string>
+    <string name="position">Position</string>
+    <string name="channel_edit">Kanal bearbeiten</string>
+    <string name="channel_add">Kanal hinzufügen</string>
+    <string name="tts_failed">TTS konnte nicht gestartet werden</string>
+    <string name="mumble_url_parse_failed">Konnte Mumble URL nicht verarbeiten!</string>
+    <string name="first_run_generate_certificate_title">Willkommen in Mumla!</string>
+    <string name="first_run_generate_certificate">Es wird sehr empfohlen ein Zertifikat zu generieren. Manche Server setzen ein Zertifikat voraus.</string>
+    <string name="generate">Generieren</string>
+    <string name="certificate_not_valid">Zertifikat \'%s\' konnte nicht geladen werden!</string>
+    <string name="invalid_password">Ungültiges Passwort.</string>
+    <string name="send_message">Nachricht senden.</string>
+    <string name="channel_menu_view_description">Beschreibung anzeigen</string>
+    <string name="untrusted_certificate">Nicht vertrauenswürdiges Zertifikat</string>
+    <string name="allow">Erlauben</string>
+    <string name="trust_added">Zertifikat zur Vertrauensdatenbank hinzugefügt</string>
+    <string name="trust_add_failed">Fehler beim Hinzufügen des Zertifikats zur Vertrauensdatenbank!</string>
+    <string name="trust_cleared">Vertrauensdatenbank geleert</string>
+    <string name="cancelled">Abgebrochen</string>
+    <string name="transmit_mode">Übertragungsmethode</string>
+    <string name="current_chat_target">Aktuelles Ziel</string>
+    <string name="channel_join">Betreten</string>
+    <string name="certificate_info">Allgemeiner Name:\n%1$s\n\nGültig von:\n%2$s\n\nGültig bis:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
+    <string name="invalid_host">Ungültiger Host</string>
+    <string name="invalid_port_range">Ungültiger Port (1-65535)</string>
+    <string name="invalid_username">Ungültiger Benutzername</string>
+    <string name="cancel_reconnect">Neuverbinden abbrechen</string>
+    <string name="attempting_reconnect">Fehler: %s.\n\n Versuche erneut zu verbinden…</string>
+    <string name="default_">Standard</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d Benutzer</item>
+        <item quantity="other">%d Benutzer</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Wiederverbinden in %d Sekunde.</item>
+        <item quantity="other">Wiederverbinden in %d Sekunden.</item>
+    </plurals>
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5fd0d68..f8994f9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,224 +1,242 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_open">Abrir barra de navegación</string>
-  <string name="drawer_close">Cerrar barra de navegación</string>
-  <string name="drawer_not_connected">No conectado</string>
-  <string name="drawer_server">Servidor</string>
-  <string name="drawer_tokens">Tokens de acceso</string>
-  <string name="drawer_pinned">Canales fijados</string>
-  <string name="drawer_header_servers">Servidores</string>
-  <string name="drawer_favorites">Favoritos</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">Servidores públicos</string>
-  <!--Chat formatting-->
-  <string name="chat_message_tree">(Árbol)</string>
-  <string name="chat_message_channel">(Canal)</string>
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">Administrador</string>
-  <string name="user_menu_kick">Expulsar</string>
-  <string name="user_menu_ban">Prohibir</string>
-  <string name="user_menu_mute">Enmudecer</string>
-  <string name="user_menu_deafen">Ensordecer</string>
-  <string name="user_menu_move">Mover</string>
-  <string name="user_menu_priority_speaker">Prioridad de voz</string>
-  <string name="user_menu_local_mute">Enmudecer localmente</string>
-  <string name="user_menu_ignore_messages">Ignorar mensajes</string>
-  <string name="user_menu_change_comment">Cambiar comentario</string>
-  <string name="user_menu_view_comment">Ver comentario</string>
-  <string name="user_menu_reset_comment">Reiniciar comentario</string>
-  <string name="user_menu_send_message">Enviar mensaje</string>
-  <string name="user_menu_information">Información</string>
-  <string name="user_menu_register">Registrar</string>
-  <string name="user_menu_registered">Registrado</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Fijar</string>
-  <!--Comment Fragment-->
-  <string name="comment_view">Mostrar</string>
-  <string name="comment_edit_source">Editar fuente</string>
-  <string name="comment_view_source">Ver fuente</string>
-  <!--Server Info Fragment-->
-  <string name="control_channel">Controlar canal</string>
-  <string name="tcp_encryption_mode">Cifrado con AES256-SHA de 256 bits</string>
-  <string name="voice_channel">Canal de voz</string>
-  <string name="udp_encryption_mode">Encrypted with 128 bit OCB-AES128</string>
-  <string name="audio_bandwidth">Ancho de banda del audio</string>
-  <string name="server_info_protocol">Protocolo %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_latency">%.2f ms de latencia</string>
-  <string name="server_info_host">Host remoto %1$s (puerto %2$d)</string>
-  <string name="server_info_codec">Códec: %s</string>
-  <string name="server_info_max_bandwidth">Máximo %.1f kbit/s</string>
-  <string name="server_info_current_bandwidth">Actual %.1f kbit/s</string>
-  <!--Server matching-->
-  <string name="server_match">Buscar servidor</string>
-  <string name="server_match_progress">Buscando servidor…</string>
-  <string name="server_match_found">Servidor encontrado</string>
-  <string name="server_match_not_found">No se pudo conectar al servidor</string>
-  <string name="server_match_expand_country">No se pudo encontrar ningún servidor óptimo en tu país, ¿Desea ampliar el rango de búsqueda a mundial?</string>
-  <string name="server_match_info">Nombre: %1$s\nHost: %2$s:%3$d\nUsuarios: %4$d / %5$d\nVersión: %6$s \nPaís: %7$s \nLatencia: %8$d ms</string>
-  <string name="server_match_description">Mumla puede buscarle automaticamente un servidor vacío, optimizado usando la localización del servidor, versión y latencia.</string>
-  <!--Common-->
-  <string name="channels">Canales</string>
-  <string name="no_servers">No se han añadido servidores.\nPulsa el botón añadir para comenzar.</string>
-  <string name="server_add">Añadir servidor</string>
-  <string name="server_password">Contraseña</string>
-  <string name="server_username">Nombre de usuario</string>
-  <string name="server_port">Puerto</string>
-  <string name="server_host">Dirección</string>
-  <string name="server_label">Etiqueta</string>
-  <string name="connecting">Conectando</string>
-  <string name="connecting_to_server">Conectando a %s</string>
-  <string name="fragment_chat">Chat</string>
-  <string name="fragment_channel">Canal</string>
-  <string name="menu_settings">Opciones</string>
-  <string name="ptt">Presionar-para-hablar</string>
-  <string name="mute">Enmudecerse</string>
-  <string name="deafen">Ensordecerse</string>
-  <string name="disconnect">Desconectar</string>
-  <string name="disconnectSure">¿Está seguro de que desea desconectarse del servidor %s?</string>
-  <string name="save">Guardar</string>
-  <string name="add">Añadir</string>
-  <string name="preferences">Preferencias</string>
-  <string name="togglelocalmute">Alternar enmudecimiento local</string>
-  <string name="chat">Chat</string>
-  <string name="perm_denied">¡Permiso denegado!</string>
-  <string name="connectionRefused">Conexión rechazada</string>
-  <string name="confirm_delete_server">¿Está seguro de que desea borrar este servidor?</string>
-  <string name="confirm_delete_channel">¿Está seguro de que desea borrar este canal?</string>
-  <string name="disconnected">Desconectado</string>
-  <string name="kicked_message">Expulsado del servidor.\nRazón: %s</string>
-  <string name="loading">Cargando</string>
-  <string name="reset_key">Reiniciar llave</string>
-  <string name="externalStorageUnavailable">Almacenamiento externo no disponible, no se puede cargar el certificado.</string>
-  <string name="addFavorite">Añadir a favoritos</string>
-  <string name="removeFavorite">Eliminar de favoritos</string>
-  <string name="viewFavorites">Ver favoritos</string>
-  <string name="favorites">Favoritos</string>
-  <string name="favoriteRemoved">Favorito eliminado.</string>
-  <string name="favoriteAdded">Favorito añadido.</string>
-  <string name="noFavorites">No hay canales favoritos.</string>
-  <string name="accessTokens">Tokens de acceso</string>
-  <string name="accessAdd">Añadir token de acceso</string>
-  <string name="pushToTalkHint">(marque la casilla para habilitar el alternado)</string>
-  <string name="messageReceived">Nuevo mensaje </string>
-  <string name="generateCert">Generar certificado</string>
-  <string name="generateCertSuccess">¡Su certificado ha sido establecido y guardado como %s!</string>
-  <string name="generateCertFailure">Fallo al generar el certificado</string>
-  <string name="generateCertProgress">Generando certificado</string>
-  <string name="search">Buscar</string>
-  <string name="searchHint">Buscar canales y usuarios</string>
-  <string name="undocumentedWakeLock">Desafortunadamente, no parece que podamos acceder al sensor de proximidad de su dispositivo. Por favor, cambie el modo de llamada a altavoz.</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="recordingVolume">Aumento del volumen de la grabación</string>
-  <string name="quickConnect">Conexión rápida</string>
-  <string name="connect">Conectar</string>
-  <string name="connectToServer">Conectar al servidor</string>
-  <string name="edit">Editar</string>
-  <string name="remove">Quitar</string>
-  <string name="delete">Eliminar</string>
-  <string name="retry">Reintentar</string>
-  <string name="messageToUser">Enviar mensaje al usuario \'%s\'</string>
-  <string name="messageToChannel">Enviar mensaje al canal \'%s\'</string>
-  <string name="online">En línea</string>
-  <string name="offline">Desconectado</string>
-  <string name="clearChat">Limpiar chat</string>
-  <string name="connected">Conectado</string>
-  <string name="mumlaConnected">Mumla conectado</string>
-  <string name="mumlaConnecting">Mumla está conectando</string>
-  <string name="mumlaDisconnected">Mumla desconectado</string>
-  <string name="lostConnection">Conexión perdida con el servidor</string>
-  <string name="resume">Reanudar</string>
-  <string name="channel">Canal</string>
-  <string name="user">Usuario</string>
-  <string name="server">Servidor</string>
-  <string name="chat_notify_moved">%1$s fue movido a este canal desde %2$s por %3$s.</string>
-  <string name="chat_notify_muted_deafened">Mudo y sordo.</string>
-  <string name="chat_notify_muted">Mudo.</string>
-  <string name="chat_notify_unmuted">Desenmudecido</string>
-  <string name="chat_notify_unmuted_undeafened">Con voz y escucha.</string>
-  <string name="chat_notify_now_muted_deafened">%s está ahora enmudecido y ensordecido</string>
-  <string name="chat_notify_now_muted">%s está ahora enmudecido.</string>
-  <string name="chat_notify_now_unmuted">%s ahora tiene voz.</string>
-  <string name="chat_notify_now_unmuted_undeafened">%s ahora tiene voz y escucha.</string>
-  <string name="chat_notify_connected">%s se ha conectado.</string>
-  <string name="chat_notify_disconnected">%s se ha desconectado.</string>
-  <string name="unknown">Desconocido</string>
-  <string name="server_list_title_favorite">Favoritos</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="server_list_title_public_internet">Públicos</string>
-  <string name="ping">Ping</string>
-  <string name="sort">Ordenar</string>
-  <string name="sortBy">Ordenar por…</string>
-  <string name="name">Nombre</string>
-  <string name="country">País</string>
-  <string name="share">Compartir</string>
-  <string name="description">Descripción</string>
-  <string name="shareMessage">¡Entre a este servidor de Mumble con Mumla! %s</string>
-  <string name="noServerInfo">Hacer ping para obtener información</string>
-  <string name="status_notify_muted_and_deafened">Mudo y sordo.</string>
-  <string name="status_notify_muted">Mudo.</string>
-  <string name="comment">Comentar</string>
-  <string name="close">Cerrar</string>
-  <string name="retrieving">Obteniendo…</string>
-  <string name="search_name">Nombre</string>
-  <string name="search_country">País</string>
-  <string name="preferences_immutable">Esta opción no puede ser cambiada mientras se esté conectado a un servidor.</string>
-  <string name="fullscreen">Pantalla completa</string>
-  <string name="fullscreen_chat">Chat</string>
-  <string name="fullscreen_channel">Canal</string>
-  <string name="fetchingServers">Un momento, obteniendo lista de servidores públicos</string>
-  <string name="information">Información</string>
-  <string name="register">Registrarse</string>
-  <string name="userControl">Control de usuario</string>
-  <string name="registerSelfSuccess">Enviar solicitud de registro</string>
-  <string name="error_fetching_servers">¡Error obteniendo servidores!\nCompruebe su conexión a Internet</string>
-  <string name="coming_soon">Esta característica estará disponible pronto.</string>
-  <string name="search_channel_users">%d usuarios</string>
-  <string name="reconnecting">Reconectando en %d segundos</string>
-  <string name="tapToReconnect">Toque para reconectar</string>
-  <string name="overlay">Superposición</string>
-  <string name="hint_reason">Razón</string>
-  <string name="hint_ptt">Presionar-para-hablar</string>
-  <string name="hint_ptt_summary">Simplemente presione este botón para hablar. Toque dos veces para alternar.</string>
-  <string name="hint_server_add">Bienvenido a Mumla</string>
-  <string name="hint_server_add_summary">Para empezar, añada un servidor a favoritos presionando el botón añadir en la barra de acciones.</string>
-  <string name="hint_switching">Cambio de vista</string>
-  <string name="hint_switching_summary">Cambie entre la vista del chat y de los canales usando los botones arriba a la izquierda o arrastrando</string>
-  <string name="action_settings">Opciones</string>
-  <string name="reconnect">Reconectar</string>
-  <string name="reconnect_dialog_message">Ya estás conectado a un servidor. ¿Conectar a este servidor en su lugar?</string>
-  <string name="confirm_reset_comment">¿Está seguro de que desea reiniciar el comentario del usuario %s?</string>
-  <string name="confirm">Confirmar</string>
-  <string name="expand">Expandir</string>
-  <string name="temporary">Temporal</string>
-  <string name="position">Posición</string>
-  <string name="channel_edit">Editar canal</string>
-  <string name="channel_add">Añadir canal</string>
-  <string name="tts_failed">Texto a voz ha fallado al inciarse</string>
-  <string name="mumble_url_parse_failed">¡Fallo al procesar la URL de Mumble!</string>
-  <string name="first_run_generate_certificate_title">¡Bienvenido a Mumla!</string>
-  <string name="first_run_generate_certificate">Generar un certificado es altamente recomendable y necesario para conectarse a ciertos servidores.</string>
-  <string name="generate">Generar</string>
-  <string name="certificate_not_valid">¡No se pudo cargar el certificado \'%s\'!</string>
-  <string name="invalid_password">Contraseña inválida</string>
-  <string name="send_message">Enviar mensaje</string>
-  <string name="channel_menu_view_description">Ver descripción</string>
-  <string name="untrusted_certificate">Certificado no confiable</string>
-  <string name="allow">Permitir</string>
-  <string name="trust_added">Añadido certificado al almacén de confianza</string>
-  <string name="trust_add_failed">¡Fallo al añadir el certificado al almacén confianza!</string>
-  <string name="trust_cleared">Limpiada base de datos de confianza</string>
-  <string name="cancelled">Cancelado</string>
-  <string name="transmit_mode">Modo de transmisión</string>
-  <string name="current_chat_target">Objetivo actual de chat</string>
-  <string name="channel_join">Unirse</string>
-  <string name="certificate_info">Asunto:\n%1$s\n\nVálido desde:\n%2$s\n\nVálido hasta:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
-  <string name="invalid_host">Host inválido</string>
-  <string name="invalid_port_range">Puerto inválido (1-65535)</string>
-  <string name="invalid_username">Nombre de usuario inválido</string>
-  <string name="cancel_reconnect">Cancelar reconexión</string>
-  <string name="attempting_reconnect">Error: %s.\n\nIntentando reconectar…</string>
-  <string name="default_">Predeterminado</string>
+    <!--Drawer pane-->
+    <string name="drawer_open">Abrir barra de navegación</string>
+    <string name="drawer_close">Cerrar barra de navegación</string>
+    <string name="drawer_not_connected">No conectado</string>
+    <string name="drawer_server">Servidor</string>
+    <string name="drawer_tokens">Tokens de acceso</string>
+    <string name="drawer_pinned">Canales fijados</string>
+    <string name="drawer_header_servers">Servidores</string>
+    <string name="drawer_favorites">Favoritos</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">Servidores públicos</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_tree">(Árbol)</string>
+    <string name="chat_message_channel">(Canal)</string>
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">Administrador</string>
+    <string name="user_menu_kick">Expulsar</string>
+    <string name="user_menu_ban">Prohibir</string>
+    <string name="user_menu_mute">Enmudecer</string>
+    <string name="user_menu_deafen">Ensordecer</string>
+    <string name="user_menu_move">Mover</string>
+    <string name="user_menu_priority_speaker">Prioridad de voz</string>
+    <string name="user_menu_local_mute">Enmudecer localmente</string>
+    <string name="user_menu_ignore_messages">Ignorar mensajes</string>
+    <string name="user_menu_change_comment">Cambiar comentario</string>
+    <string name="user_menu_view_comment">Ver comentario</string>
+    <string name="user_menu_reset_comment">Reiniciar comentario</string>
+    <string name="user_menu_send_message">Enviar mensaje</string>
+    <string name="user_menu_information">Información</string>
+    <string name="user_menu_register">Registrar</string>
+    <string name="user_menu_registered">Registrado</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Fijar</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_view">Mostrar</string>
+    <string name="comment_edit_source">Editar fuente</string>
+    <string name="comment_view_source">Ver fuente</string>
+
+    <!--Server Info Fragment-->
+    <string name="control_channel">Controlar canal</string>
+    <string name="tcp_encryption_mode">Cifrado con AES256-SHA de 256 bits</string>
+    <string name="voice_channel">Canal de voz</string>
+    <string name="udp_encryption_mode">Encrypted with 128 bit OCB-AES128</string>
+    <string name="audio_bandwidth">Ancho de banda del audio</string>
+    <string name="server_info_protocol">Protocolo %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_latency">%.2f ms de latencia</string>
+    <string name="server_info_host">Host remoto %1$s (puerto %2$d)</string>
+    <string name="server_info_codec">Códec: %s</string>
+    <string name="server_info_max_bandwidth">Máximo %.1f kbit/s</string>
+    <string name="server_info_current_bandwidth">Actual %.1f kbit/s</string>
+
+    <!--Server matching-->
+    <string name="server_match">Buscar servidor</string>
+    <string name="server_match_progress">Buscando servidor…</string>
+    <string name="server_match_found">Servidor encontrado</string>
+    <string name="server_match_not_found">No se pudo conectar al servidor</string>
+    <string name="server_match_expand_country">No se pudo encontrar ningún servidor óptimo en tu país, ¿Desea ampliar el rango de búsqueda a mundial?</string>
+    <string name="server_match_info">Nombre: %1$s\nHost: %2$s:%3$d\nUsuarios: %4$d / %5$d\nVersión: %6$s \nPaís: %7$s \nLatencia: %8$d ms</string>
+    <string name="server_match_description">Mumla puede buscarle automaticamente un servidor vacío, optimizado usando la localización del servidor, versión y latencia.</string>
+
+    <!--Common-->
+    <string name="channels">Canales</string>
+    <string name="no_servers">No se han añadido servidores.\nPulsa el botón añadir para comenzar.</string>
+    <string name="server_add">Añadir servidor</string>
+    <string name="server_password">Contraseña</string>
+    <string name="server_username">Nombre de usuario</string>
+    <string name="server_port">Puerto</string>
+    <string name="server_host">Dirección</string>
+    <string name="server_label">Etiqueta</string>
+    <string name="connecting">Conectando</string>
+    <string name="connecting_to_server">Conectando a %s</string>
+    <string name="fragment_chat">Chat</string>
+    <string name="fragment_channel">Canal</string>
+    <string name="menu_settings">Opciones</string>
+    <string name="ptt">Presionar-para-hablar</string>
+    <string name="mute">Enmudecerse</string>
+    <string name="deafen">Ensordecerse</string>
+    <string name="disconnect">Desconectar</string>
+    <string name="disconnectSure">¿Está seguro de que desea desconectarse del servidor %s?</string>
+    <string name="save">Guardar</string>
+    <string name="add">Añadir</string>
+    <string name="preferences">Preferencias</string>
+    <string name="togglelocalmute">Alternar enmudecimiento local</string>
+    <string name="chat">Chat</string>
+    <string name="perm_denied">¡Permiso denegado!</string>
+    <string name="connectionRefused">Conexión rechazada</string>
+    <string name="confirm_delete_server">¿Está seguro de que desea borrar este servidor?</string>
+    <string name="confirm_delete_channel">¿Está seguro de que desea borrar este canal?</string>
+    <string name="disconnected">Desconectado</string>
+    <string name="kicked_message">Expulsado del servidor.\nRazón: %s</string>
+    <string name="loading">Cargando</string>
+    <string name="reset_key">Reiniciar llave</string>
+    <string name="externalStorageUnavailable">Almacenamiento externo no disponible, no se puede cargar el certificado.</string>
+    <string name="addFavorite">Añadir a favoritos</string>
+    <string name="removeFavorite">Eliminar de favoritos</string>
+    <string name="viewFavorites">Ver favoritos</string>
+    <string name="favorites">Favoritos</string>
+    <string name="favoriteRemoved">Favorito eliminado.</string>
+    <string name="favoriteAdded">Favorito añadido.</string>
+    <string name="noFavorites">No hay canales favoritos.</string>
+    <string name="accessTokens">Tokens de acceso</string>
+    <string name="accessAdd">Añadir token de acceso</string>
+    <string name="pushToTalkHint">(marque la casilla para habilitar el alternado)</string>
+    <string name="messageReceived">Nuevo mensaje </string>
+    <string name="generateCert">Generar certificado</string>
+    <string name="generateCertSuccess">¡Su certificado ha sido establecido y guardado como %s!</string>
+    <string name="generateCertFailure">Fallo al generar el certificado</string>
+    <string name="generateCertProgress">Generando certificado</string>
+    <string name="search">Buscar</string>
+    <string name="searchHint">Buscar canales y usuarios</string>
+    <string name="undocumentedWakeLock">Desafortunadamente, no parece que podamos acceder al sensor de proximidad de su dispositivo. Por favor, cambie el modo de llamada a altavoz.</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="recordingVolume">Aumento del volumen de la grabación</string>
+    <string name="quickConnect">Conexión rápida</string>
+    <string name="connect">Conectar</string>
+    <string name="connectToServer">Conectar al servidor</string>
+    <string name="edit">Editar</string>
+    <string name="remove">Quitar</string>
+    <string name="delete">Eliminar</string>
+    <string name="retry">Reintentar</string>
+    <string name="messageToUser">Enviar mensaje al usuario \'%s\'</string>
+    <string name="messageToChannel">Enviar mensaje al canal \'%s\'</string>
+    <string name="online">En línea</string>
+    <string name="offline">Desconectado</string>
+    <string name="clearChat">Limpiar chat</string>
+    <string name="connected">Conectado</string>
+    <string name="mumlaConnected">Mumla conectado</string>
+    <string name="mumlaConnecting">Mumla está conectando</string>
+    <string name="mumlaDisconnected">Mumla desconectado</string>
+    <string name="lostConnection">Conexión perdida con el servidor</string>
+    <string name="resume">Reanudar</string>
+    <string name="channel">Canal</string>
+    <string name="user">Usuario</string>
+    <string name="server">Servidor</string>
+    <string name="chat_notify_moved">%1$s fue movido a este canal desde %2$s por %3$s.</string>
+    <string name="chat_notify_muted_deafened">Mudo y sordo.</string>
+    <string name="chat_notify_muted">Mudo.</string>
+    <string name="chat_notify_unmuted">Desenmudecido</string>
+    <string name="chat_notify_unmuted_undeafened">Con voz y escucha.</string>
+    <string name="chat_notify_now_muted_deafened">%s está ahora enmudecido y ensordecido</string>
+    <string name="chat_notify_now_muted">%s está ahora enmudecido.</string>
+    <string name="chat_notify_now_unmuted">%s ahora tiene voz.</string>
+    <string name="chat_notify_now_unmuted_undeafened">%s ahora tiene voz y escucha.</string>
+    <string name="chat_notify_connected">%s se ha conectado.</string>
+    <string name="chat_notify_disconnected">%s se ha desconectado.</string>
+    <string name="unknown">Desconocido</string>
+    <string name="server_list_title_favorite">Favoritos</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="server_list_title_public_internet">Públicos</string>
+    <string name="ping">Ping</string>
+    <string name="sort">Ordenar</string>
+    <string name="sortBy">Ordenar por…</string>
+    <string name="name">Nombre</string>
+    <string name="country">País</string>
+    <string name="share">Compartir</string>
+    <string name="description">Descripción</string>
+    <string name="shareMessage">¡Entre a este servidor de Mumble con Mumla! %s</string>
+    <string name="noServerInfo">Hacer ping para obtener información</string>
+    <string name="status_notify_muted_and_deafened">Mudo y sordo.</string>
+    <string name="status_notify_muted">Mudo.</string>
+    <string name="comment">Comentar</string>
+    <string name="close">Cerrar</string>
+    <string name="retrieving">Obteniendo…</string>
+    <string name="search_name">Nombre</string>
+    <string name="search_country">País</string>
+    <string name="preferences_immutable">Esta opción no puede ser cambiada mientras se esté conectado a un servidor.</string>
+    <string name="fullscreen">Pantalla completa</string>
+    <string name="fullscreen_chat">Chat</string>
+    <string name="fullscreen_channel">Canal</string>
+    <string name="fetchingServers">Un momento, obteniendo lista de servidores públicos</string>
+    <string name="information">Información</string>
+    <string name="register">Registrarse</string>
+    <string name="userControl">Control de usuario</string>
+    <string name="registerSelfSuccess">Enviar solicitud de registro</string>
+    <string name="error_fetching_servers">¡Error obteniendo servidores!\nCompruebe su conexión a Internet</string>
+    <string name="coming_soon">Esta característica estará disponible pronto.</string>
+    <string name="tapToReconnect">Toque para reconectar</string>
+    <string name="overlay">Superposición</string>
+    <string name="hint_reason">Razón</string>
+    <string name="hint_ptt">Presionar-para-hablar</string>
+    <string name="hint_ptt_summary">Simplemente presione este botón para hablar. Toque dos veces para alternar.</string>
+    <string name="hint_server_add">Bienvenido a Mumla</string>
+    <string name="hint_server_add_summary">Para empezar, añada un servidor a favoritos presionando el botón añadir en la barra de acciones.</string>
+    <string name="hint_switching">Cambio de vista</string>
+    <string name="hint_switching_summary">Cambie entre la vista del chat y de los canales usando los botones arriba a la izquierda o arrastrando</string>
+    <string name="action_settings">Opciones</string>
+    <string name="reconnect">Reconectar</string>
+    <string name="reconnect_dialog_message">Ya estás conectado a un servidor. ¿Conectar a este servidor en su lugar?</string>
+    <string name="confirm_reset_comment">¿Está seguro de que desea reiniciar el comentario del usuario %s?</string>
+    <string name="confirm">Confirmar</string>
+    <string name="expand">Expandir</string>
+    <string name="temporary">Temporal</string>
+    <string name="position">Posición</string>
+    <string name="channel_edit">Editar canal</string>
+    <string name="channel_add">Añadir canal</string>
+    <string name="tts_failed">Texto a voz ha fallado al inciarse</string>
+    <string name="mumble_url_parse_failed">¡Fallo al procesar la URL de Mumble!</string>
+    <string name="first_run_generate_certificate_title">¡Bienvenido a Mumla!</string>
+    <string name="first_run_generate_certificate">Generar un certificado es altamente recomendable y necesario para conectarse a ciertos servidores.</string>
+    <string name="generate">Generar</string>
+    <string name="certificate_not_valid">¡No se pudo cargar el certificado \'%s\'!</string>
+    <string name="invalid_password">Contraseña inválida</string>
+    <string name="send_message">Enviar mensaje</string>
+    <string name="channel_menu_view_description">Ver descripción</string>
+    <string name="untrusted_certificate">Certificado no confiable</string>
+    <string name="allow">Permitir</string>
+    <string name="trust_added">Añadido certificado al almacén de confianza</string>
+    <string name="trust_add_failed">¡Fallo al añadir el certificado al almacén confianza!</string>
+    <string name="trust_cleared">Limpiada base de datos de confianza</string>
+    <string name="cancelled">Cancelado</string>
+    <string name="transmit_mode">Modo de transmisión</string>
+    <string name="current_chat_target">Objetivo actual de chat</string>
+    <string name="channel_join">Unirse</string>
+    <string name="certificate_info">Asunto:\n%1$s\n\nVálido desde:\n%2$s\n\nVálido hasta:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
+    <string name="invalid_host">Host inválido</string>
+    <string name="invalid_port_range">Puerto inválido (1-65535)</string>
+    <string name="invalid_username">Nombre de usuario inválido</string>
+    <string name="cancel_reconnect">Cancelar reconexión</string>
+    <string name="attempting_reconnect">Error: %s.\n\nIntentando reconectar…</string>
+    <string name="default_">Predeterminado</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d usuario</item>
+        <item quantity="other">%d usuarios</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Reconectando en %d segundo</item>
+        <item quantity="other">Reconectando en %d segundos</item>
+    </plurals>
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 64152bb..1c0e182 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,224 +1,242 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_open">Ouvrir Drawer</string>
-  <string name="drawer_close">Fermer Drawer</string>
-  <string name="drawer_not_connected">Pas connecté</string>
-  <string name="drawer_server">Serveur</string>
-  <string name="drawer_tokens">Jetons d\'accès</string>
-  <string name="drawer_pinned">Salons épinglés</string>
-  <string name="drawer_header_servers">Serveurs</string>
-  <string name="drawer_favorites">Favoris</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">Serveurs publiques</string>
-  <!--Chat formatting-->
-  <string name="chat_message_tree">(Arborescence)</string>
-  <string name="chat_message_channel">(Canal)</string>
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">Admin</string>
-  <string name="user_menu_kick">Expulser</string>
-  <string name="user_menu_ban">Bannir</string>
-  <string name="user_menu_mute">Muet</string>
-  <string name="user_menu_deafen">Sourd</string>
-  <string name="user_menu_move">Déplacer</string>
-  <string name="user_menu_priority_speaker">Priorité du haut-parleur</string>
-  <string name="user_menu_local_mute">Ne plus l\'écouter</string>
-  <string name="user_menu_ignore_messages">Ignorer les messages</string>
-  <string name="user_menu_change_comment">Changer le commentaire</string>
-  <string name="user_menu_view_comment">Voir le commentaire</string>
-  <string name="user_menu_reset_comment">Réinitialiser le commentaire</string>
-  <string name="user_menu_send_message">Envoyer un message</string>
-  <string name="user_menu_information">Information</string>
-  <string name="user_menu_register">Enregistrer</string>
-  <string name="user_menu_registered">Enregistré</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Épingle</string>
-  <!--Comment Fragment-->
-  <string name="comment_view">Affichage</string>
-  <string name="comment_edit_source">Éditer la source</string>
-  <string name="comment_view_source">Voir la source</string>
-  <!--Server Info Fragment-->
-  <string name="control_channel">Canal de contrôle</string>
-  <string name="tcp_encryption_mode">Chiffré en AES256-SHA 256 bit</string>
-  <string name="voice_channel">Canal de voix</string>
-  <string name="udp_encryption_mode">Chiffré en OCB-AES128 128 bit</string>
-  <string name="audio_bandwidth">Débit audio</string>
-  <string name="server_info_protocol">Protocole %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_latency">%.2f ms de latence</string>
-  <string name="server_info_host">Hôte distant %1$s (port %2$d)</string>
-  <string name="server_info_codec">Codec : %s</string>
-  <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
-  <string name="server_info_current_bandwidth">Actuel %.1f kbit/s</string>
-  <!--Server matching-->
-  <string name="server_match">Trouver un serveur</string>
-  <string name="server_match_progress">Recherche un serveur…</string>
-  <string name="server_match_found">Serveur trouvé</string>
-  <string name="server_match_not_found">Impossible de trouver le serveur</string>
-  <string name="server_match_expand_country">Impossible de trouver aucun serveur optimal dans votre pays. Étendre la recherche au monde entier ?</string>
-  <string name="server_match_info">Nom: %1$s\nHôte: %2$s:%3$d\nUtilisateur: %4$d / %5$d\nVersion:%6$s \nPays: %7$s \nLatence: %8$d ms</string>
-  <string name="server_match_description">Mumla peut vous trouver automatiquement un serveur vide, en optimisant en se basant sur la position du serveur, sa version, et sa latence.</string>
-  <!--Common-->
-  <string name="channels">Canaux</string>
-  <string name="no_servers">Aucun serveur ajouté.\nAppuyez sur le bouton \"Ajouter\" dans la barre d\'action pour commencer.</string>
-  <string name="server_add">Ajouter un serveur</string>
-  <string name="server_password">Mot de passe</string>
-  <string name="server_username">Nom d\'utilisateur</string>
-  <string name="server_port">Port</string>
-  <string name="server_host">Adresse</string>
-  <string name="server_label">Libellé</string>
-  <string name="connecting">Connexion</string>
-  <string name="connecting_to_server">Connexion à %s</string>
-  <string name="fragment_chat">Chat</string>
-  <string name="fragment_channel">canal</string>
-  <string name="menu_settings">Paramètres</string>
-  <string name="ptt">Appuyer pour parler</string>
-  <string name="mute">Muet</string>
-  <string name="deafen">Sourd</string>
-  <string name="disconnect">Déconnecter</string>
-  <string name="disconnectSure">Êtes vous sur de vouloir vous déconnecter de serveur %s ?</string>
-  <string name="save">Sauvegarder</string>
-  <string name="add">Ajouter</string>
-  <string name="preferences">Préférences</string>
-  <string name="togglelocalmute">Activer/désactiver ne plus l\'écouter</string>
-  <string name="chat">Chat</string>
-  <string name="perm_denied">Permission non accordée !</string>
-  <string name="connectionRefused">Connexion refusée</string>
-  <string name="confirm_delete_server">Êtes vous sur vouloir supprimer ce serveur ?</string>
-  <string name="confirm_delete_channel">Êtes vous sur de vouloir supprimer ce salon?</string>
-  <string name="disconnected">Déconnecté</string>
-  <string name="kicked_message">Expulsé du serveur.\nRaison: %s</string>
-  <string name="loading">Chargement…</string>
-  <string name="reset_key">Touche pour reset</string>
-  <string name="externalStorageUnavailable">Stockage externe indisponible, impossible de charger le certificat</string>
-  <string name="addFavorite">Ajouter un favori</string>
-  <string name="removeFavorite">Supprimer un favori</string>
-  <string name="viewFavorites">Afficher les favoris</string>
-  <string name="favorites">Favoris</string>
-  <string name="favoriteRemoved">Favori supprimé.</string>
-  <string name="favoriteAdded">Favori ajouté.</string>
-  <string name="noFavorites">Pas de salon favoris.</string>
-  <string name="accessTokens">Jeton d\'accès</string>
-  <string name="accessAdd">Ajouter un jeton d\'accès</string>
-  <string name="pushToTalkHint">(Cocher la case pour permettre la bascule)</string>
-  <string name="messageReceived">Nouveau message</string>
-  <string name="generateCert">Générer un certificat</string>
-  <string name="generateCertSuccess">Votre certificat a été définie et enregistré sous %s!</string>
-  <string name="generateCertFailure">Échec de la génération du certificat.</string>
-  <string name="generateCertProgress">Génération d\'un certificat…</string>
-  <string name="search">Rechercher</string>
-  <string name="searchHint">Rechercher des salons et des utilisateurs</string>
-  <string name="undocumentedWakeLock">Malheuresement, il ne semble pas que nous puissions proposer le déverrouillage grâce aux capteurs de proximité pour votre appareil. Veuillez changer le mode d\'appel à haut-parleur.</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="recordingVolume">Recording Volume Boost</string>
-  <string name="quickConnect">Connexion rapide</string>
-  <string name="connect">Connexion</string>
-  <string name="connectToServer">Connexion au serveur</string>
-  <string name="edit">Éditer</string>
-  <string name="remove">Supprimer</string>
-  <string name="delete">Effacer</string>
-  <string name="retry">Réessayer</string>
-  <string name="messageToUser">Écrire un message à l\'utilisateur \'%s\'</string>
-  <string name="messageToChannel">Écrire un message dans le salon\'%s\'</string>
-  <string name="online">En ligne</string>
-  <string name="offline">Hors ligne</string>
-  <string name="clearChat">Vider le chat</string>
-  <string name="connected">Connecté</string>
-  <string name="mumlaConnected">Mumla connecté</string>
-  <string name="mumlaConnecting">Mumla en connexion</string>
-  <string name="mumlaDisconnected">Mumla déconnecté</string>
-  <string name="lostConnection">Connexion au serveur perdu.</string>
-  <string name="resume">Reprendre</string>
-  <string name="channel">Salon</string>
-  <string name="user">Utilisateur</string>
-  <string name="server">Serveur</string>
-  <string name="chat_notify_moved">%1$s a été déplacé de %2$s par %3$s.</string>
-  <string name="chat_notify_muted_deafened">Muet et sourd.</string>
-  <string name="chat_notify_muted">Muet.</string>
-  <string name="chat_notify_unmuted">Non muet.</string>
-  <string name="chat_notify_unmuted_undeafened">N\'est plus muet et sourd.</string>
-  <string name="chat_notify_now_muted_deafened">%s et maintenant muet et sourd.</string>
-  <string name="chat_notify_now_muted">%s est maintenant muet.</string>
-  <string name="chat_notify_now_unmuted">%s n\'est maintenant plus muet.</string>
-  <string name="chat_notify_now_unmuted_undeafened">%s n\'est plus muet et sourd.</string>
-  <string name="chat_notify_connected">%s connecté.</string>
-  <string name="chat_notify_disconnected">%s déconnecté.</string>
-  <string name="unknown">Inconnu</string>
-  <string name="server_list_title_favorite">Favoris</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="server_list_title_public_internet">Internet publique</string>
-  <string name="ping">Ping</string>
-  <string name="sort">Trier</string>
-  <string name="sortBy">Trier par…</string>
-  <string name="name">Nom</string>
-  <string name="country">Pays</string>
-  <string name="share">Partager</string>
-  <string name="description">Description</string>
-  <string name="shareMessage">Rejoindre ce serveur Mumble avec Mumla ! %s</string>
-  <string name="noServerInfo">Pinguer pour récupérer des infos</string>
-  <string name="status_notify_muted_and_deafened">Muet et sourd.</string>
-  <string name="status_notify_muted">Muet.</string>
-  <string name="comment">Commenter</string>
-  <string name="close">Fermer</string>
-  <string name="retrieving">Récupération…</string>
-  <string name="search_name">Nom</string>
-  <string name="search_country">Pays</string>
-  <string name="preferences_immutable">Ce paramètre ne peut pas être changé pendant une connexion au serveur.</string>
-  <string name="fullscreen">Plein écran</string>
-  <string name="fullscreen_chat">Chat</string>
-  <string name="fullscreen_channel">Salon</string>
-  <string name="fetchingServers">Veuillez attendre, récupération de la liste des serveurs publiques.</string>
-  <string name="information">Information</string>
-  <string name="register">S\'enregistrer</string>
-  <string name="userControl">Contrôle de l\'utilisateur</string>
-  <string name="registerSelfSuccess">Demande d\'inscription envoyé</string>
-  <string name="error_fetching_servers">Erreur du chargement des serveurs!\nVérifiez votre connexion internet.</string>
-  <string name="coming_soon">Cette fonctionnalité arrivera bientôt.</string>
-  <string name="search_channel_users">%d utilisateurs</string>
-  <string name="reconnecting">Reconnexion dans %d secondes.</string>
-  <string name="tapToReconnect">Appuyez pour vous reconnecter</string>
-  <string name="overlay">Overlay</string>
-  <string name="hint_reason">Raison</string>
-  <string name="hint_ptt">Appuyer pour parler</string>
-  <string name="hint_ptt_summary">Appuyez simplement sur ce bouton enfoncé pour parler. Double-cliquez pour l\'activer.</string>
-  <string name="hint_server_add">Bienvenue sur Mumla</string>
-  <string name="hint_server_add_summary">Pour commence, ajouter un serveur favori en appuyant sur le bouton ajouter dans la barre d\'action.</string>
-  <string name="hint_switching">Basculer entre les vues</string>
-  <string name="hint_switching_summary">Basculer entre le chat et le salon en utilisant les boutons en haut à gauche ou en glissant.</string>
-  <string name="action_settings">Paramètres</string>
-  <string name="reconnect">Reconnect</string>
-  <string name="reconnect_dialog_message">Vous êtes déjà connecté à un serveur. Se connecter à ce serveur à la place?</string>
-  <string name="confirm_reset_comment">Êtes vous sûr de vouloir remettre à zéro le commentaire de l\'utilisateur %s?</string>
-  <string name="confirm">Confirmer</string>
-  <string name="expand">Développer</string>
-  <string name="temporary">Temporaire</string>
-  <string name="position">Position</string>
-  <string name="channel_edit">Éditer le salon</string>
-  <string name="channel_add">Ajouter un salon</string>
-  <string name="tts_failed">Erreur de l\'initialisation de TTS</string>
-  <string name="mumble_url_parse_failed">Échec de l\'analyse de l\'URL Mumble !</string>
-  <string name="first_run_generate_certificate_title">Bienvenue dans Mumla!</string>
-  <string name="first_run_generate_certificate">Générer un certificat est très recommandé, et nécessaire pour la connexion à certains serveurs.</string>
-  <string name="generate">Générer</string>
-  <string name="certificate_not_valid">Impossible de charger le certificat \'%s\'!</string>
-  <string name="invalid_password">Mot de passe invalide.</string>
-  <string name="send_message">Envoyer un message</string>
-  <string name="channel_menu_view_description">Voir la description</string>
-  <string name="untrusted_certificate">Certificat non autorisé</string>
-  <string name="allow">Autoriser</string>
-  <string name="trust_added">Certificat ajouté dans la base de confiance</string>
-  <string name="trust_add_failed">Échec de l\'ajout du certificat à la base de confiance!</string>
-  <string name="trust_cleared">Base de confiance effacée</string>
-  <string name="cancelled">Annulé</string>
-  <string name="transmit_mode">Mode de transmission</string>
-  <string name="current_chat_target">Discussion cible actuelle</string>
-  <string name="channel_join">Joindre</string>
-  <string name="certificate_info">Sujet:\n%1$s\n\nDébut de validité:\n%2$s\n\nFin de validité:\n%3$s\n\nEmpreinte (SHA-1):\n%4$s\n\nEmpreinte (SHA-256):\n%5$s</string>
-  <string name="invalid_host">Hôte invalide</string>
-  <string name="invalid_port_range">Port invalide (1-65535)</string>
-  <string name="invalid_username">Nom d\'utilisateur invalide</string>
-  <string name="cancel_reconnect">Annuler la reconnexion</string>
-  <string name="attempting_reconnect">Erreur: %s.\n\nTentative de reconnexion…</string>
-  <string name="default_">Défaut</string>
+    <!--Drawer pane-->
+    <string name="drawer_open">Ouvrir Drawer</string>
+    <string name="drawer_close">Fermer Drawer</string>
+    <string name="drawer_not_connected">Pas connecté</string>
+    <string name="drawer_server">Serveur</string>
+    <string name="drawer_tokens">Jetons d\'accès</string>
+    <string name="drawer_pinned">Salons épinglés</string>
+    <string name="drawer_header_servers">Serveurs</string>
+    <string name="drawer_favorites">Favoris</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">Serveurs publiques</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_tree">(Arborescence)</string>
+    <string name="chat_message_channel">(Canal)</string>
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">Admin</string>
+    <string name="user_menu_kick">Expulser</string>
+    <string name="user_menu_ban">Bannir</string>
+    <string name="user_menu_mute">Muet</string>
+    <string name="user_menu_deafen">Sourd</string>
+    <string name="user_menu_move">Déplacer</string>
+    <string name="user_menu_priority_speaker">Priorité du haut-parleur</string>
+    <string name="user_menu_local_mute">Ne plus l\'écouter</string>
+    <string name="user_menu_ignore_messages">Ignorer les messages</string>
+    <string name="user_menu_change_comment">Changer le commentaire</string>
+    <string name="user_menu_view_comment">Voir le commentaire</string>
+    <string name="user_menu_reset_comment">Réinitialiser le commentaire</string>
+    <string name="user_menu_send_message">Envoyer un message</string>
+    <string name="user_menu_information">Information</string>
+    <string name="user_menu_register">Enregistrer</string>
+    <string name="user_menu_registered">Enregistré</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Épingle</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_view">Affichage</string>
+    <string name="comment_edit_source">Éditer la source</string>
+    <string name="comment_view_source">Voir la source</string>
+
+    <!--Server Info Fragment-->
+    <string name="control_channel">Canal de contrôle</string>
+    <string name="tcp_encryption_mode">Chiffré en AES256-SHA 256 bit</string>
+    <string name="voice_channel">Canal de voix</string>
+    <string name="udp_encryption_mode">Chiffré en OCB-AES128 128 bit</string>
+    <string name="audio_bandwidth">Débit audio</string>
+    <string name="server_info_protocol">Protocole %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_latency">%.2f ms de latence</string>
+    <string name="server_info_host">Hôte distant %1$s (port %2$d)</string>
+    <string name="server_info_codec">Codec : %s</string>
+    <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
+    <string name="server_info_current_bandwidth">Actuel %.1f kbit/s</string>
+
+    <!--Server matching-->
+    <string name="server_match">Trouver un serveur</string>
+    <string name="server_match_progress">Recherche un serveur…</string>
+    <string name="server_match_found">Serveur trouvé</string>
+    <string name="server_match_not_found">Impossible de trouver le serveur</string>
+    <string name="server_match_expand_country">Impossible de trouver aucun serveur optimal dans votre pays. Étendre la recherche au monde entier ?</string>
+    <string name="server_match_info">Nom: %1$s\nHôte: %2$s:%3$d\nUtilisateur: %4$d / %5$d\nVersion:%6$s \nPays: %7$s \nLatence: %8$d ms</string>
+    <string name="server_match_description">Mumla peut vous trouver automatiquement un serveur vide, en optimisant en se basant sur la position du serveur, sa version, et sa latence.</string>
+
+    <!--Common-->
+    <string name="channels">Canaux</string>
+    <string name="no_servers">Aucun serveur ajouté.\nAppuyez sur le bouton \"Ajouter\" dans la barre d\'action pour commencer.</string>
+    <string name="server_add">Ajouter un serveur</string>
+    <string name="server_password">Mot de passe</string>
+    <string name="server_username">Nom d\'utilisateur</string>
+    <string name="server_port">Port</string>
+    <string name="server_host">Adresse</string>
+    <string name="server_label">Libellé</string>
+    <string name="connecting">Connexion</string>
+    <string name="connecting_to_server">Connexion à %s</string>
+    <string name="fragment_chat">Chat</string>
+    <string name="fragment_channel">canal</string>
+    <string name="menu_settings">Paramètres</string>
+    <string name="ptt">Appuyer pour parler</string>
+    <string name="mute">Muet</string>
+    <string name="deafen">Sourd</string>
+    <string name="disconnect">Déconnecter</string>
+    <string name="disconnectSure">Êtes vous sur de vouloir vous déconnecter de serveur %s ?</string>
+    <string name="save">Sauvegarder</string>
+    <string name="add">Ajouter</string>
+    <string name="preferences">Préférences</string>
+    <string name="togglelocalmute">Activer/désactiver ne plus l\'écouter</string>
+    <string name="chat">Chat</string>
+    <string name="perm_denied">Permission non accordée !</string>
+    <string name="connectionRefused">Connexion refusée</string>
+    <string name="confirm_delete_server">Êtes vous sur vouloir supprimer ce serveur ?</string>
+    <string name="confirm_delete_channel">Êtes vous sur de vouloir supprimer ce salon?</string>
+    <string name="disconnected">Déconnecté</string>
+    <string name="kicked_message">Expulsé du serveur.\nRaison: %s</string>
+    <string name="loading">Chargement…</string>
+    <string name="reset_key">Touche pour reset</string>
+    <string name="externalStorageUnavailable">Stockage externe indisponible, impossible de charger le certificat</string>
+    <string name="addFavorite">Ajouter un favori</string>
+    <string name="removeFavorite">Supprimer un favori</string>
+    <string name="viewFavorites">Afficher les favoris</string>
+    <string name="favorites">Favoris</string>
+    <string name="favoriteRemoved">Favori supprimé.</string>
+    <string name="favoriteAdded">Favori ajouté.</string>
+    <string name="noFavorites">Pas de salon favoris.</string>
+    <string name="accessTokens">Jeton d\'accès</string>
+    <string name="accessAdd">Ajouter un jeton d\'accès</string>
+    <string name="pushToTalkHint">(Cocher la case pour permettre la bascule)</string>
+    <string name="messageReceived">Nouveau message</string>
+    <string name="generateCert">Générer un certificat</string>
+    <string name="generateCertSuccess">Votre certificat a été définie et enregistré sous %s!</string>
+    <string name="generateCertFailure">Échec de la génération du certificat.</string>
+    <string name="generateCertProgress">Génération d\'un certificat…</string>
+    <string name="search">Rechercher</string>
+    <string name="searchHint">Rechercher des salons et des utilisateurs</string>
+    <string name="undocumentedWakeLock">Malheuresement, il ne semble pas que nous puissions proposer le déverrouillage grâce aux capteurs de proximité pour votre appareil. Veuillez changer le mode d\'appel à haut-parleur.</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="recordingVolume">Recording Volume Boost</string>
+    <string name="quickConnect">Connexion rapide</string>
+    <string name="connect">Connexion</string>
+    <string name="connectToServer">Connexion au serveur</string>
+    <string name="edit">Éditer</string>
+    <string name="remove">Supprimer</string>
+    <string name="delete">Effacer</string>
+    <string name="retry">Réessayer</string>
+    <string name="messageToUser">Écrire un message à l\'utilisateur \'%s\'</string>
+    <string name="messageToChannel">Écrire un message dans le salon\'%s\'</string>
+    <string name="online">En ligne</string>
+    <string name="offline">Hors ligne</string>
+    <string name="clearChat">Vider le chat</string>
+    <string name="connected">Connecté</string>
+    <string name="mumlaConnected">Mumla connecté</string>
+    <string name="mumlaConnecting">Mumla en connexion</string>
+    <string name="mumlaDisconnected">Mumla déconnecté</string>
+    <string name="lostConnection">Connexion au serveur perdu.</string>
+    <string name="resume">Reprendre</string>
+    <string name="channel">Salon</string>
+    <string name="user">Utilisateur</string>
+    <string name="server">Serveur</string>
+    <string name="chat_notify_moved">%1$s a été déplacé de %2$s par %3$s.</string>
+    <string name="chat_notify_muted_deafened">Muet et sourd.</string>
+    <string name="chat_notify_muted">Muet.</string>
+    <string name="chat_notify_unmuted">Non muet.</string>
+    <string name="chat_notify_unmuted_undeafened">N\'est plus muet et sourd.</string>
+    <string name="chat_notify_now_muted_deafened">%s et maintenant muet et sourd.</string>
+    <string name="chat_notify_now_muted">%s est maintenant muet.</string>
+    <string name="chat_notify_now_unmuted">%s n\'est maintenant plus muet.</string>
+    <string name="chat_notify_now_unmuted_undeafened">%s n\'est plus muet et sourd.</string>
+    <string name="chat_notify_connected">%s connecté.</string>
+    <string name="chat_notify_disconnected">%s déconnecté.</string>
+    <string name="unknown">Inconnu</string>
+    <string name="server_list_title_favorite">Favoris</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="server_list_title_public_internet">Internet publique</string>
+    <string name="ping">Ping</string>
+    <string name="sort">Trier</string>
+    <string name="sortBy">Trier par…</string>
+    <string name="name">Nom</string>
+    <string name="country">Pays</string>
+    <string name="share">Partager</string>
+    <string name="description">Description</string>
+    <string name="shareMessage">Rejoindre ce serveur Mumble avec Mumla ! %s</string>
+    <string name="noServerInfo">Pinguer pour récupérer des infos</string>
+    <string name="status_notify_muted_and_deafened">Muet et sourd.</string>
+    <string name="status_notify_muted">Muet.</string>
+    <string name="comment">Commenter</string>
+    <string name="close">Fermer</string>
+    <string name="retrieving">Récupération…</string>
+    <string name="search_name">Nom</string>
+    <string name="search_country">Pays</string>
+    <string name="preferences_immutable">Ce paramètre ne peut pas être changé pendant une connexion au serveur.</string>
+    <string name="fullscreen">Plein écran</string>
+    <string name="fullscreen_chat">Chat</string>
+    <string name="fullscreen_channel">Salon</string>
+    <string name="fetchingServers">Veuillez attendre, récupération de la liste des serveurs publiques.</string>
+    <string name="information">Information</string>
+    <string name="register">S\'enregistrer</string>
+    <string name="userControl">Contrôle de l\'utilisateur</string>
+    <string name="registerSelfSuccess">Demande d\'inscription envoyé</string>
+    <string name="error_fetching_servers">Erreur du chargement des serveurs!\nVérifiez votre connexion internet.</string>
+    <string name="coming_soon">Cette fonctionnalité arrivera bientôt.</string>
+    <string name="tapToReconnect">Appuyez pour vous reconnecter</string>
+    <string name="overlay">Overlay</string>
+    <string name="hint_reason">Raison</string>
+    <string name="hint_ptt">Appuyer pour parler</string>
+    <string name="hint_ptt_summary">Appuyez simplement sur ce bouton enfoncé pour parler. Double-cliquez pour l\'activer.</string>
+    <string name="hint_server_add">Bienvenue sur Mumla</string>
+    <string name="hint_server_add_summary">Pour commence, ajouter un serveur favori en appuyant sur le bouton ajouter dans la barre d\'action.</string>
+    <string name="hint_switching">Basculer entre les vues</string>
+    <string name="hint_switching_summary">Basculer entre le chat et le salon en utilisant les boutons en haut à gauche ou en glissant.</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="reconnect">Reconnect</string>
+    <string name="reconnect_dialog_message">Vous êtes déjà connecté à un serveur. Se connecter à ce serveur à la place?</string>
+    <string name="confirm_reset_comment">Êtes vous sûr de vouloir remettre à zéro le commentaire de l\'utilisateur %s?</string>
+    <string name="confirm">Confirmer</string>
+    <string name="expand">Développer</string>
+    <string name="temporary">Temporaire</string>
+    <string name="position">Position</string>
+    <string name="channel_edit">Éditer le salon</string>
+    <string name="channel_add">Ajouter un salon</string>
+    <string name="tts_failed">Erreur de l\'initialisation de TTS</string>
+    <string name="mumble_url_parse_failed">Échec de l\'analyse de l\'URL Mumble !</string>
+    <string name="first_run_generate_certificate_title">Bienvenue dans Mumla!</string>
+    <string name="first_run_generate_certificate">Générer un certificat est très recommandé, et nécessaire pour la connexion à certains serveurs.</string>
+    <string name="generate">Générer</string>
+    <string name="certificate_not_valid">Impossible de charger le certificat \'%s\'!</string>
+    <string name="invalid_password">Mot de passe invalide.</string>
+    <string name="send_message">Envoyer un message</string>
+    <string name="channel_menu_view_description">Voir la description</string>
+    <string name="untrusted_certificate">Certificat non autorisé</string>
+    <string name="allow">Autoriser</string>
+    <string name="trust_added">Certificat ajouté dans la base de confiance</string>
+    <string name="trust_add_failed">Échec de l\'ajout du certificat à la base de confiance!</string>
+    <string name="trust_cleared">Base de confiance effacée</string>
+    <string name="cancelled">Annulé</string>
+    <string name="transmit_mode">Mode de transmission</string>
+    <string name="current_chat_target">Discussion cible actuelle</string>
+    <string name="channel_join">Joindre</string>
+    <string name="certificate_info">Sujet:\n%1$s\n\nDébut de validité:\n%2$s\n\nFin de validité:\n%3$s\n\nEmpreinte (SHA-1):\n%4$s\n\nEmpreinte (SHA-256):\n%5$s</string>
+    <string name="invalid_host">Hôte invalide</string>
+    <string name="invalid_port_range">Port invalide (1-65535)</string>
+    <string name="invalid_username">Nom d\'utilisateur invalide</string>
+    <string name="cancel_reconnect">Annuler la reconnexion</string>
+    <string name="attempting_reconnect">Erreur: %s.\n\nTentative de reconnexion…</string>
+    <string name="default_">Défaut</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d utilisateur</item>
+        <item quantity="other">%d utilisateurs</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Reconnexion en %d seconde.</item>
+        <item quantity="other">Reconnexion dans %d secondes.</item>
+    </plurals>
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9a840de..6775059 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,129 +1,148 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_not_connected">Non connesso</string>
-  <string name="drawer_server">Server</string>
-  <string name="drawer_header_servers">Server</string>
-  <string name="drawer_favorites">Favoriti</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">Server pubblici</string>
-  <!--Chat formatting-->
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">Admin</string>
-  <string name="user_menu_mute">Muto</string>
-  <string name="user_menu_ignore_messages">Ignora messaggi</string>
-  <string name="user_menu_change_comment">Cambia commento</string>
-  <string name="user_menu_view_comment">Mostra commento</string>
-  <string name="user_menu_send_message">Invia messaggio</string>
-  <string name="user_menu_information">Informazioni</string>
-  <string name="user_menu_register">Registra</string>
-  <string name="user_menu_registered">Registrato</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Pin</string>
-  <!--Comment Fragment-->
-  <string name="comment_edit_source">Modifica sorgente</string>
-  <string name="comment_view_source">Mostra sorgente</string>
-  <!--Server Info Fragment-->
-  <string name="server_info_protocol">Protocollo %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_codec">Codec: %s</string>
-  <!--Server matching-->
-  <string name="server_match">Cerca server</string>
-  <string name="server_match_found">Server trovato</string>
-  <string name="server_match_not_found">Impossibile trovare server</string>
-  <!--Common-->
-  <string name="channels">Canali</string>
-  <string name="server_add">Aggiungi server</string>
-  <string name="server_password">Password</string>
-  <string name="server_username">Nome utente</string>
-  <string name="server_port">Porta</string>
-  <string name="server_host">Indirizzo</string>
-  <string name="connecting">Connessione</string>
-  <string name="connecting_to_server">Connessione a %s</string>
-  <string name="fragment_chat">Chat</string>
-  <string name="fragment_channel">Canale</string>
-  <string name="menu_settings">Impostazioni</string>
-  <string name="mute">Muto</string>
-  <string name="disconnect">Disconetti</string>
-  <string name="disconnectSure">Sei sicuro di voler disconneterti dal server %s?</string>
-  <string name="save">Salva</string>
-  <string name="add">Agg.</string>
-  <string name="preferences">Preferenze</string>
-  <string name="chat">Chat</string>
-  <string name="perm_denied">Permesso negato!</string>
-  <string name="connectionRefused">Connessione rifiutata</string>
-  <string name="confirm_delete_server">Sei sicuro di voler eliminare questo server?</string>
-  <string name="confirm_delete_channel">Sei sicuro di voler eliminare questo canale?</string>
-  <string name="disconnected">Disconnesso.</string>
-  <string name="loading">Caricamento…</string>
-  <string name="addFavorite">Aggiungi preferito</string>
-  <string name="removeFavorite">Rimuovi preferito</string>
-  <string name="viewFavorites">Mostra preferiti</string>
-  <string name="favorites">Preferiti</string>
-  <string name="favoriteRemoved">Preferito rimosso.</string>
-  <string name="favoriteAdded">Preferito aggiunto.</string>
-  <string name="noFavorites">Nessun canale preferito.</string>
-  <string name="messageReceived">Nuovo messaggio</string>
-  <string name="generateCert">Genera certificato</string>
-  <string name="generateCertProgress">Generazione certificato…</string>
-  <string name="search">Cerca</string>
-  <string name="searchHint">Cerca canali e utenti</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="quickConnect">Connessione veloce</string>
-  <string name="connect">Connetti</string>
-  <string name="connectToServer">Connetti al server</string>
-  <string name="edit">Modifica</string>
-  <string name="remove">Rimuovi</string>
-  <string name="delete">Elimina</string>
-  <string name="retry">Riprova</string>
-  <string name="online">Online</string>
-  <string name="offline">Offline</string>
-  <string name="clearChat">Pulisci chat</string>
-  <string name="connected">Connesso</string>
-  <string name="mumlaConnected">Mumla connesso</string>
-  <string name="mumlaConnecting">Mumla in connessione</string>
-  <string name="mumlaDisconnected">Mumla disconnesso </string>
-  <string name="lostConnection">Connessione al server persa.</string>
-  <string name="resume">Riprendi</string>
-  <string name="channel">Canale</string>
-  <string name="user">Utente</string>
-  <string name="server">Server</string>
-  <string name="unknown">Sconosciuto</string>
-  <string name="server_list_title_favorite">Favoriti</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="ping">Ping</string>
-  <string name="sort">Ordine</string>
-  <string name="sortBy">Ordina per…</string>
-  <string name="name">Nome</string>
-  <string name="country">Nazione</string>
-  <string name="share">Condividi</string>
-  <string name="description">Descrizione</string>
-  <string name="comment">Commento</string>
-  <string name="close">Chiudi</string>
-  <string name="search_name">Nome</string>
-  <string name="search_country">Nazione</string>
-  <string name="fullscreen">Tutto schermo</string>
-  <string name="fullscreen_chat">Chat</string>
-  <string name="fullscreen_channel">Canale</string>
-  <string name="information">Informazioni</string>
-  <string name="userControl">Controllo utente</string>
-  <string name="coming_soon">Questa caratteristica arriverà presto.</string>
-  <string name="search_channel_users">%d utenti</string>
-  <string name="hint_reason">Ragione</string>
-  <string name="hint_server_add">Benvenuto su Mumla</string>
-  <string name="action_settings">Impostazioni</string>
-  <string name="reconnect">Riconnetti</string>
-  <string name="confirm">Conferma</string>
-  <string name="expand">Espandi</string>
-  <string name="temporary">Temporaneo</string>
-  <string name="position">Posizione</string>
-  <string name="channel_edit">Modifica canale</string>
-  <string name="channel_add">Aggiungi canale</string>
-  <string name="first_run_generate_certificate_title">Benvenuto su Mumla!</string>
-  <string name="generate">Genera</string>
-  <string name="invalid_password">Password non valida.</string>
-  <string name="send_message">Invia messaggio</string>
-  <string name="channel_menu_view_description">Mostra descrizione</string>
-  <string name="allow">Permetti</string>
+    <!--Drawer pane-->
+    <string name="drawer_not_connected">Non connesso</string>
+    <string name="drawer_server">Server</string>
+    <string name="drawer_header_servers">Server</string>
+    <string name="drawer_favorites">Favoriti</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">Server pubblici</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">Admin</string>
+    <string name="user_menu_mute">Muto</string>
+    <string name="user_menu_ignore_messages">Ignora messaggi</string>
+    <string name="user_menu_change_comment">Cambia commento</string>
+    <string name="user_menu_view_comment">Mostra commento</string>
+    <string name="user_menu_send_message">Invia messaggio</string>
+    <string name="user_menu_information">Informazioni</string>
+    <string name="user_menu_register">Registra</string>
+    <string name="user_menu_registered">Registrato</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Pin</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_edit_source">Modifica sorgente</string>
+    <string name="comment_view_source">Mostra sorgente</string>
+
+    <!--Server Info Fragment-->
+    <string name="server_info_protocol">Protocollo %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_codec">Codec: %s</string>
+
+    <!--Server matching-->
+    <string name="server_match">Cerca server</string>
+    <string name="server_match_found">Server trovato</string>
+    <string name="server_match_not_found">Impossibile trovare server</string>
+
+    <!--Common-->
+    <string name="channels">Canali</string>
+    <string name="server_add">Aggiungi server</string>
+    <string name="server_password">Password</string>
+    <string name="server_username">Nome utente</string>
+    <string name="server_port">Porta</string>
+    <string name="server_host">Indirizzo</string>
+    <string name="connecting">Connessione</string>
+    <string name="connecting_to_server">Connessione a %s</string>
+    <string name="fragment_chat">Chat</string>
+    <string name="fragment_channel">Canale</string>
+    <string name="menu_settings">Impostazioni</string>
+    <string name="mute">Muto</string>
+    <string name="disconnect">Disconetti</string>
+    <string name="disconnectSure">Sei sicuro di voler disconneterti dal server %s?</string>
+    <string name="save">Salva</string>
+    <string name="add">Agg.</string>
+    <string name="preferences">Preferenze</string>
+    <string name="chat">Chat</string>
+    <string name="perm_denied">Permesso negato!</string>
+    <string name="connectionRefused">Connessione rifiutata</string>
+    <string name="confirm_delete_server">Sei sicuro di voler eliminare questo server?</string>
+    <string name="confirm_delete_channel">Sei sicuro di voler eliminare questo canale?</string>
+    <string name="disconnected">Disconnesso.</string>
+    <string name="loading">Caricamento…</string>
+    <string name="addFavorite">Aggiungi preferito</string>
+    <string name="removeFavorite">Rimuovi preferito</string>
+    <string name="viewFavorites">Mostra preferiti</string>
+    <string name="favorites">Preferiti</string>
+    <string name="favoriteRemoved">Preferito rimosso.</string>
+    <string name="favoriteAdded">Preferito aggiunto.</string>
+    <string name="noFavorites">Nessun canale preferito.</string>
+    <string name="messageReceived">Nuovo messaggio</string>
+    <string name="generateCert">Genera certificato</string>
+    <string name="generateCertProgress">Generazione certificato…</string>
+    <string name="search">Cerca</string>
+    <string name="searchHint">Cerca canali e utenti</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="quickConnect">Connessione veloce</string>
+    <string name="connect">Connetti</string>
+    <string name="connectToServer">Connetti al server</string>
+    <string name="edit">Modifica</string>
+    <string name="remove">Rimuovi</string>
+    <string name="delete">Elimina</string>
+    <string name="retry">Riprova</string>
+    <string name="online">Online</string>
+    <string name="offline">Offline</string>
+    <string name="clearChat">Pulisci chat</string>
+    <string name="connected">Connesso</string>
+    <string name="mumlaConnected">Mumla connesso</string>
+    <string name="mumlaConnecting">Mumla in connessione</string>
+    <string name="mumlaDisconnected">Mumla disconnesso </string>
+    <string name="lostConnection">Connessione al server persa.</string>
+    <string name="resume">Riprendi</string>
+    <string name="channel">Canale</string>
+    <string name="user">Utente</string>
+    <string name="server">Server</string>
+    <string name="unknown">Sconosciuto</string>
+    <string name="server_list_title_favorite">Favoriti</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="ping">Ping</string>
+    <string name="sort">Ordine</string>
+    <string name="sortBy">Ordina per…</string>
+    <string name="name">Nome</string>
+    <string name="country">Nazione</string>
+    <string name="share">Condividi</string>
+    <string name="description">Descrizione</string>
+    <string name="comment">Commento</string>
+    <string name="close">Chiudi</string>
+    <string name="search_name">Nome</string>
+    <string name="search_country">Nazione</string>
+    <string name="fullscreen">Tutto schermo</string>
+    <string name="fullscreen_chat">Chat</string>
+    <string name="fullscreen_channel">Canale</string>
+    <string name="information">Informazioni</string>
+    <string name="userControl">Controllo utente</string>
+    <string name="coming_soon">Questa caratteristica arriverà presto.</string>
+    <string name="hint_reason">Ragione</string>
+    <string name="hint_server_add">Benvenuto su Mumla</string>
+    <string name="action_settings">Impostazioni</string>
+    <string name="reconnect">Riconnetti</string>
+    <string name="confirm">Conferma</string>
+    <string name="expand">Espandi</string>
+    <string name="temporary">Temporaneo</string>
+    <string name="position">Posizione</string>
+    <string name="channel_edit">Modifica canale</string>
+    <string name="channel_add">Aggiungi canale</string>
+    <string name="first_run_generate_certificate_title">Benvenuto su Mumla!</string>
+    <string name="generate">Genera</string>
+    <string name="invalid_password">Password non valida.</string>
+    <string name="send_message">Invia messaggio</string>
+    <string name="channel_menu_view_description">Mostra descrizione</string>
+    <string name="allow">Permetti</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d utente</item>
+        <item quantity="other">%d utenti</item>
+    </plurals>
+    <!-- <plurals name="reconnecting">
+        <item quantity="one">Reconnecting in %d second.</item>
+        <item quantity="other">Reconnecting in %d seconds.</item>
+    </plurals> -->
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d51d98d..474cc3f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,223 +1,238 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_open">ドロワーを開く</string>
-  <string name="drawer_close">ドロワーを閉じる</string>
-  <string name="drawer_not_connected">接続されていません</string>
-  <string name="drawer_server">サーバー</string>
-  <string name="drawer_tokens">アクセストークン</string>
-  <string name="drawer_pinned">ピンドチャンネル</string>
-  <string name="drawer_header_servers">サーバー</string>
-  <string name="drawer_favorites">お気に入り</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">公開サーバー</string>
-  <!--Chat formatting-->
-  <string name="chat_message_tree">(ツリー)</string>
-  <string name="chat_message_channel">(チャンネル)</string>
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">管理</string>
-  <string name="user_menu_kick">キック</string>
-  <string name="user_menu_ban">禁止</string>
-  <string name="user_menu_mute">ミュート</string>
-  <string name="user_menu_deafen">防音</string>
-  <string name="user_menu_move">移動</string>
-  <string name="user_menu_priority_speaker">優先話者</string>
-  <string name="user_menu_local_mute">ローカルミュート</string>
-  <string name="user_menu_ignore_messages">メッセージを無視</string>
-  <string name="user_menu_change_comment">コメントを変更</string>
-  <string name="user_menu_view_comment">コメントを表示</string>
-  <string name="user_menu_reset_comment">コメントをリセット</string>
-  <string name="user_menu_send_message">メッセージを送信</string>
-  <string name="user_menu_information">情報</string>
-  <string name="user_menu_register">登録</string>
-  <string name="user_menu_registered">登録済</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Pin</string>
-  <!--Comment Fragment-->
-  <string name="comment_view">表示</string>
-  <string name="comment_edit_source">ソースを編集</string>
-  <string name="comment_view_source">ソースを表示</string>
-  <!--Server Info Fragment-->
-  <string name="control_channel">制御チャンネル</string>
-  <string name="tcp_encryption_mode">256 ビット AES256-SHA で暗号化</string>
-  <string name="voice_channel">音声チャンネル</string>
-  <string name="udp_encryption_mode">128 ビット OCB-AES128 で暗号化</string>
-  <string name="audio_bandwidth">音声バンド幅</string>
-  <string name="server_info_protocol">プロトコル %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_latency">%.2f ms 遅延時間</string>
-  <string name="server_info_host">リモートホスト %1$s (ポート %2$d)</string>
-  <string name="server_info_codec">コーデック: %s</string>
-  <string name="server_info_max_bandwidth">最高 %.1f kbit/s</string>
-  <string name="server_info_current_bandwidth">現在 %.1f kbit/s</string>
-  <!--Server matching-->
-  <string name="server_match">サーバーを検索</string>
-  <string name="server_match_progress">サーバーを検索中…</string>
-  <string name="server_match_found">サーバーが見つかりました</string>
-  <string name="server_match_not_found">サーバーが見つかりませんでした</string>
-  <string name="server_match_expand_country">あなたの国で最適なサーバーを見つけることができませんでした。ワールドワイドに検索を展開しますか?</string>
-  <string name="server_match_info">名前: %1$s\nホスト: %2$s:%3$d\nユーザー: %4$d / %5$d\nバージョン: %6$s \n国: %7$s \n遅延時間: %8$d ms</string>
-  <string name="server_match_description">Mumla は、サーバの場所、バージョン、および遅延時間に基づいて最適な空のサーバーを自動的に見つけることができます。</string>
-  <!--Common-->
-  <string name="channels">チャンネル</string>
-  <string name="no_servers">サーバーが追加されていません。\nアクションバーにある \'追加\' ボタンを押して開始ししてください。</string>
-  <string name="server_add">サーバーを追加</string>
-  <string name="server_password">パスワード</string>
-  <string name="server_username">ユーザー名</string>
-  <string name="server_port">ポート</string>
-  <string name="server_host">アドレス</string>
-  <string name="server_label">ラベル</string>
-  <string name="connecting">接続中</string>
-  <string name="connecting_to_server">%s に接続中</string>
-  <string name="fragment_chat">チャット</string>
-  <string name="fragment_channel">チャンネル</string>
-  <string name="menu_settings">設定</string>
-  <string name="ptt">プッシュ トゥ トーク</string>
-  <string name="mute">ミュート</string>
-  <string name="deafen">防音</string>
-  <string name="disconnect">切断</string>
-  <string name="disconnectSure">%s から切断してもよろしいですか?</string>
-  <string name="save">保存</string>
-  <string name="add">追加</string>
-  <string name="preferences">プリファレンス</string>
-  <string name="togglelocalmute">ローカルミュートを切り替え</string>
-  <string name="chat">チャット</string>
-  <string name="perm_denied">権限が拒否されました!</string>
-  <string name="connectionRefused">接続が拒否されました</string>
-  <string name="confirm_delete_server">このサーバーを削除してもよろしいですか?</string>
-  <string name="confirm_delete_channel">このチャンネルを削除してもよろしいですか?</string>
-  <string name="disconnected">切断されました</string>
-  <string name="kicked_message">サーバーからキックされました。\n理由: %s</string>
-  <string name="loading">ロード中…</string>
-  <string name="reset_key">キーをリセット</string>
-  <string name="externalStorageUnavailable">外部ストレージ利用できません。証明書をロードできません</string>
-  <string name="addFavorite">お気に入りに追加</string>
-  <string name="removeFavorite">お気に入りから削除</string>
-  <string name="viewFavorites">お気に入りを表示</string>
-  <string name="favorites">お気に入り</string>
-  <string name="favoriteRemoved">お気に入りから削除されました。</string>
-  <string name="favoriteAdded">お気に入りに追加されました。</string>
-  <string name="noFavorites">お気に入りのチャンネルがありません。</string>
-  <string name="accessTokens">アクセストークン</string>
-  <string name="accessAdd">アクセストークンを追加</string>
-  <string name="pushToTalkHint">(チェックすると切り替えを有効にします)</string>
-  <string name="messageReceived">新しいメッセージ</string>
-  <string name="generateCert">証明書を生成</string>
-  <string name="generateCertSuccess">証明書が設定され、%s として保存されました!</string>
-  <string name="generateCertFailure">証明書の生成に失敗しました。</string>
-  <string name="generateCertProgress">証明書の生成中…</string>
-  <string name="search">検索</string>
-  <string name="searchHint">チャンネルとユーザーを検索</string>
-  <string name="undocumentedWakeLock">残念ながら、あなたのデバイスで近接センサー ウェイク ロック サポートを提供することができないようです。通話モードをスピーカーフォンに変更してください。</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="recordingVolume">録音ボリュームブースト</string>
-  <string name="quickConnect">クイック接続</string>
-  <string name="connect">接続</string>
-  <string name="connectToServer">サーバーに接続</string>
-  <string name="edit">編集</string>
-  <string name="remove">削除</string>
-  <string name="delete">削除</string>
-  <string name="retry">再実行</string>
-  <string name="messageToUser">ユーザー \'%s\' にメッセージを入力</string>
-  <string name="messageToChannel">ここにチャンネル \'%s\' へのメッセージを入力</string>
-  <string name="online">オンライン</string>
-  <string name="offline">オフライン</string>
-  <string name="clearChat">チャットをクリア</string>
-  <string name="connected">接続されました</string>
-  <string name="mumlaConnected">Mumla に接続されました</string>
-  <string name="mumlaConnecting">Mumla 接続中</string>
-  <string name="mumlaDisconnected">Mumla から切断されました</string>
-  <string name="lostConnection">サーバーへの接続が失われました。</string>
-  <string name="resume">再開</string>
-  <string name="channel">チャンネル</string>
-  <string name="user">ユーザー</string>
-  <string name="server">サーバー</string>
-  <string name="chat_notify_moved">%1$s は %2$s から %3$s で移動しました。</string>
-  <string name="chat_notify_muted_deafened">ミュートおよび防音</string>
-  <string name="chat_notify_muted">ミュートしました。</string>
-  <string name="chat_notify_unmuted">ミュートを解除しました。</string>
-  <string name="chat_notify_unmuted_undeafened">ミュート解除および防音解除しました。</string>
-  <string name="chat_notify_now_muted_deafened">%s がミュートおよび防音されました。</string>
-  <string name="chat_notify_now_muted">%s がミュートされました。</string>
-  <string name="chat_notify_now_unmuted">%s がミュート解除されました。</string>
-  <string name="chat_notify_now_unmuted_undeafened">%s がミュート解除および防音解除されました。</string>
-  <string name="chat_notify_connected">%s が接続しました。</string>
-  <string name="chat_notify_disconnected">%s が切断しました。</string>
-  <string name="unknown">不明</string>
-  <string name="server_list_title_favorite">お気に入り</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="server_list_title_public_internet">公開インターネット</string>
-  <string name="ping">Ping</string>
-  <string name="sort">ソート</string>
-  <string name="sortBy">ソート順…</string>
-  <string name="name">名前</string>
-  <string name="country">国</string>
-  <string name="share">共有</string>
-  <string name="description">説明</string>
-  <string name="shareMessage">Mumla で、この Mumble サーバーに参加してください! %s</string>
-  <string name="noServerInfo">Ping して、情報を取得</string>
-  <string name="status_notify_muted_and_deafened">ミュートおよび防音しました。</string>
-  <string name="status_notify_muted">ミュートしました。</string>
-  <string name="comment">コメント</string>
-  <string name="close">閉じる</string>
-  <string name="retrieving">取得中…</string>
-  <string name="search_name">名前</string>
-  <string name="search_country">国</string>
-  <string name="preferences_immutable">サーバーに接続している間、この設定は変更することができません。</string>
-  <string name="fullscreen">全画面</string>
-  <string name="fullscreen_chat">チャット</string>
-  <string name="fullscreen_channel">チャンネル</string>
-  <string name="fetchingServers">公開サーバーのリストを取得する間、しばらくお待ちください。</string>
-  <string name="information">情報</string>
-  <string name="register">自分で登録</string>
-  <string name="userControl">ユーザー制御</string>
-  <string name="registerSelfSuccess">登録リクエストを送信しました</string>
-  <string name="error_fetching_servers">サーバーの取得中にエラー!\nインターネット接続を確認してください。</string>
-  <string name="coming_soon">この機能は近日導入予定です。</string>
-  <string name="search_channel_users">%d ユーザー</string>
-  <string name="reconnecting">%d 秒で、再接続中。</string>
-  <string name="tapToReconnect">タップして接続</string>
-  <string name="overlay">オーバーレイ</string>
-  <string name="hint_reason">理由</string>
-  <string name="hint_ptt">プッシュ トゥ トーク</string>
-  <string name="hint_ptt_summary">話をするには、単にこのボタンを押してください。ダブルタップで切り替えます。</string>
-  <string name="hint_server_add">Mumla にようこそ</string>
-  <string name="hint_server_add_summary">始めるには、アクションバーの \'追加\' ボタンを押して、お好みのサーバーを追加してください。</string>
-  <string name="hint_switching">ビュー間の切り替え</string>
-  <string name="hint_switching_summary">左上のボタンを使用するか、スワイプしてチャットとチャンネルのビューを切り替えます。</string>
-  <string name="action_settings">設定</string>
-  <string name="reconnect">再接続</string>
-  <string name="reconnect_dialog_message">既にサーバーに接続されています。このサーバに接続し直しますか?</string>
-  <string name="confirm_reset_comment">ユーザー %s のコメントをリセットしてもよろしいですか?</string>
-  <string name="confirm">確認</string>
-  <string name="expand">展開</string>
-  <string name="temporary">一時</string>
-  <string name="position">場所</string>
-  <string name="channel_edit">チャンネルを編集</string>
-  <string name="channel_add">チャンネルを追加</string>
-  <string name="tts_failed">TTS が初期化に失敗しました</string>
-  <string name="mumble_url_parse_failed">Mumble URL の解析に失敗しました!</string>
-  <string name="first_run_generate_certificate_title">Mumla にようこそ!</string>
-  <string name="first_run_generate_certificate">証明書を生成することが非常に推奨されます。いくつかのサーバへ接続するために必要です。</string>
-  <string name="generate">生成</string>
-  <string name="certificate_not_valid">証明書 \'%s\' がロードできません!</string>
-  <string name="invalid_password">パスワードが正しくありません。</string>
-  <string name="send_message">メッセージを送信</string>
-  <string name="channel_menu_view_description">説明を表示</string>
-  <string name="untrusted_certificate">信頼できない証明書</string>
-  <string name="allow">許可</string>
-  <string name="trust_added">トラストストアに証明書を追加しました</string>
-  <string name="trust_add_failed">トラストストアへの証明書の追加に失敗しました!</string>
-  <string name="trust_cleared">トラストデータベースがクリアされました</string>
-  <string name="cancelled">キャンセルされました</string>
-  <string name="transmit_mode">送信モード</string>
-  <string name="current_chat_target">現在のチャット対象</string>
-  <string name="channel_join">参加</string>
-  <string name="certificate_info">サブジェクト:\n%1$s\n\n有効期限開始:\n%2$s\n\n有効期限終了:\n%3$s\n\nダイジェスト (SHA-1):\n%4$sダイジェスト (SHA-256):\n%5$s</string>
-  <string name="invalid_host">ホストが正しくありません</string>
-  <string name="invalid_port_range">ポートが正しくありません (1-65535)</string>
-  <string name="invalid_username">ユーザー名が</string>
-  <string name="cancel_reconnect">再接続をキャンセル</string>
-  <string name="attempting_reconnect">エラー: %s.\n\n再接続の試行中.</string>
+    <!--Drawer pane-->
+    <string name="drawer_open">ドロワーを開く</string>
+    <string name="drawer_close">ドロワーを閉じる</string>
+    <string name="drawer_not_connected">接続されていません</string>
+    <string name="drawer_server">サーバー</string>
+    <string name="drawer_tokens">アクセストークン</string>
+    <string name="drawer_pinned">ピンドチャンネル</string>
+    <string name="drawer_header_servers">サーバー</string>
+    <string name="drawer_favorites">お気に入り</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">公開サーバー</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_tree">(ツリー)</string>
+    <string name="chat_message_channel">(チャンネル)</string>
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">管理</string>
+    <string name="user_menu_kick">キック</string>
+    <string name="user_menu_ban">禁止</string>
+    <string name="user_menu_mute">ミュート</string>
+    <string name="user_menu_deafen">防音</string>
+    <string name="user_menu_move">移動</string>
+    <string name="user_menu_priority_speaker">優先話者</string>
+    <string name="user_menu_local_mute">ローカルミュート</string>
+    <string name="user_menu_ignore_messages">メッセージを無視</string>
+    <string name="user_menu_change_comment">コメントを変更</string>
+    <string name="user_menu_view_comment">コメントを表示</string>
+    <string name="user_menu_reset_comment">コメントをリセット</string>
+    <string name="user_menu_send_message">メッセージを送信</string>
+    <string name="user_menu_information">情報</string>
+    <string name="user_menu_register">登録</string>
+    <string name="user_menu_registered">登録済</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Pin</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_view">表示</string>
+    <string name="comment_edit_source">ソースを編集</string>
+    <string name="comment_view_source">ソースを表示</string>
+
+    <!--Server Info Fragment-->
+    <string name="control_channel">制御チャンネル</string>
+    <string name="tcp_encryption_mode">256 ビット AES256-SHA で暗号化</string>
+    <string name="voice_channel">音声チャンネル</string>
+    <string name="udp_encryption_mode">128 ビット OCB-AES128 で暗号化</string>
+    <string name="audio_bandwidth">音声バンド幅</string>
+    <string name="server_info_protocol">プロトコル %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_latency">%.2f ms 遅延時間</string>
+    <string name="server_info_host">リモートホスト %1$s (ポート %2$d)</string>
+    <string name="server_info_codec">コーデック: %s</string>
+    <string name="server_info_max_bandwidth">最高 %.1f kbit/s</string>
+    <string name="server_info_current_bandwidth">現在 %.1f kbit/s</string>
+
+    <!--Server matching-->
+    <string name="server_match">サーバーを検索</string>
+    <string name="server_match_progress">サーバーを検索中…</string>
+    <string name="server_match_found">サーバーが見つかりました</string>
+    <string name="server_match_not_found">サーバーが見つかりませんでした</string>
+    <string name="server_match_expand_country">あなたの国で最適なサーバーを見つけることができませんでした。ワールドワイドに検索を展開しますか?</string>
+    <string name="server_match_info">名前: %1$s\nホスト: %2$s:%3$d\nユーザー: %4$d / %5$d\nバージョン: %6$s \n国: %7$s \n遅延時間: %8$d ms</string>
+    <string name="server_match_description">Mumla は、サーバの場所、バージョン、および遅延時間に基づいて最適な空のサーバーを自動的に見つけることができます。</string>
+
+    <!--Common-->
+    <string name="channels">チャンネル</string>
+    <string name="no_servers">サーバーが追加されていません。\nアクションバーにある \'追加\' ボタンを押して開始ししてください。</string>
+    <string name="server_add">サーバーを追加</string>
+    <string name="server_password">パスワード</string>
+    <string name="server_username">ユーザー名</string>
+    <string name="server_port">ポート</string>
+    <string name="server_host">アドレス</string>
+    <string name="server_label">ラベル</string>
+    <string name="connecting">接続中</string>
+    <string name="connecting_to_server">%s に接続中</string>
+    <string name="fragment_chat">チャット</string>
+    <string name="fragment_channel">チャンネル</string>
+    <string name="menu_settings">設定</string>
+    <string name="ptt">プッシュ トゥ トーク</string>
+    <string name="mute">ミュート</string>
+    <string name="deafen">防音</string>
+    <string name="disconnect">切断</string>
+    <string name="disconnectSure">%s から切断してもよろしいですか?</string>
+    <string name="save">保存</string>
+    <string name="add">追加</string>
+    <string name="preferences">プリファレンス</string>
+    <string name="togglelocalmute">ローカルミュートを切り替え</string>
+    <string name="chat">チャット</string>
+    <string name="perm_denied">権限が拒否されました!</string>
+    <string name="connectionRefused">接続が拒否されました</string>
+    <string name="confirm_delete_server">このサーバーを削除してもよろしいですか?</string>
+    <string name="confirm_delete_channel">このチャンネルを削除してもよろしいですか?</string>
+    <string name="disconnected">切断されました</string>
+    <string name="kicked_message">サーバーからキックされました。\n理由: %s</string>
+    <string name="loading">ロード中…</string>
+    <string name="reset_key">キーをリセット</string>
+    <string name="externalStorageUnavailable">外部ストレージ利用できません。証明書をロードできません</string>
+    <string name="addFavorite">お気に入りに追加</string>
+    <string name="removeFavorite">お気に入りから削除</string>
+    <string name="viewFavorites">お気に入りを表示</string>
+    <string name="favorites">お気に入り</string>
+    <string name="favoriteRemoved">お気に入りから削除されました。</string>
+    <string name="favoriteAdded">お気に入りに追加されました。</string>
+    <string name="noFavorites">お気に入りのチャンネルがありません。</string>
+    <string name="accessTokens">アクセストークン</string>
+    <string name="accessAdd">アクセストークンを追加</string>
+    <string name="pushToTalkHint">(チェックすると切り替えを有効にします)</string>
+    <string name="messageReceived">新しいメッセージ</string>
+    <string name="generateCert">証明書を生成</string>
+    <string name="generateCertSuccess">証明書が設定され、%s として保存されました!</string>
+    <string name="generateCertFailure">証明書の生成に失敗しました。</string>
+    <string name="generateCertProgress">証明書の生成中…</string>
+    <string name="search">検索</string>
+    <string name="searchHint">チャンネルとユーザーを検索</string>
+    <string name="undocumentedWakeLock">残念ながら、あなたのデバイスで近接センサー ウェイク ロック サポートを提供することができないようです。通話モードをスピーカーフォンに変更してください。</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="recordingVolume">録音ボリュームブースト</string>
+    <string name="quickConnect">クイック接続</string>
+    <string name="connect">接続</string>
+    <string name="connectToServer">サーバーに接続</string>
+    <string name="edit">編集</string>
+    <string name="remove">削除</string>
+    <string name="delete">削除</string>
+    <string name="retry">再実行</string>
+    <string name="messageToUser">ユーザー \'%s\' にメッセージを入力</string>
+    <string name="messageToChannel">ここにチャンネル \'%s\' へのメッセージを入力</string>
+    <string name="online">オンライン</string>
+    <string name="offline">オフライン</string>
+    <string name="clearChat">チャットをクリア</string>
+    <string name="connected">接続されました</string>
+    <string name="mumlaConnected">Mumla に接続されました</string>
+    <string name="mumlaConnecting">Mumla 接続中</string>
+    <string name="mumlaDisconnected">Mumla から切断されました</string>
+    <string name="lostConnection">サーバーへの接続が失われました。</string>
+    <string name="resume">再開</string>
+    <string name="channel">チャンネル</string>
+    <string name="user">ユーザー</string>
+    <string name="server">サーバー</string>
+    <string name="chat_notify_moved">%1$s は %2$s から %3$s で移動しました。</string>
+    <string name="chat_notify_muted_deafened">ミュートおよび防音</string>
+    <string name="chat_notify_muted">ミュートしました。</string>
+    <string name="chat_notify_unmuted">ミュートを解除しました。</string>
+    <string name="chat_notify_unmuted_undeafened">ミュート解除および防音解除しました。</string>
+    <string name="chat_notify_now_muted_deafened">%s がミュートおよび防音されました。</string>
+    <string name="chat_notify_now_muted">%s がミュートされました。</string>
+    <string name="chat_notify_now_unmuted">%s がミュート解除されました。</string>
+    <string name="chat_notify_now_unmuted_undeafened">%s がミュート解除および防音解除されました。</string>
+    <string name="chat_notify_connected">%s が接続しました。</string>
+    <string name="chat_notify_disconnected">%s が切断しました。</string>
+    <string name="unknown">不明</string>
+    <string name="server_list_title_favorite">お気に入り</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="server_list_title_public_internet">公開インターネット</string>
+    <string name="ping">Ping</string>
+    <string name="sort">ソート</string>
+    <string name="sortBy">ソート順…</string>
+    <string name="name">名前</string>
+    <string name="country">国</string>
+    <string name="share">共有</string>
+    <string name="description">説明</string>
+    <string name="shareMessage">Mumla で、この Mumble サーバーに参加してください! %s</string>
+    <string name="noServerInfo">Ping して、情報を取得</string>
+    <string name="status_notify_muted_and_deafened">ミュートおよび防音しました。</string>
+    <string name="status_notify_muted">ミュートしました。</string>
+    <string name="comment">コメント</string>
+    <string name="close">閉じる</string>
+    <string name="retrieving">取得中…</string>
+    <string name="search_name">名前</string>
+    <string name="search_country">国</string>
+    <string name="preferences_immutable">サーバーに接続している間、この設定は変更することができません。</string>
+    <string name="fullscreen">全画面</string>
+    <string name="fullscreen_chat">チャット</string>
+    <string name="fullscreen_channel">チャンネル</string>
+    <string name="fetchingServers">公開サーバーのリストを取得する間、しばらくお待ちください。</string>
+    <string name="information">情報</string>
+    <string name="register">自分で登録</string>
+    <string name="userControl">ユーザー制御</string>
+    <string name="registerSelfSuccess">登録リクエストを送信しました</string>
+    <string name="error_fetching_servers">サーバーの取得中にエラー!\nインターネット接続を確認してください。</string>
+    <string name="coming_soon">この機能は近日導入予定です。</string>
+    <string name="tapToReconnect">タップして接続</string>
+    <string name="overlay">オーバーレイ</string>
+    <string name="hint_reason">理由</string>
+    <string name="hint_ptt">プッシュ トゥ トーク</string>
+    <string name="hint_ptt_summary">話をするには、単にこのボタンを押してください。ダブルタップで切り替えます。</string>
+    <string name="hint_server_add">Mumla にようこそ</string>
+    <string name="hint_server_add_summary">始めるには、アクションバーの \'追加\' ボタンを押して、お好みのサーバーを追加してください。</string>
+    <string name="hint_switching">ビュー間の切り替え</string>
+    <string name="hint_switching_summary">左上のボタンを使用するか、スワイプしてチャットとチャンネルのビューを切り替えます。</string>
+    <string name="action_settings">設定</string>
+    <string name="reconnect">再接続</string>
+    <string name="reconnect_dialog_message">既にサーバーに接続されています。このサーバに接続し直しますか?</string>
+    <string name="confirm_reset_comment">ユーザー %s のコメントをリセットしてもよろしいですか?</string>
+    <string name="confirm">確認</string>
+    <string name="expand">展開</string>
+    <string name="temporary">一時</string>
+    <string name="position">場所</string>
+    <string name="channel_edit">チャンネルを編集</string>
+    <string name="channel_add">チャンネルを追加</string>
+    <string name="tts_failed">TTS が初期化に失敗しました</string>
+    <string name="mumble_url_parse_failed">Mumble URL の解析に失敗しました!</string>
+    <string name="first_run_generate_certificate_title">Mumla にようこそ!</string>
+    <string name="first_run_generate_certificate">証明書を生成することが非常に推奨されます。いくつかのサーバへ接続するために必要です。</string>
+    <string name="generate">生成</string>
+    <string name="certificate_not_valid">証明書 \'%s\' がロードできません!</string>
+    <string name="invalid_password">パスワードが正しくありません。</string>
+    <string name="send_message">メッセージを送信</string>
+    <string name="channel_menu_view_description">説明を表示</string>
+    <string name="untrusted_certificate">信頼できない証明書</string>
+    <string name="allow">許可</string>
+    <string name="trust_added">トラストストアに証明書を追加しました</string>
+    <string name="trust_add_failed">トラストストアへの証明書の追加に失敗しました!</string>
+    <string name="trust_cleared">トラストデータベースがクリアされました</string>
+    <string name="cancelled">キャンセルされました</string>
+    <string name="transmit_mode">送信モード</string>
+    <string name="current_chat_target">現在のチャット対象</string>
+    <string name="channel_join">参加</string>
+    <string name="certificate_info">サブジェクト:\n%1$s\n\n有効期限開始:\n%2$s\n\n有効期限終了:\n%3$s\n\nダイジェスト (SHA-1):\n%4$sダイジェスト (SHA-256):\n%5$s</string>
+    <string name="invalid_host">ホストが正しくありません</string>
+    <string name="invalid_port_range">ポートが正しくありません (1-65535)</string>
+    <string name="invalid_username">ユーザー名が</string>
+    <string name="cancel_reconnect">再接続をキャンセル</string>
+    <string name="attempting_reconnect">エラー: %s.\n\n再接続の試行中.</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="other">%d ユーザー</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="other">%d 秒で、再接続中。</item>
+    </plurals>
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bcc120f..cf08745 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,223 +1,241 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Drawer pane-->
-  <string name="drawer_open">Open Luik</string>
-  <string name="drawer_close">Sluit Luik</string>
-  <string name="drawer_not_connected">Niet Verbonden</string>
-  <string name="drawer_server">Server</string>
-  <string name="drawer_tokens">Access Tokens</string>
-  <string name="drawer_pinned">Opgeprikte Kanalen</string>
-  <string name="drawer_header_servers">Servers</string>
-  <string name="drawer_favorites">Favorieten</string>
-  <string name="drawer_lan">LAN</string>
-  <string name="drawer_public">Openbare Servers</string>
-  <!--Chat formatting-->
-  <string name="chat_message_tree">(Vertakt)</string>
-  <string name="chat_message_channel">(Kanaal)</string>
-  <string name="chat_message_to">%1$s → %2$s</string>
-  <!--User menu-->
-  <string name="user_menu_admin">Admin</string>
-  <string name="user_menu_kick">Kick</string>
-  <string name="user_menu_ban">Verban</string>
-  <string name="user_menu_mute">Dempen</string>
-  <string name="user_menu_deafen">Doof maken</string>
-  <string name="user_menu_move">Verplaats</string>
-  <string name="user_menu_priority_speaker">Voorkeurs Spreker</string>
-  <string name="user_menu_local_mute">Lokaal Dempen</string>
-  <string name="user_menu_ignore_messages">Negeer Berichten</string>
-  <string name="user_menu_change_comment">Verander Commentaar</string>
-  <string name="user_menu_view_comment">Bekijk Commentaar</string>
-  <string name="user_menu_reset_comment">Reset Commentaar</string>
-  <string name="user_menu_send_message">Verstuur Bericht</string>
-  <string name="user_menu_information">Informatie</string>
-  <string name="user_menu_register">Registreer</string>
-  <string name="user_menu_registered">Geregistreerd</string>
-  <!--Channel menu-->
-  <string name="channel_menu_pin">Prik op</string>
-  <!--Comment Fragment-->
-  <string name="comment_view">Weergeven</string>
-  <string name="comment_edit_source">Bewerk bron</string>
-  <string name="comment_view_source">Bekijk bron</string>
-  <!--Server Info Fragment-->
-  <string name="control_channel">Controle Kanaal</string>
-  <string name="tcp_encryption_mode">Versleuteld met 256 bit AES256-SHA</string>
-  <string name="voice_channel">Stem Kanaal</string>
-  <string name="udp_encryption_mode">Versleuteld met 128 bit OCB-AES128</string>
-  <string name="audio_bandwidth">Audio bandbreedte</string>
-  <string name="server_info_protocol">Protocol %s.</string>
-  <string name="server_info_version">%1$s (%2$s)</string>
-  <string name="server_info_latency">%.2f ms latency</string>
-  <string name="server_info_host">Externe host %1$s (port %2$d)</string>
-  <string name="server_info_codec">Codec: %s</string>
-  <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
-  <string name="server_info_current_bandwidth">Huidig %.1f kbit/s</string>
-  <!--Server matching-->
-  <string name="server_match">Zoek Server</string>
-  <string name="server_match_progress">Server zoeken…</string>
-  <string name="server_match_found">Server gevonden</string>
-  <string name="server_match_not_found">Server niet gevonden</string>
-  <string name="server_match_expand_country">Kon geen optimale servers in uw land vinden. Zoekopdracht wereldwijd uitbreiden?</string>
-  <string name="server_match_info">Naam: %1$s\nHost: %2$s:%3$d\nGebruikers: %4$d / %5$d\nVersie: %6$s \nLand: %7$s \nLatency: %8$d ms</string>
-  <string name="server_match_description">Mumla kan automatisch een lege server zoeken, geoptimaliseerd aan de hand van locatie, versie en latency.</string>
-  <!--Common-->
-  <string name="channels">Kanalen</string>
-  <string name="no_servers">Geen servers toegevoegd.\nDruk op \'toevoegen\' in the taakbalk om te beginnen.</string>
-  <string name="server_add">Server toevoegen</string>
-  <string name="server_password">Wachtwoord</string>
-  <string name="server_username">Gebruikersnaam</string>
-  <string name="server_port">Poort</string>
-  <string name="server_host">Adres</string>
-  <string name="server_label">Label</string>
-  <string name="connecting">Verbinden</string>
-  <string name="connecting_to_server">Verbinden met %s</string>
-  <string name="fragment_chat">Chat</string>
-  <string name="fragment_channel">Kanaal</string>
-  <string name="menu_settings">Instellingen</string>
-  <string name="ptt">Push-to-talk</string>
-  <string name="mute">Dempen</string>
-  <string name="deafen">Doof maken</string>
-  <string name="disconnect">Verbinding verbreken</string>
-  <string name="disconnectSure">Bent u zeker dat u de verbinding met %s wilt verbreken?</string>
-  <string name="save">Opslaan</string>
-  <string name="add">Toevoegen</string>
-  <string name="preferences">Voorkeuren</string>
-  <string name="togglelocalmute">Lokaal Dempen Aan/Uit</string>
-  <string name="chat">Chat</string>
-  <string name="perm_denied">Geen toelating!</string>
-  <string name="connectionRefused">Verbinding Geweigerd</string>
-  <string name="confirm_delete_server">Bent u zeker dat u deze server wilt verwijderen?</string>
-  <string name="confirm_delete_channel">Bent u zeker dat u dit kanaal wilt verwijderen?</string>
-  <string name="disconnected">Verbinding verbroken</string>
-  <string name="kicked_message">Gekicked van server.\nReden: %s</string>
-  <string name="loading">Laden…</string>
-  <string name="reset_key">Reset Knop</string>
-  <string name="externalStorageUnavailable">Externe opslag niet bereikbaar, kan certificaat niet laden</string>
-  <string name="addFavorite">Favoriet Toevoegen</string>
-  <string name="removeFavorite">Favoriet Verwijderen</string>
-  <string name="viewFavorites">Favorieten Bekijken</string>
-  <string name="favorites">Favorieten</string>
-  <string name="favoriteRemoved">Favoriet verwijderd.</string>
-  <string name="favoriteAdded">Favoriet toegevoegd.</string>
-  <string name="noFavorites">Geen favoriete kanalen.</string>
-  <string name="accessTokens">Access Tokens</string>
-  <string name="accessAdd">Access Token Toevoegen</string>
-  <string name="pushToTalkHint">(vink aan om aan/uit functie te gebruiken)</string>
-  <string name="messageReceived">Nieuw bericht</string>
-  <string name="generateCert">Certificaat Genereren</string>
-  <string name="generateCertSuccess">Uw certificaat is ingesteld en opgeslagen als %s!</string>
-  <string name="generateCertFailure">Certificaat genereren mislukt.</string>
-  <string name="generateCertProgress">Certificaat genereren…</string>
-  <string name="search">Zoeken</string>
-  <string name="searchHint">Zoeken in kanalen en gebruikers</string>
-  <string name="undocumentedWakeLock">Het lijkt er helaas op dat uw toestel geen nabijheidssensor heeft of scherm dimmen niet ondersteunt. Gelieve over te schakelen naar luidspreker.</string>
-  <string name="bluetooth">Bluetooth</string>
-  <string name="recordingVolume">Opname Volume Versterken</string>
-  <string name="quickConnect">Snel Verbinden</string>
-  <string name="connect">Verbinden</string>
-  <string name="connectToServer">Verbinden met Server</string>
-  <string name="edit">Bewerk</string>
-  <string name="remove">Verwijder</string>
-  <string name="delete">Delete</string>
-  <string name="retry">Herproberen</string>
-  <string name="messageToUser">Typ bericht naar gebruiker \'%s\'</string>
-  <string name="messageToChannel">Typ bericht naar kanaal \'%s\' hier</string>
-  <string name="online">Online</string>
-  <string name="offline">Offline</string>
-  <string name="clearChat">Chat Legen</string>
-  <string name="connected">Verbonden</string>
-  <string name="mumlaConnected">Mumla Verbonden</string>
-  <string name="mumlaConnecting">Mumla Verbindt</string>
-  <string name="mumlaDisconnected">Mumla Verbinding Verbroken</string>
-  <string name="lostConnection">Verbinding met de server verloren.</string>
-  <string name="resume">Hervatten</string>
-  <string name="channel">Kanaal</string>
-  <string name="user">Gebruiker</string>
-  <string name="server">Server</string>
-  <string name="chat_notify_moved">%1$s verplaatst van %2$s door %3$s.</string>
-  <string name="chat_notify_muted_deafened">Gedempt en doof gemaakt.</string>
-  <string name="chat_notify_muted">Gedempt.</string>
-  <string name="chat_notify_unmuted">Dempen opgeheven.</string>
-  <string name="chat_notify_unmuted_undeafened">Dempen opgeheven en horend gemaakt.</string>
-  <string name="chat_notify_now_muted_deafened">%s is nu gedempt en doof gemaakt.</string>
-  <string name="chat_notify_now_muted">%s is nu gedempt.</string>
-  <string name="chat_notify_now_unmuted">%s is niet meer gedempt.</string>
-  <string name="chat_notify_now_unmuted_undeafened">%s is niet meer gedempt of doof.</string>
-  <string name="chat_notify_connected">%s verbonden.</string>
-  <string name="chat_notify_disconnected">%s verbinding verbroken.</string>
-  <string name="unknown">Ongekend</string>
-  <string name="server_list_title_favorite">Favorieten</string>
-  <string name="server_list_title_lan">LAN</string>
-  <string name="server_list_title_public_internet">Openbaar Internet</string>
-  <string name="ping">Ping</string>
-  <string name="sort">Sorteren</string>
-  <string name="sortBy">Sorteren op…</string>
-  <string name="name">Naam</string>
-  <string name="country">Land</string>
-  <string name="share">Delen</string>
-  <string name="description">Beschrijving</string>
-  <string name="shareMessage">Verbind met deze Mumble server met Mumla! %s</string>
-  <string name="noServerInfo">Ping naar info</string>
-  <string name="status_notify_muted_and_deafened">Gedempt en doof gemaakt.</string>
-  <string name="status_notify_muted">Gedempt.</string>
-  <string name="comment">Commentaar</string>
-  <string name="close">Sluit</string>
-  <string name="retrieving">Ophalen…</string>
-  <string name="search_name">Naam</string>
-  <string name="search_country">Land</string>
-  <string name="preferences_immutable">Deze instelling kan niet worden aangepast wanneer verbonden met een server.</string>
-  <string name="fullscreen">Volledig scherm</string>
-  <string name="fullscreen_chat">Chat</string>
-  <string name="fullscreen_channel">Kanaal</string>
-  <string name="fetchingServers">Een ogenblik, lijst met openbare servers ophalen.</string>
-  <string name="information">Informatie</string>
-  <string name="register">Registreer Jezelf</string>
-  <string name="userControl">Gebruiker Beheer</string>
-  <string name="registerSelfSuccess">Registratie verzoek verzonden</string>
-  <string name="error_fetching_servers">Error servers ophalen!\nControleer internet verbinding.</string>
-  <string name="coming_soon">Deze functie is binnenkort beschhikbaar.</string>
-  <string name="search_channel_users">%d gebruikers</string>
-  <string name="reconnecting">Herverbinden over %d seconden.</string>
-  <string name="tapToReconnect">Tik om te herverbinden</string>
-  <string name="overlay">Overlay</string>
-  <string name="hint_reason">Reden</string>
-  <string name="hint_ptt">Push to Talk</string>
-  <string name="hint_ptt_summary">Houd deze knop ingedrukt om te spreken. Dubbel-tik om aan/uit te schakelen.</string>
-  <string name="hint_server_add">Welkom bij Mumla</string>
-  <string name="hint_server_add_summary">Om te beginnen, voeg een favoriete server toe door op de toevoegen knop te drukken in de taakbalk.</string>
-  <string name="hint_switching">Wisselen Van Weergave</string>
-  <string name="hint_switching_summary">Wissel tussen de chat en kanaal weergave met de knoppen links boven, of door te vegen.</string>
-  <string name="action_settings">Instellingen</string>
-  <string name="reconnect">Herverbinden</string>
-  <string name="reconnect_dialog_message">U bent al verbonden met een andere server. Wisselen naar deze server?</string>
-  <string name="confirm_reset_comment">Bent u zeker dat u de commentaar van gebruiker %s wilt wissen?</string>
-  <string name="confirm">Bevestig</string>
-  <string name="expand">Vergroot</string>
-  <string name="temporary">Tijdelijk</string>
-  <string name="position">Positie</string>
-  <string name="channel_edit">Bewerk Kanaal</string>
-  <string name="channel_add">Kanaal Toevoegen</string>
-  <string name="tts_failed">TTS initialiseren mislukt</string>
-  <string name="mumble_url_parse_failed">Mumble URL kon niet worden ontleed!</string>
-  <string name="first_run_generate_certificate_title">Welkom bij Mumla!</string>
-  <string name="first_run_generate_certificate">Certificaat generen is ten zeerste aangeraden en nodig voor verbinden met bepaalde servers.</string>
-  <string name="generate">Genereer</string>
-  <string name="certificate_not_valid">Kon certificaat \'%s\' niet laden!</string>
-  <string name="invalid_password">Ongeldig wachtwoord.</string>
-  <string name="send_message">Verstuur bericht</string>
-  <string name="channel_menu_view_description">Bekijk Beschrijving</string>
-  <string name="untrusted_certificate">Onvertrouwd Certificaat</string>
-  <string name="allow">Toestaan</string>
-  <string name="trust_added">Certificaat toegevoegd aan vertrouwde opslag</string>
-  <string name="trust_add_failed">Certificaat kon niet toegevoegd worden aan vertrouwde opslag!</string>
-  <string name="trust_cleared">Vertrouwde opslag database geleegd</string>
-  <string name="cancelled">Geannuleerd</string>
-  <string name="transmit_mode">Doorstuur Modus</string>
-  <string name="current_chat_target">Huidig chat doelwit</string>
-  <string name="channel_join">Aansluiten</string>
-  <string name="certificate_info">Onderwerp:\n%1$s\n\nGeldig van:\n%2$s\n\nGeldig tot:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
-  <string name="invalid_host">Ongeldige host</string>
-  <string name="invalid_port_range">Ongeldige poort (1-65535)</string>
-  <string name="invalid_username">Ongeldige Gebruikersnaam</string>
-  <string name="cancel_reconnect">Herverbinden annuleren </string>
-  <string name="default_">Standaard</string>
+    <!--Drawer pane-->
+    <string name="drawer_open">Open Luik</string>
+    <string name="drawer_close">Sluit Luik</string>
+    <string name="drawer_not_connected">Niet Verbonden</string>
+    <string name="drawer_server">Server</string>
+    <string name="drawer_tokens">Access Tokens</string>
+    <string name="drawer_pinned">Opgeprikte Kanalen</string>
+    <string name="drawer_header_servers">Servers</string>
+    <string name="drawer_favorites">Favorieten</string>
+    <string name="drawer_lan">LAN</string>
+    <string name="drawer_public">Openbare Servers</string>
+
+    <!--Chat formatting-->
+    <string name="chat_message_tree">(Vertakt)</string>
+    <string name="chat_message_channel">(Kanaal)</string>
+    <string name="chat_message_to">%1$s → %2$s</string>
+
+    <!--User menu-->
+    <string name="user_menu_admin">Admin</string>
+    <string name="user_menu_kick">Kick</string>
+    <string name="user_menu_ban">Verban</string>
+    <string name="user_menu_mute">Dempen</string>
+    <string name="user_menu_deafen">Doof maken</string>
+    <string name="user_menu_move">Verplaats</string>
+    <string name="user_menu_priority_speaker">Voorkeurs Spreker</string>
+    <string name="user_menu_local_mute">Lokaal Dempen</string>
+    <string name="user_menu_ignore_messages">Negeer Berichten</string>
+    <string name="user_menu_change_comment">Verander Commentaar</string>
+    <string name="user_menu_view_comment">Bekijk Commentaar</string>
+    <string name="user_menu_reset_comment">Reset Commentaar</string>
+    <string name="user_menu_send_message">Verstuur Bericht</string>
+    <string name="user_menu_information">Informatie</string>
+    <string name="user_menu_register">Registreer</string>
+    <string name="user_menu_registered">Geregistreerd</string>
+
+    <!--Channel menu-->
+    <string name="channel_menu_pin">Prik op</string>
+
+    <!--Comment Fragment-->
+    <string name="comment_view">Weergeven</string>
+    <string name="comment_edit_source">Bewerk bron</string>
+    <string name="comment_view_source">Bekijk bron</string>
+
+    <!--Server Info Fragment-->
+    <string name="control_channel">Controle Kanaal</string>
+    <string name="tcp_encryption_mode">Versleuteld met 256 bit AES256-SHA</string>
+    <string name="voice_channel">Stem Kanaal</string>
+    <string name="udp_encryption_mode">Versleuteld met 128 bit OCB-AES128</string>
+    <string name="audio_bandwidth">Audio bandbreedte</string>
+    <string name="server_info_protocol">Protocol %s.</string>
+    <string name="server_info_version">%1$s (%2$s)</string>
+    <string name="server_info_latency">%.2f ms latency</string>
+    <string name="server_info_host">Externe host %1$s (port %2$d)</string>
+    <string name="server_info_codec">Codec: %s</string>
+    <string name="server_info_max_bandwidth">Maximum %.1f kbit/s</string>
+    <string name="server_info_current_bandwidth">Huidig %.1f kbit/s</string>
+
+    <!--Server matching-->
+    <string name="server_match">Zoek Server</string>
+    <string name="server_match_progress">Server zoeken…</string>
+    <string name="server_match_found">Server gevonden</string>
+    <string name="server_match_not_found">Server niet gevonden</string>
+    <string name="server_match_expand_country">Kon geen optimale servers in uw land vinden. Zoekopdracht wereldwijd uitbreiden?</string>
+    <string name="server_match_info">Naam: %1$s\nHost: %2$s:%3$d\nGebruikers: %4$d / %5$d\nVersie: %6$s \nLand: %7$s \nLatency: %8$d ms</string>
+    <string name="server_match_description">Mumla kan automatisch een lege server zoeken, geoptimaliseerd aan de hand van locatie, versie en latency.</string>
+
+    <!--Common-->
+    <string name="channels">Kanalen</string>
+    <string name="no_servers">Geen servers toegevoegd.\nDruk op \'toevoegen\' in the taakbalk om te beginnen.</string>
+    <string name="server_add">Server toevoegen</string>
+    <string name="server_password">Wachtwoord</string>
+    <string name="server_username">Gebruikersnaam</string>
+    <string name="server_port">Poort</string>
+    <string name="server_host">Adres</string>
+    <string name="server_label">Label</string>
+    <string name="connecting">Verbinden</string>
+    <string name="connecting_to_server">Verbinden met %s</string>
+    <string name="fragment_chat">Chat</string>
+    <string name="fragment_channel">Kanaal</string>
+    <string name="menu_settings">Instellingen</string>
+    <string name="ptt">Push-to-talk</string>
+    <string name="mute">Dempen</string>
+    <string name="deafen">Doof maken</string>
+    <string name="disconnect">Verbinding verbreken</string>
+    <string name="disconnectSure">Bent u zeker dat u de verbinding met %s wilt verbreken?</string>
+    <string name="save">Opslaan</string>
+    <string name="add">Toevoegen</string>
+    <string name="preferences">Voorkeuren</string>
+    <string name="togglelocalmute">Lokaal Dempen Aan/Uit</string>
+    <string name="chat">Chat</string>
+    <string name="perm_denied">Geen toelating!</string>
+    <string name="connectionRefused">Verbinding Geweigerd</string>
+    <string name="confirm_delete_server">Bent u zeker dat u deze server wilt verwijderen?</string>
+    <string name="confirm_delete_channel">Bent u zeker dat u dit kanaal wilt verwijderen?</string>
+    <string name="disconnected">Verbinding verbroken</string>
+    <string name="kicked_message">Gekicked van server.\nReden: %s</string>
+    <string name="loading">Laden…</string>
+    <string name="reset_key">Reset Knop</string>
+    <string name="externalStorageUnavailable">Externe opslag niet bereikbaar, kan certificaat niet laden</string>
+    <string name="addFavorite">Favoriet Toevoegen</string>
+    <string name="removeFavorite">Favoriet Verwijderen</string>
+    <string name="viewFavorites">Favorieten Bekijken</string>
+    <string name="favorites">Favorieten</string>
+    <string name="favoriteRemoved">Favoriet verwijderd.</string>
+    <string name="favoriteAdded">Favoriet toegevoegd.</string>
+    <string name="noFavorites">Geen favoriete kanalen.</string>
+    <string name="accessTokens">Access Tokens</string>
+    <string name="accessAdd">Access Token Toevoegen</string>
+    <string name="pushToTalkHint">(vink aan om aan/uit functie te gebruiken)</string>
+    <string name="messageReceived">Nieuw bericht</string>
+    <string name="generateCert">Certificaat Genereren</string>
+    <string name="generateCertSuccess">Uw certificaat is ingesteld en opgeslagen als %s!</string>
+    <string name="generateCertFailure">Certificaat genereren mislukt.</string>
+    <string name="generateCertProgress">Certificaat genereren…</string>
+    <string name="search">Zoeken</string>
+    <string name="searchHint">Zoeken in kanalen en gebruikers</string>
+    <string name="undocumentedWakeLock">Het lijkt er helaas op dat uw toestel geen nabijheidssensor heeft of scherm dimmen niet ondersteunt. Gelieve over te schakelen naar luidspreker.</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="recordingVolume">Opname Volume Versterken</string>
+    <string name="quickConnect">Snel Verbinden</string>
+    <string name="connect">Verbinden</string>
+    <string name="connectToServer">Verbinden met Server</string>
+    <string name="edit">Bewerk</string>
+    <string name="remove">Verwijder</string>
+    <string name="delete">Delete</string>
+    <string name="retry">Herproberen</string>
+    <string name="messageToUser">Typ bericht naar gebruiker \'%s\'</string>
+    <string name="messageToChannel">Typ bericht naar kanaal \'%s\' hier</string>
+    <string name="online">Online</string>
+    <string name="offline">Offline</string>
+    <string name="clearChat">Chat Legen</string>
+    <string name="connected">Verbonden</string>
+    <string name="mumlaConnected">Mumla Verbonden</string>
+    <string name="mumlaConnecting">Mumla Verbindt</string>
+    <string name="mumlaDisconnected">Mumla Verbinding Verbroken</string>
+    <string name="lostConnection">Verbinding met de server verloren.</string>
+    <string name="resume">Hervatten</string>
+    <string name="channel">Kanaal</string>
+    <string name="user">Gebruiker</string>
+    <string name="server">Server</string>
+    <string name="chat_notify_moved">%1$s verplaatst van %2$s door %3$s.</string>
+    <string name="chat_notify_muted_deafened">Gedempt en doof gemaakt.</string>
+    <string name="chat_notify_muted">Gedempt.</string>
+    <string name="chat_notify_unmuted">Dempen opgeheven.</string>
+    <string name="chat_notify_unmuted_undeafened">Dempen opgeheven en horend gemaakt.</string>
+    <string name="chat_notify_now_muted_deafened">%s is nu gedempt en doof gemaakt.</string>
+    <string name="chat_notify_now_muted">%s is nu gedempt.</string>
+    <string name="chat_notify_now_unmuted">%s is niet meer gedempt.</string>
+    <string name="chat_notify_now_unmuted_undeafened">%s is niet meer gedempt of doof.</string>
+    <string name="chat_notify_connected">%s verbonden.</string>
+    <string name="chat_notify_disconnected">%s verbinding verbroken.</string>
+    <string name="unknown">Ongekend</string>
+    <string name="server_list_title_favorite">Favorieten</string>
+    <string name="server_list_title_lan">LAN</string>
+    <string name="server_list_title_public_internet">Openbaar Internet</string>
+    <string name="ping">Ping</string>
+    <string name="sort">Sorteren</string>
+    <string name="sortBy">Sorteren op…</string>
+    <string name="name">Naam</string>
+    <string name="country">Land</string>
+    <string name="share">Delen</string>
+    <string name="description">Beschrijving</string>
+    <string name="shareMessage">Verbind met deze Mumble server met Mumla! %s</string>
+    <string name="noServerInfo">Ping naar info</string>
+    <string name="status_notify_muted_and_deafened">Gedempt en doof gemaakt.</string>
+    <string name="status_notify_muted">Gedempt.</string>
+    <string name="comment">Commentaar</string>
+    <string name="close">Sluit</string>
+    <string name="retrieving">Ophalen…</string>
+    <string name="search_name">Naam</string>
+    <string name="search_country">Land</string>
+    <string name="preferences_immutable">Deze instelling kan niet worden aangepast wanneer verbonden met een server.</string>
+    <string name="fullscreen">Volledig scherm</string>
+    <string name="fullscreen_chat">Chat</string>
+    <string name="fullscreen_channel">Kanaal</string>
+    <string name="fetchingServers">Een ogenblik, lijst met openbare servers ophalen.</string>
+    <string name="information">Informatie</string>
+    <string name="register">Registreer Jezelf</string>
+    <string name="userControl">Gebruiker Beheer</string>
+    <string name="registerSelfSuccess">Registratie verzoek verzonden</string>
+    <string name="error_fetching_servers">Error servers ophalen!\nControleer internet verbinding.</string>
+    <string name="coming_soon">Deze functie is binnenkort beschhikbaar.</string>
+    <string name="tapToReconnect">Tik om te herverbinden</string>
+    <string name="overlay">Overlay</string>
+    <string name="hint_reason">Reden</string>
+    <string name="hint_ptt">Push to Talk</string>
+    <string name="hint_ptt_summary">Houd deze knop ingedrukt om te spreken. Dubbel-tik om aan/uit te schakelen.</string>
+    <string name="hint_server_add">Welkom bij Mumla</string>
+    <string name="hint_server_add_summary">Om te beginnen, voeg een favoriete server toe door op de toevoegen knop te drukken in de taakbalk.</string>
+    <string name="hint_switching">Wisselen Van Weergave</string>
+    <string name="hint_switching_summary">Wissel tussen de chat en kanaal weergave met de knoppen links boven, of door te vegen.</string>
+    <string name="action_settings">Instellingen</string>
+    <string name="reconnect">Herverbinden</string>
+    <string name="reconnect_dialog_message">U bent al verbonden met een andere server. Wisselen naar deze server?</string>
+    <string name="confirm_reset_comment">Bent u zeker dat u de commentaar van gebruiker %s wilt wissen?</string>
+    <string name="confirm">Bevestig</string>
+    <string name="expand">Vergroot</string>
+    <string name="temporary">Tijdelijk</string>
+    <string name="position">Positie</string>
+    <string name="channel_edit">Bewerk Kanaal</string>
+    <string name="channel_add">Kanaal Toevoegen</string>
+    <string name="tts_failed">TTS initialiseren mislukt</string>
+    <string name="mumble_url_parse_failed">Mumble URL kon niet worden ontleed!</string>
+    <string name="first_run_generate_certificate_title">Welkom bij Mumla!</string>
+    <string name="first_run_generate_certificate">Certificaat generen is ten zeerste aangeraden en nodig voor verbinden met bepaalde servers.</string>
+    <string name="generate">Genereer</string>
+    <string name="certificate_not_valid">Kon certificaat \'%s\' niet laden!</string>
+    <string name="invalid_password">Ongeldig wachtwoord.</string>
+    <string name="send_message">Verstuur bericht</string>
+    <string name="channel_menu_view_description">Bekijk Beschrijving</string>
+    <string name="untrusted_certificate">Onvertrouwd Certificaat</string>
+    <string name="allow">Toestaan</string>
+    <string name="trust_added">Certificaat toegevoegd aan vertrouwde opslag</string>
+    <string name="trust_add_failed">Certificaat kon niet toegevoegd worden aan vertrouwde opslag!</string>
+    <string name="trust_cleared">Vertrouwde opslag database geleegd</string>
+    <string name="cancelled">Geannuleerd</string>
+    <string name="transmit_mode">Doorstuur Modus</string>
+    <string name="current_chat_target">Huidig chat doelwit</string>
+    <string name="channel_join">Aansluiten</string>
+    <string name="certificate_info">Onderwerp:\n%1$s\n\nGeldig van:\n%2$s\n\nGeldig tot:\n%3$s\n\nDigest (SHA-1):\n%4$s\n\nDigest (SHA-256):\n%5$s</string>
+    <string name="invalid_host">Ongeldige host</string>
+    <string name="invalid_port_range">Ongeldige poort (1-65535)</string>
+    <string name="invalid_username">Ongeldige Gebruikersnaam</string>
+    <string name="cancel_reconnect">Herverbinden annuleren </string>
+    <string name="default_">Standaard</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d gebruiker</item>
+        <item quantity="other">%d gebruikers</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Herverbinden over %d seconde.</item>
+        <item quantity="other">Herverbinden over %d seconden.</item>
+    </plurals>
+    <!-- <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals> -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7106c2d..b27db52 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -118,6 +118,7 @@
     <string name="search">Поиск</string>
     <string name="searchHint">Поиск каналов и пользователей</string>
     <string name="undocumentedWakeLock">Пробуждение от датчика приближения не поддерживается на вашем устройстве. Пожалуйста, измените режим вызова на громкую связь.</string>
+    <!-- <string name="bluetooth">Bluetooth</string> -->
     <string name="recordingVolume">Усиление громкости записи</string>
     <string name="quickConnect">Быстрое подключение</string>
     <string name="connect">Подключиться</string>
@@ -182,8 +183,6 @@
     <string name="registerSelfSuccess">Отправить запрос на регистрацию</string>
     <string name="error_fetching_servers">Не удалось получить список.\nВы подключены к интернету?</string>
     <string name="coming_soon">Опция скоро будет доступна.</string>
-    <string name="search_channel_users">%d пользователей</string>
-    <string name="reconnecting">Переподключение через %d секунд(у/ы).</string>
     <string name="tapToReconnect">Нажмите чтобы переподключиться</string>
     <string name="overlay">Оверлей</string>
     <string name="hint_reason">Причина</string>
@@ -239,7 +238,6 @@
     <string name="migration_certificate_success">Сертификат перенесен.</string>
     <string name="error_writing_to_storage">Не удается записать на внешнее хранилище.</string>
     <string name="export_success">Сертификат экспортирован в %s.</string>
-    <string name="notification_unread_many">%d новых сообщений</string>
     <string name="context_channel_link">Связать</string>
     <string name="context_channel_unlink_all">Отвязать все</string>
     <string name="context_channel_shout">Установить целью для голоса</string>
@@ -254,4 +252,20 @@
     <string name="orbot_not_installed">Приложение Orbot не установлено. Tor не используется.</string>
     <string name="orbot_tor_failed">Не удалось подключиться к к локальному прокси Tor на порту %d (SOCKS).\n\nPПожалуйста убедитесь что приложение Orbot запущено.</string>
     <string name="default_">По умолчанию</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d пользователь</item>
+        <item quantity="few">%d пользователя</item>
+        <item quantity="other">%d пользователей</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Переподключение через %d секунду.</item>
+        <item quantity="few">Переподключение через %d секунды.</item>
+        <item quantity="other">Переподключение через %d секунд.</item>
+    </plurals>
+    <plurals name="notification_unread_many">
+        <item quantity="one">%d новое сообщение</item>
+        <item quantity="few">%d новых сообщения</item>
+        <item quantity="other">%d новых сообщений</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values/preference.xml b/app/src/main/res/values/preference.xml
index 4f56d14..26911ea 100644
--- a/app/src/main/res/values/preference.xml
+++ b/app/src/main/res/values/preference.xml
@@ -45,51 +45,51 @@
     <string name="acknowledgementsSum">See who contributed to Mumla</string>
     <string name="licenses">Licenses</string>
 
-	<string name="authentication">Authentication</string>
-	<string name="authenticationSum">Manage and create certificates</string>
-	<string name="audioInput">Audio Input</string>
-	<string name="audioInputMethodSum">The method of audio input.</string>
-	<string name="audioInputMethod">Transmit Mode</string>
+    <string name="authentication">Authentication</string>
+    <string name="authenticationSum">Manage and create certificates</string>
+    <string name="audioInput">Audio Input</string>
+    <string name="audioInputMethodSum">The method of audio input.</string>
+    <string name="audioInputMethod">Transmit Mode</string>
     <string name="audioInputVolume">Microphone Volume</string>
     <string name="audioInputVolumeSum">Microphone volume multiplier used to artificially normalize audio.</string>
-	<string name="callMode">Call Mode</string>
-	<string name="callModeSum">The call mode of Mumla, whether to act as a voice call or speakerphone.</string>
-	<string name="detectionThreshold">Detection Threshold</string>
-	<string name="detectionThresholdSum">The minimum amplitude required for voice to be detected (only applicable for voice activity).</string>
-	<string name="pttKey">Push to Talk Key</string>
-	<string name="pttKeySum">A hardware key to bind to Push to Talk.</string>
-	<string name="hotCorner">Push to Talk Hot Corner</string>
-	<string name="hotCornerSum">A specified corner of the screen that, when pressed down, will push to talk throughout Android.</string>
-	<string name="general">General</string>
-	<string name="generalSum">Adjust general settings</string>
-	<string name="appearance">Appearance</string>
-	<string name="appearanceSum">Tweak the app\'s visuals</string>
-	<string name="themeSum">The app-wide theme.</string>
-	<string name="theme">Theme</string>
-	<string name="advancedAudio">Advanced</string>
+    <string name="callMode">Call Mode</string>
+    <string name="callModeSum">The call mode of Mumla, whether to act as a voice call or speakerphone.</string>
+    <string name="detectionThreshold">Detection Threshold</string>
+    <string name="detectionThresholdSum">The minimum amplitude required for voice to be detected (only applicable for voice activity).</string>
+    <string name="pttKey">Push to Talk Key</string>
+    <string name="pttKeySum">A hardware key to bind to Push to Talk.</string>
+    <string name="hotCorner">Push to Talk Hot Corner</string>
+    <string name="hotCornerSum">A specified corner of the screen that, when pressed down, will push to talk throughout Android.</string>
+    <string name="general">General</string>
+    <string name="generalSum">Adjust general settings</string>
+    <string name="appearance">Appearance</string>
+    <string name="appearanceSum">Tweak the app\'s visuals</string>
+    <string name="themeSum">The app-wide theme.</string>
+    <string name="theme">Theme</string>
+    <string name="advancedAudio">Advanced</string>
     <string name="forceTcp">Force TCP</string>
     <string name="forceTcpSum">Whether to force TCP (disable UDP) communications.</string>
-	<string name="audio">Audio</string>
-	<string name="audioSum">Adjust audio input and output</string>
-	<string name="audioSampleRate">Input Sample Rate</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Adjust audio input and output</string>
+    <string name="audioSampleRate">Input Sample Rate</string>
     <string name="audioSampleRateSum">The preferred audio sample rate. Not all rates are supported by all devices.</string>
-	<string name="noCert">No Certificate</string>
-	<string name="chatNotifications">Chat Notifications</string>
-	<string name="chatNotificationsSum">Show notifications when a user posts in chat.</string>
+    <string name="noCert">No Certificate</string>
+    <string name="chatNotifications">Chat Notifications</string>
+    <string name="chatNotificationsSum">Show notifications when a user posts in chat.</string>
     <string name="defaultUsername">Default Username</string>
     <string name="defaultUsernameSum">The default username to use when connecting to servers.</string>
     <string name="defaultUsernameDefault">Mumla_User</string>
-	<string name="certificateGenerate">Generate Certificate</string>
-	<string name="certificateGenerateSum">Generates a new self-signed Mumla certificate. Recommended for beginners.</string>
-	<string name="pttSettings">Push to Talk Settings</string>
-	<string name="pttSettingsSum">Configure Push to Talk if it is enabled.</string>
-	<string name="voiceActivitySettings">Voice Activity Settings</string>
-	<string name="voiceActivitySettingsSum">Configure Voice Activity if it is enabled.</string>
-	<string name="audioOutput">Audio Output</string>
-	<string name="disableOpus">Disable Opus Codec</string>
-	<string name="disableOpusSum">Disable Opus support for Mumble 1.2.4 servers.</string>
-	<string name="hidePtt">Hide Push to Talk Button</string>
-	<string name="hidePttSum">Hides the push to talk button when in push to talk mode. Useful if you use hot corners or a hardware key exclusively.</string>
+    <string name="certificateGenerate">Generate Certificate</string>
+    <string name="certificateGenerateSum">Generates a new self-signed Mumla certificate. Recommended for beginners.</string>
+    <string name="pttSettings">Push to Talk Settings</string>
+    <string name="pttSettingsSum">Configure Push to Talk if it is enabled.</string>
+    <string name="voiceActivitySettings">Voice Activity Settings</string>
+    <string name="voiceActivitySettingsSum">Configure Voice Activity if it is enabled.</string>
+    <string name="audioOutput">Audio Output</string>
+    <string name="disableOpus">Disable Opus Codec</string>
+    <string name="disableOpusSum">Disable Opus support for Mumble 1.2.4 servers.</string>
+    <string name="hidePtt">Hide Push to Talk Button</string>
+    <string name="hidePttSum">Hides the push to talk button when in push to talk mode. Useful if you use hot corners or a hardware key exclusively.</string>
     <string name="useTts">Text-to-Speech</string>
     <string name="useTtsSum">Enable Text-to-Speech for incoming messages.</string>
     <string name="shortTtsMessages">Short Text-to-Speech messages</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e622375..69ad211 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2014 Andrew Comminos
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ 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/>.
-  -->
+    ~ Copyright (C) 2014 Andrew Comminos
+    ~
+    ~ This program is free software: you can redistribute it and/or modify
+    ~ it under the terms of the GNU General Public License as published by
+    ~ the Free Software Foundation, either version 3 of the License, or
+    ~ (at your option) any later version.
+    ~
+    ~ 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>
     <!-- Drawer pane -->
@@ -201,8 +201,6 @@
     <string name="registerSelfSuccess">Sent registration request</string>
     <string name="error_fetching_servers">Could not fetch servers.\nAre you connected to the Internet?</string>
     <string name="coming_soon">Feature coming soon.</string>
-    <string name="search_channel_users">%d users</string>
-    <string name="reconnecting">Reconnecting in %d seconds.</string>
     <string name="tapToReconnect">Tap to reconnect</string>
     <string name="overlay">Overlay</string>
     <string name="hint_reason">Reason</string>
@@ -258,7 +256,6 @@
     <string name="migration_certificate_success">Certificate migrated.</string>
     <string name="error_writing_to_storage">Could not write to external storage.</string>
     <string name="export_success">Certificate exported to %s.</string>
-    <string name="notification_unread_many">%d new messages</string>
     <string name="context_channel_link">Link</string>
     <string name="context_channel_unlink_all">Unlink All</string>
     <string name="context_channel_shout">Set Voice Target</string>
@@ -273,4 +270,17 @@
     <string name="orbot_not_installed">The Orbot app is not installed. Not using Tor.</string>
     <string name="orbot_tor_failed">Could not connect to local Tor proxy on port %d (SOCKS).\n\nPlease ensure that the Orbot app is running.</string>
     <string name="default_">Default</string>
+
+    <plurals name="search_channel_users">
+        <item quantity="one">%d user</item>
+        <item quantity="other">%d users</item>
+    </plurals>
+    <plurals name="reconnecting">
+        <item quantity="one">Reconnecting in %d second.</item>
+        <item quantity="other">Reconnecting in %d seconds.</item>
+    </plurals>
+    <plurals name="notification_unread_many">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals>
 </resources>