Merge branch 'develop' into emoji-react

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/java/chat/rocket/android/app/DrawableHelper.kt

 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
@@ -60,7 +61,7 @@ object DrawableHelper {
     /**
      * Tints a Drawable.
      *
-     * REMARK: you MUST always wrap the Drawable before tint it.
+     * REMARK: you MUST always wrap the Drawable before tinting it.
      *
      * @param drawable The Drawable to tint.
      * @param context The context.
@@ -72,58 +73,74 @@ object DrawableHelper {
         DrawableCompat.setTint(drawable, ContextCompat.getColor(context, resId))
 
     /**
-     * Compounds an array of Drawable (to appear to the left of the text) into an array of TextView.
+     * Compounds an array of Drawable (to appear on the start side of a text) into an array of TextView.
      *
-     * REMARK: the number of elements in both array of Drawable and EditText MUST be equal.
+     * REMARK: the number of elements in both arrays of Drawable and TextView MUST be equal.
      *
      * @param textView The array of TextView.
      * @param drawables The array of Drawable.
-     * @see compoundLeftDrawable
+     * @see compoundStartDrawable
      */
     fun compoundDrawables(textView: Array<TextView>, drawables: Array<Drawable>) {
         if (textView.size != drawables.size) {
             return
         } else {
             for (i in textView.indices) {
-                textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                if (textView[i].resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                } else {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(null, null, drawables[i], null)
+                }
             }
         }
     }
 
     /**
-     * Compounds a Drawable (to appear on the left side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the start side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
      * @see compoundDrawables
      */
-    fun compoundLeftDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+    fun compoundStartDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        }
 
     /**
-     * Compounds a Drawable (to appear on the right side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the end side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
-     * @see compoundLeftDrawable
+     * @see compoundStartDrawable
      */
-    fun compoundRightDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+    fun compoundEndDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        }
 
     /**
-     * Compounds a Drawable (to appear on the left and right side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the start and end side of a text) into a TextView.
      *
      * @param textView The TextView.
-     * @param leftDrawable The left Drawable.
-     * @param rightDrawable The right Drawable.
-     * @see compoundLeftDrawable
+     * @param startDrawable The start Drawable.
+     * @param endDrawable The end Drawable.
+     * @see compoundStartDrawable
      */
