Updated code formatting

app/src/main/AndroidManifest.xml

@@ -90,7 +90,7 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />

app/src/main/res/values-ar/strings.xml

-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!-- Titles -->
@@ -304,7 +303,7 @@
     <string name="status_disconnecting">يتم قطع الاتصال</string>
     <string name="status_waiting">متصل في %d ثانية</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">تنبيه كل من في الغرفة</string>
     <string name="suggest_here_description">تنبيه الأعضاء المتصلين</string>
 
@@ -331,7 +330,7 @@
     <string name="Guggy_Command_Description">صنع gif بناءا على النص المعطى</string>
     <string name="Slash_Topic_Description">وضع الموضوع</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">لا يوجد ايموجيز</string>
     <string name="alert_title_default_skin_tone">لون البشرة الافتراضي</string>
 
@@ -344,7 +343,7 @@
     <string name="msg_group_by_type">تجميع حسب النوع</string>
     <string name="msg_group_by_favorites">تجميع حسب المفضلات</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">المفضلات</string>
     <string name="msg_channels">القنوات</string>
     <string name="msg_users">المستخدمين</string>
@@ -355,7 +354,7 @@
     <string name="header_live_chats">محادثات حية</string>
     <string name="header_unknown">غير معروف</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">تعديل الرسالة المنشورة</string>
     <string name="notif_action_reply_hint">رد</string>
     <string name="notif_error_sending">فشل الرد حاول مرة أخرى</string>

app/src/main/res/values-de/strings.xml

@@ -302,7 +302,7 @@
     <string name="status_disconnecting">Trenne</string>
     <string name="status_waiting">Verbinde in %d Sekunden</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Benachrichtige alle in diesem Raum</string>
     <string name="suggest_here_description">Benachrichtige aktive Benutzer in diesem Raum</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">Erstelle ein Gif, basierend auf den eingegebenen Text</string>
     <string name="Slash_Topic_Description">Setze Topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
     <string name="alert_title_default_skin_tone">Standard Hautton</string>
 
@@ -342,7 +342,7 @@
     <string name="msg_group_by_type">Gruppieren nach Typ</string>
     <string name="msg_group_by_favorites">Gruppieren nach Favoriten</string>
     
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoriten</string>
     <string name="msg_channels">Räume</string>
     <string name="msg_users">Benutzer</string>
@@ -353,7 +353,7 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unbekannt</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Bearbeite geteilte Nachricht</string>
     <string name="notif_action_reply_hint">Antworten</string>
     <string name="notif_error_sending">Antworten fehlgeschlagen. Bitte versuchen Sie es noch einmal.</string>

app/src/main/res/values-es/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando en %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notificar a todos en esta sala</string>
     <string name="suggest_here_description">Notificar usuarios activos en esta sala</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">Genera un gif basado en el texto proporcionado</string>
     <string name="Slash_Topic_Description">Establecer tema</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
 
@@ -339,18 +339,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Canales</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos privados</string>
     <string name="header_direct_messages">Mensajes directos</string>
     <string name="header_live_chats">Chats en vivo</string>
     <string name="header_unknown">Desconocido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>

app/src/main/res/values-fa/strings.xml

@@ -302,7 +302,7 @@
     <string name="status_disconnecting">درحال قطع شده</string>
     <string name="status_waiting">Connecting in %d seconds</string> <!-- TODO Add translation -->
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">به همه در این اتاق خبر بده</string>
     <string name="suggest_here_description">به کاربران فعال در این اتاق خبر بده</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">ساخت یک gif بر اساس متن آماده‌شده</string>
     <string name="Slash_Topic_Description">تعیین موضوع</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">هیچ ایموجی اخیری موجود نیست</string>
     <string name="alert_title_default_skin_tone">مدل پوسته‌ی پیش‌فرض</string>
 
@@ -342,18 +342,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">کانال‌ها</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">گروه‌های خصوصی</string>
     <string name="header_direct_messages">پیام‌های خصوصی</string>
     <string name="header_live_chats">گفت‌وگوهای زنده</string>
     <string name="header_unknown">ناشناس</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">ویراش پیام به اشتراک گذاشته شده</string>
     <string name="notif_action_reply_hint">جواب دادن</string>
     <string name="notif_error_sending">جواب با شکست مواجه شد. لطفا دوباره تلاش کنید.</string>