-    fun compoundLeftAndRightDrawable(
+    fun compoundStartAndEndDrawable(
         textView: TextView,
-        leftDrawable: Drawable,
-        rightDrawable: Drawable
+        startDrawable: Drawable,
+        endDrawable: Drawable
     ) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, rightDrawable, null)
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(startDrawable, null, endDrawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(endDrawable, null, startDrawable, null)
+        }
 
     /**
      * Returns the user status drawable.
@@ -141,4 +158,4 @@ object DrawableHelper {
             else -> getDrawableFromId(R.drawable.ic_status_invisible_12dp, context)
         }
     }
-}
\ No newline at end of file
+}

app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

@@ -140,7 +140,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
             DrawableHelper.wrapDrawable(atDrawable)
             DrawableHelper.tintDrawable(atDrawable, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundLeftDrawable(text_username, atDrawable)
+            DrawableHelper.compoundStartDrawable(text_username, atDrawable)
         }
     }
 

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt

@@ -195,7 +195,7 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
             val wrappedDrawable = DrawableHelper.wrapDrawable(it)
             val mutableDrawable = wrappedDrawable.mutate()
             DrawableHelper.tintDrawable(mutableDrawable, context!!, R.color.colorPrimary)
-            DrawableHelper.compoundLeftDrawable(name, mutableDrawable)
+            DrawableHelper.compoundStartDrawable(name, mutableDrawable)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -139,7 +139,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
     }
 
     fun setupExpandMoreForToolbar(listener: (View) -> Unit) {
-        DrawableHelper.compoundRightDrawable(
+        DrawableHelper.compoundEndDrawable(
             text_toolbar_title,
             DrawableHelper.getDrawableFromId(R.drawable.ic_chatroom_toolbar_expand_more_20dp, this)
         )

app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt

@@ -233,14 +233,14 @@ class DirectoryFragment : Fragment(), DirectoryView {
     private fun updateSortByTitle() {
         if (isSortByChannels) {
             text_sort_by.text = getString(R.string.msg_channels)
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 text_sort_by,
                 hashtagDrawable,
                 arrowDownDrawable
             )
         } else {
             text_sort_by.text = getString(R.string.msg_users)
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 text_sort_by,
                 userDrawable,
                 arrowDownDrawable

app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt

@@ -100,21 +100,21 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
         }
     }
 
-    private fun checkSelection(textView: TextView, leftDrawable: Drawable) {
+    private fun checkSelection(textView: TextView, startDrawable: Drawable) {
         context?.let {
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 textView,
-                leftDrawable,
+                startDrawable,
                 checkDrawable
             )
         }
     }
 
-    private fun uncheckSelection(textView: TextView, leftDrawable: Drawable) {
+    private fun uncheckSelection(textView: TextView, startDrawable: Drawable) {
         context?.let {
-            DrawableHelper.compoundLeftDrawable(
+            DrawableHelper.compoundStartDrawable(
                 textView,
-                leftDrawable
+                startDrawable
             )
         }
     }

app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt

@@ -143,21 +143,21 @@ class SortingAndGroupingBottomSheetFragment : BottomSheetDialogFragment(), Sorti
         text_sort_by.text = getString(R.string.msg_sort_by_placeholder, text.toLowerCase())
     }
 
-    private fun checkSelection(textView: TextView, @DrawableRes leftDrawable: Int) {
+    private fun checkSelection(textView: TextView, @DrawableRes startDrawable: Int) {
         context?.let {
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 textView,
-                DrawableHelper.getDrawableFromId(leftDrawable, it),
+                DrawableHelper.getDrawableFromId(startDrawable, it),
                 DrawableHelper.getDrawableFromId(R.drawable.ic_check, it)
             )
         }
     }
 
-    private fun uncheckSelection(textView: TextView, @DrawableRes leftDrawable: Int) {
+    private fun uncheckSelection(textView: TextView, @DrawableRes startDrawable: Int) {
         context?.let {
-            DrawableHelper.compoundLeftDrawable(
+            DrawableHelper.compoundStartDrawable(
                 textView,
-                DrawableHelper.getDrawableFromId(leftDrawable, it)
+                DrawableHelper.getDrawableFromId(startDrawable, it)
             )
         }
     }

app/src/main/res/layout/dialog_report.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
-    <!--xmlns:app="http://schemas.android.com/apk/res-auto"-->
-    <!--xmlns:tools="http://schemas.android.com/tools"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:fillViewport="true">-->
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp">
-
-        <!--<com.google.android.material.appbar.AppBarLayout-->
-        <!--android:id="@+id/appBarLayout"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:background="@color/colorPrimary"-->
-        <!--android:theme="@style/Theme.AppCompat.Light.NoActionBar">-->
-
-        <!--<androidx.appcompat.widget.Toolbar-->
-        <!--android:id="@+id/toolbar"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="?attr/actionBarSize"-->
-        <!--app:layout_scrollFlags="scroll|enterAlways"-->
-        <!--app:navigationIcon="?android:attr/homeAsUpIndicator"-->
-        <!--app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-        <!--app:theme="@style/ActionModeStyle">-->
-
-        <!--<RelativeLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content">-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_change_password"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_alignParentStart="true"-->
-        <!--android:ellipsize="end"-->
-        <!--android:maxLines="1"-->
-        <!--android:text="@string/action_msg_report"-->
-        <!--android:textColor="@color/colorWhite"-->
-        <!--android:textSize="18sp"-->
-        <!--android:textStyle="bold" />-->
-        <!--</RelativeLayout>-->
-        <!--</androidx.appcompat.widget.Toolbar>-->
-
-        <!--</com.google.android.material.appbar.AppBarLayout>-->
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="24dp" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_end="24dp" />
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_report_label"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Description"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--app:layout_constraintStart_toStartOf="@+id/guideline_start"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_required"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginStart="8dp"-->
-        <!--android:text="(required)"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--android:textSize="14sp"-->
-        <!--app:layout_constraintEnd_toEndOf="@+id/guideline_end"-->
-        <!--app:layout_constraintStart_toEndOf="@id/text_view_report_label"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <EditText
-            android:id="@+id/edit_text_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:inputType="textCapSentences|textMultiLine"
-            android:maxLines="4"
-            android:overScrollMode="always"
-            android:scrollbarStyle="insideInset"
-            android:scrollbars="vertical"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Jot something untoward..." />
-
-        <TextView
-            android:id="@+id/text_view_error"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/required"
-            android:textColor="@color/colorRed"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@+id/edit_text_description"
-            tools:visibility="visible" />
-
-        <android.widget.Button
-            android:id="@+id/button_send_report"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/rounded_color_accent"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/submit"
-            android:textColor="@android:color/white"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@id/text_view_error" />1
-    </androidx.constraintlayout.widget.ConstraintLayout>
-<!--</androidx.core.widget.NestedScrollView>-->

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

@@ -67,11 +67,11 @@
     <string name="msg_share_this_app">Teile diese App</string>
     <string name="msg_administration">Administration</string>
     <string name="msg_license">Lizenz</string>
-    <string name="msg_app_version">Version: %1$s (%2$d)</string> 
+    <string name="msg_app_version">Version: %1$s (%2$d)</string>
     <string name="msg_server_version">Serverversion: %1$s</string>
     <string name="msg_send_analytics">Analysesaten senden</string>
     <string name="msg_logout_from_rocket_chat">Logout von Rocket.Chat</string>
-    <string name="msg_delete_account">Konto löschen</string> 
+    <string name="msg_delete_account">Konto löschen</string>
     <string name="msg_change_status">Status ändern</string>
 
     <string-array name="languages"> <!-- TODO Add translations -->
@@ -243,7 +243,7 @@
 
     <!-- Message actions -->
     <string name="action_msg_reply">Antworten</string>
-    <string name="action_info">Info</string> 
+    <string name="action_info">Info</string>
     <string name="action_msg_edit">Bearbeiten</string>
     <string name="action_msg_copy">Kopieren</string>
     <string name="action_msg_quote">Zitieren</string>
@@ -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>
 
@@ -341,8 +341,8 @@
     <string name="msg_group_by_unread_on_top">Ungelesen oben</string>
     <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>
@@ -364,6 +364,8 @@
 
     <!-- User Details -->
     <string name="timezone">Zeitzone</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Senden</string>

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

@@ -251,8 +251,7 @@
     <string name="action_title_editing">Edición de mensaje</string>
     <string name="action_msg_add_reaction">Añadir una reacción</string>
     <string name="action_msg_permalink">Permalink</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Report</string> <!-- TODO Add translation -->
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La edición no és permitida</string>
@@ -299,7 +298,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 +325,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 +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">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>
@@ -366,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

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

@@ -182,8 +182,8 @@
     <string name="msg_continue_with_gitlab">ادامه دادن با <b>گیت‌لب</b></string>
     <string name="msg_continue_with_wordpress">ادامه دادن با <b>وردپرس</b></string>
     <string name="msg_two_factor_authentication">تایید هویت دو فاکتوره</string>
-	<string name="msg_your_2fa_code">کد 2FA تان چیست؟</string>
-	<string name="msg_permalink_copied">پیوند کپی شد</string>
+    <string name="msg_your_2fa_code">کد 2FA تان چیست؟</string>
+    <string name="msg_permalink_copied">پیوند کپی شد</string>
     <string name="msg_no_topic">No topic</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description</string> <!-- TODO Add translation -->
@@ -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>
@@ -363,7 +363,9 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO Add translation -->
 
     <!-- User Details -->
-    <string name="timezone">منطقه‌ی زمانی</string>
+    <string name="timezone">منطقه‌ زمانی</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">واگذاری</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>
@@ -362,9 +362,10 @@
     <string name="msg_sent_attachment">Envoyé un fichier</string>
     <string name="message_room_changed_privacy">Changé de type de chambre : %1$s de %2$s</string>
 
-
     <!-- User Details -->
     <string name="timezone">Fuseau horaire</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Soumettre</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>
@@ -366,6 +366,8 @@
 
     <!-- User Details -->
     <string name="timezone">समय क्षेत्र</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">जमा करें</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>
@@ -361,6 +361,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso Orario</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Invia</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>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

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>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso horário</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</string>

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

@@ -57,6 +57,8 @@
     <string name="action_create_server">Crie um novo servidor</string>
     <string name="action_register">Registar</string>
     <string name="action_confirm">Confirmar</string>
+    <string name="action_favorite">Marcar chat como favorito</string>
+    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
 
     <!-- Settings messages -->
     <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
@@ -109,10 +111,11 @@
     <string name="msg_check_your_email_to_reset_your_password">E-mail enviado! Verifique a sua caixa de entrada para repor a sua palavra-passe.</string>
     <string name="msg_invalid_email">Por favor introduza um endereço de e-mail válido</string>
     <string name="msg_new_user_agreement">Ao prosseguir, você concorda com os nossos \n%1$s e %2$s</string>
-    <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
     <string name="msg_yesterday">Ontem</string>
     <string name="msg_today">Hoje</string>
     <string name="msg_message">Mensagem</string>
+    <string name="msg_video_call">Video call</string> <!-- TODO Translate -->
+    <string name="msg_join_video_call">Join video call</string> <!-- TODO Translate -->
     <string name="msg_this_room_is_read_only">Esta sala é apenas de leitura</string>
     <string name="msg_invalid_2fa_code">Código 2FA inválido</string>
     <string name="msg_invalid_file">Ficheiro inválido</string>
@@ -191,6 +194,7 @@
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
     </plurals>
+    <string name="msg_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Translate -->
     <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
     <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
     <string name="msg_server">Server</string> <!-- TODO Translate -->
@@ -234,8 +238,7 @@
     <string name="message_unmuted">Utilizador %2$s removeu o silêncio de %1$s</string>
     <string name="message_role_add">%3$s deu estatuto de %2$s a %1$s</string>
     <string name="message_role_removed">%3$s retirou o estatuto de %2$s a %1$s</string>
-    <string name="action_favorite">Marcar chat como favorito</string>
-    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
+    <string name="message_video_call_started">Video call started by %1$s</string> <!-- TODO Translate -->
 
     <!-- Message actions -->
     <string name="action_msg_reply">Responder</string>
@@ -298,7 +301,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 +328,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 +341,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>
@@ -358,11 +361,10 @@
     <string name="message_information_title">Informação da Mensagem</string>
     <string name="message_room_changed_privacy">Tipo de sala alterado para: %1$s por %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">Fuso Horário</string>
     <string name="status">Estado: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</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>
@@ -362,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Часовой пояс</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Отправить</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>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

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>
@@ -362,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->

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>
@@ -359,11 +359,10 @@
     <string name="message_information_title">消息信息</string>
     <string name="message_room_changed_privacy">频道类型更改为: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(开源)</string>
-
     <!-- User Details -->
     <string name="timezone">时区</string>
-    <string name="status" translatable="false">状态: %1$s</string>
+    <string name="status">状态: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</string>

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

@@ -23,6 +23,7 @@
     <string name="title_license">許可</string>
     <string name="title_are_you_sure">確定嗎?</string>
     <string name="title_channel_details">頻道訊息</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Translate -->
     <string name="title_topic">主題</string>
     <string name="title_announcement">公告</string>
     <string name="title_description">描述</string>
@@ -279,7 +280,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 +307,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 +320,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>
@@ -339,11 +340,10 @@
     <string name="message_information_title">消息訊息</string>
     <string name="message_room_changed_privacy">頻道類型更改為: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">時區</string>
-    <string name="status" translatable="false">狀態: %1$s</string>
+    <string name="status">狀態: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</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>
@@ -379,8 +379,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
-    <string name="status" translatable="false">Status: %1$s</string>
-    <string name="user_detail_status" translatable="false">Status</string>
+    <string name="status">Status: %1$s</string>
+    <string name="user_detail_status">Status</string>
 
     <!-- Report -->
     <string name="submit">Submit</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" />-->