app/src/main/res/values-fr/strings.xml

@@ -300,7 +300,7 @@
     <string name="status_disconnecting">Déconnexion</string>
     <string name="status_waiting">Connexion dans %d secondes</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifier tous les utilisateurs dans ce salon</string>
     <string name="suggest_here_description">Notifier les utilisateurs actifs dans ce salon</string>
 
@@ -327,7 +327,7 @@
     <string name="Guggy_Command_Description">Génère un gif basé sur le texte fourni</string>
     <string name="Slash_Topic_Description">Définir le sujet</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Aucun emoji récent</string>
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
 
@@ -340,18 +340,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoris</string>
     <string name="msg_channels">Salons</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Groupes privés</string>
     <string name="header_direct_messages">Messages directs</string>
     <string name="header_live_chats">Chats en direct</string>
     <string name="header_unknown">Inconnu</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
     <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -303,7 +303,7 @@
     <string name="status_disconnecting">डिसकनेक्टिंग</string>
     <string name="status_waiting">%d सेकेंड में कनेक्ट हो रहा है</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">इस कमरे में सभी को सूचित करें</string>
     <string name="suggest_here_description">इस कमरे में सक्रिय उपयोगकर्ताओं को सूचित करना</string>
 
@@ -330,7 +330,7 @@
     <string name="Guggy_Command_Description">दिए गए पाठ पर आधारित gif उत्पन्न करता</string>
     <string name="Slash_Topic_Description">विषय सेट करें</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji"> कोई नया इमोजी नहीं</string>
     <string name="alert_title_default_skin_tone">डिफ़ॉल्ट त्वचा टोन</string>
 
@@ -343,18 +343,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">पसंदीदा</string>
     <string name="msg_channels">चैनलों</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="header_private_groups">निजी समूहों</string>
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_direct_messages">प्रत्यक्ष संदेश</string>
     <string name="header_live_chats">लाइव चैट</string>
     <string name="header_unknown">अज्ञात</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
     <string name="notif_error_sending">उत्तर विफल हुआ है। कृपया फिर से प्रयास करें।</string>

app/src/main/res/values-it/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">Disconessione</string>
     <string name="status_waiting">Collegamento fra %d secondi</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica tutti in questa stanza</string>
     <string name="suggest_here_description">Notifica gli utenti attivi di questa stanza</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">Genera una gif in base al testo fornito</string>
     <string name="Slash_Topic_Description">Imposta argomento</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
@@ -339,18 +339,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Canali</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gruppi Privati</string>
     <string name="header_direct_messages">Messaggi Diretti</string>
     <string name="header_live_chats">Stanza in diretta</string>
     <string name="header_unknown">Sconosciuto</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifica messaggio condiviso</string>
     <string name="notif_action_reply_hint">Risposta</string>
     <string name="notif_error_sending">La risposta è fallita. Per favore riprova.</string>

app/src/main/res/values-ja/strings.xml

@@ -302,7 +302,7 @@
     <string name="status_disconnecting">切断</string>
     <string name="status_waiting">%d 秒間接続中</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">このルームの全員に通知</string>
     <string name="suggest_here_description">この部屋のアクティブユーザーに通知する</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">提供されたテキストに基づいてgifを生成する</string>
     <string name="Slash_Topic_Description">設定トピック</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
 
@@ -342,18 +342,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">チャンネル</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">プライベートグループ</string>
     <string name="header_direct_messages">ダイレクトメッセージ</string>
     <string name="header_live_chats">ライブチャット</string>
     <string name="header_unknown">不明</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">共有メッセージの編集</string>
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -301,7 +301,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando em %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos nesta sala</string>
     <string name="suggest_here_description">Notifica usuários ativos nesta sala</string>
 
@@ -328,7 +328,7 @@
     <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
     <string name="Slash_Topic_Description">Definir tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
@@ -341,18 +341,18 @@
     <string name="msg_group_by_type">Agrupar por tipo</string>
     <string name="msg_group_by_favorites">Agrupar por favoritos</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
     <string name="msg_channels">Canais</string>
     <string name="msg_users">Usuários</string>
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens diretas</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -298,7 +298,7 @@
     <string name="status_disconnecting">A desligar</string>
     <string name="status_waiting">A ligar dentro de %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos os utilizadores nesta sala</string>
     <string name="suggest_here_description">Notifica os utilizadores activos nesta sala</string>
 
@@ -325,7 +325,7 @@
     <string name="Guggy_Command_Description">Gera um GIF baseado no texto fornecido</string>
     <string name="Slash_Topic_Description">Define o tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emojis recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
@@ -338,18 +338,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
     <string name="msg_channels">Canais</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens Directas</string>
     <string name="header_live_chats">Chats ao Vivo</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem partilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">A resposta falhou. Tente novamente.</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">Отключаемся…</string>
     <string name="status_waiting">Соединение через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Уведомить всех в этом чате</string>
     <string name="suggest_here_description">Уведомить всех активных пользователей в этом чате</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">Создает gif на основе предоставленного текста</string>
     <string name="Slash_Topic_Description">Задать тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
 
@@ -339,7 +339,7 @@
     <string name="msg_group_by_type">Группировать по типу</string>
     <string name="msg_group_by_favorites">Группировать по избранному</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Избранные</string>
     <string name="msg_channels">Каналы</string>
     <string name="msg_users">Пользователи</string>
@@ -350,7 +350,7 @@
     <string name="header_live_chats">Живые чаты</string>
     <string name="header_unknown">Неизвестные</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
     <string name="notif_error_sending">Не удалось ответить. Пожалуйста, попробуйте еще раз.</string>

app/src/main/res/values-tr/strings.xml

@@ -303,7 +303,7 @@
     <string name="status_disconnecting">Bağlantı kesiliyor</string>
     <string name="status_waiting">%d saniye içinde bağlanılacak</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Bu odadaki herkese bildir</string>
     <string name="suggest_here_description">Bu odadaki aktif kullanıcılara bildir</string>
 
@@ -330,7 +330,7 @@
     <string name="Guggy_Command_Description">Belirlenen yazıya göre gif oluşturur</string>
     <string name="Slash_Topic_Description">Konuyu belirle</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Son kullanılan emoji bulunmamaktadır</string>
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
 
@@ -343,18 +343,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Kanallar</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gizli Gruplar</string>
     <string name="header_direct_messages">Direkt Mesajlar</string>
     <string name="header_live_chats">Canlı Sohbetler</string>
     <string name="header_unknown">Bilinmeyen</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Paylaşılan mesajı düzenle</string>
     <string name="notif_action_reply_hint">YANITLA</string>
     <string name="notif_error_sending">Yanıtlama başarısız oldu. Lütfen, tekrar deneyiniz.</string>

app/src/main/res/values-uk/strings.xml

@@ -298,7 +298,7 @@
     <string name="status_disconnecting">Відключаємося…</string>
     <string name="status_waiting">З\'єднання через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Повідомити всіх у цьому чаті</string>
     <string name="suggest_here_description">Повідомити всіх активних користувачів у цьому чаті</string>
 
@@ -325,7 +325,7 @@
     <string name="Guggy_Command_Description">Створює gif використовуючи наданий текст</string>
     <string name="Slash_Topic_Description">Встановити тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
 
@@ -338,18 +338,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Канали</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Приватні канали</string>
     <string name="header_direct_messages">Особисті повідомлення</string>
     <string name="header_live_chats">Живі чати</string>
     <string name="header_unknown">Невідомі</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редагувати повідомлення</string>
     <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
     <string name="notif_error_sending">Не вдалося відповісти. Будь ласка, спробуйте ще раз.</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">断线中</string>
     <string name="status_waiting">连接持续了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒频道内所有人</string>
     <string name="suggest_here_description">提醒频道内在线的人</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">根据文本生成GIF</string>
     <string name="Slash_Topic_Description">设定主题</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">没有最近的emojis</string>
     <string name="alert_title_default_skin_tone">默认皮肤颜色</string>
 
@@ -339,18 +339,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">频道</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人组</string>
     <string name="header_direct_messages">直接对话</string>
     <string name="header_live_chats">Live 对话</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">编辑分享的消息</string>
     <string name="notif_action_reply_hint">回复</string>
     <string name="notif_error_sending">回复失败，请重试.</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -279,7 +279,7 @@
     <string name="status_disconnecting">斷線中</string>
     <string name="status_waiting">連線持續了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒頻道內所有成員</string>
     <string name="suggest_here_description">提醒頻道內所有在線上的成員</string>
 
@@ -306,7 +306,7 @@
     <string name="Guggy_Command_Description">根據輸入訊息產生GIF</string>
     <string name="Slash_Topic_Description">設定主題</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近沒有使用emojis</string>
     <string name="alert_title_default_skin_tone">預設主題顏色</string>
 
@@ -319,18 +319,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">頻道</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人群組</string>
     <string name="header_direct_messages">直接對話</string>
     <string name="header_live_chats">Live 對話</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">編輯分享的訊息</string>
     <string name="notif_action_reply_hint">回覆</string>
     <string name="notif_error_sending">回覆失敗，請重試.</string>

app/src/main/res/values/strings.xml

@@ -315,7 +315,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="status_disconnecting">Disconnecting</string>
     <string name="status_waiting">Connecting in %d seconds</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notify all in this room</string>
     <string name="suggest_here_description">Notify active users in this room</string>
 
@@ -342,7 +342,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
     <string name="Slash_Topic_Description">Set topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
@@ -355,18 +355,18 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_group_by_type">Group by type</string>
     <string name="msg_group_by_favorites">Group by favorites</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string>
     <string name="msg_channels">Channels</string>
     <string name="msg_users">Users</string>
     <string name="msg_search_for_global_users">Search for global users</string>
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string>
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string>
     <string name="header_private_groups">Private Groups</string>
     <string name="header_direct_messages">Direct Messages</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unknown</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>
     <string name="notif_error_sending">Reply has failed. Please try again.</string>

app/src/main/res/xml/lint.xml

 <lint>
     <issue id="InvalidPackage">
-        <ignore path="**/dropbox*.jar"/> <!--For Jitsi -->
+        <ignore path="**/dropbox*.jar"/> <!-- For Jitsi -->
     </issue>
 </lint>
\ No newline at end of file

config/quality/checkstyle/checkstyle-config.xml

@@ -95,11 +95,11 @@
             <property name="tokens" value="COMMA"/>
             <property name="option" value="EOL"/>
         </module>
-        <!-- TODO module name="PackageName">
+        <!-- TODO <module name="PackageName">
           <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
           <message key="name.invalidPattern"
               value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module-->
+        </module>-->
         <module name="TypeName">
             <message key="name.invalidPattern"
                     value="Type name ''{0}'' must match pattern ''{1}''."/>
@@ -162,16 +162,16 @@
         </module>
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
-            <!-- TODO property name="allowedAbbreviationLength" value="1"/-->
+            <!-- TODO <property name="allowedAbbreviationLength" value="1"/>-->
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <!-- TODO module name="CustomImportOrder">
+        <!-- TODO <module name="CustomImportOrder">
           <property name="specialImportsRegExp" value="com.google"/>
           <property name="sortImportsInGroupAlphabetically" value="true"/>
           <property name="customImportOrderRules"
               value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-        </module-->
+        </module>-->
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>

config/quality/pmd/pmd-ruleset.xml

@@ -20,7 +20,7 @@
     <rule ref="rulesets/java/naming.xml">
         <exclude name="AbstractNaming" />
         <exclude name="LongVariable" />
-        <!--exclude name="ShortMethodName" /-->
+        <!--<exclude name="ShortMethodName" />-->
         <exclude name="ShortVariable" />
         <exclude name="ShortClassName" />
         <!--<exclude name="VariableNamingConventions" />-->