Merge branch 'develop' into fix-proper-silencing-user

d6cee24c · Leonardo Aramaki · 01f2a14d · cf91f096 · d6cee24c · d6cee24c
Commit d6cee24c authored Nov 11, 2018 by Leonardo Aramaki
17 changed files
--- a/README.md
+++ b/README.md
@@ -4,11 +4,14 @@

 [![CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop.svg?style=shield)](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop) [![Build Status](https://travis-ci.org/RocketChat/Rocket.Chat.Android.svg?branch=develop)](https://travis-ci.org/RocketChat/Rocket.Chat.Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a81156a8682e4649994270d3670c3c83)](https://www.codacy.com/app/matheusjardimb/Rocket.Chat.Android) 

+## Get it from the stores
+
+[![](https://user-images.githubusercontent.com/551004/48210434-74c07100-e35e-11e8-8eee-3ba84ffa74d7.png)](https://play.google.com/store/apps/details?id=chat.rocket.android) [![](https://user-images.githubusercontent.com/551004/48210349-50649480-e35e-11e8-97d9-74a4331faf3a.png)](https://f-droid.org/en/packages/chat.rocket.android/)
+
 ## Description

 This repository contains all the code related to the Android native application of [Rocket.Chat](https://github.com/RocketChat/Rocket.Chat/#about-rocketchat). To send new pull-requests, always use the branch `develop` as base and open an issue with the description of what you want/need to accomplish, if the issue wasn't created yet.

-
 ## How to build

 - You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application. 

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
        applicationId "chat.rocket.android"
        minSdkVersion versions.minSdk
        targetSdkVersion versions.targetSdk
-        versionCode 2049
-        versionName "3.1.0"
+        versionCode 2050
+        versionName "3.1.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true


--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -1173,24 +1173,26 @@ class ChatRoomPresenter @Inject constructor(
    }

    private fun processTypingStatus(typingStatus: Pair<String, Boolean>) {
-        if (typingStatus.first != currentLoggedUsername) {
-            if (!typingStatusList.any { username -> username == typingStatus.first }) {
-                if (typingStatus.second) {
-                    typingStatusList.add(typingStatus.first)
-                }
-            } else {
-                typingStatusList.find { username -> username == typingStatus.first }?.let {
-                    typingStatusList.remove(it)
+        synchronized(typingStatusList) {
+            if (typingStatus.first != currentLoggedUsername) {
+                if (!typingStatusList.any { username -> username == typingStatus.first }) {
                    if (typingStatus.second) {
                        typingStatusList.add(typingStatus.first)
                    }
+                } else {
+                    typingStatusList.find { username -> username == typingStatus.first }?.let {
+                        typingStatusList.remove(it)
+                        if (typingStatus.second) {
+                            typingStatusList.add(typingStatus.first)
+                        }
+                    }
                }
-            }

-            if (typingStatusList.isNotEmpty()) {
-                view.showTypingStatus(typingStatusList.toList())
-            } else {
-                view.hideTypingStatusView()
+                if (typingStatusList.isNotEmpty()) {
+                    view.showTypingStatus(typingStatusList.toList())
+                } else {
+                    view.hideTypingStatusView()
+                }
            }
        }
    }

--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -545,6 +545,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR

    override fun dispatchUpdateMessage(index: Int, message: List<BaseUiModel<*>>) {
        ui {
+            // TODO - investigate WHY we get a empty list here
+            if (message.isEmpty()) return@ui
+
            if (adapter.updateItem(message.last())) {
                if (message.size > 1) {
                    adapter.prependData(listOf(message.first()))
@@ -591,7 +594,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
        }
    }

-    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+    override fun showGenericErrorMessage(){
+        ui {
+            showMessage(getString(R.string.msg_generic_error))
+        }
+    }

    override fun populatePeopleSuggestions(members: List<PeopleSuggestionUiModel>) {
        ui {

--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -75,6 +75,16 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                    AboutFragment.newInstance()
                }
            }
+            resources.getString(R.string.title_share_the_app) ->{
+                val shareIntent = Intent(Intent.ACTION_SEND)
+                shareIntent.type = "text/plain"
+                val shareBody = getString(R.string.msg_check_this_out)
+                val shareSub = getString(R.string.play_store_link)
+                shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
+                shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
+                startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
+            }
+
        }
    }


--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Anmelden am Server</string>
    <string name="title_log_in">Anmelden</string>
+    <string name="title_share_the_app">App teilen</string>
    <string name="title_register_username">Registriere Benutzernamen</string>
    <string name="title_reset_password">Passwort zurücksetzen</string>
    <string name="title_sign_up">registrieren</string>
@@ -58,11 +59,14 @@
        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
        <item name="item_password">Ändere Passwort</item>
        <item name="item_password">Über</item>
+        <item name="item_share_app">App teilen</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Entschuldigung, ein Fehler ist aufgetreten, bitte versuchen Sie es noch einmal.</string>
    <string name="msg_no_data_to_display">Keine Anzeigedaten vorhanden</string>
+    <string name="msg_check_this_out">Schau dir das an</string>
+    <string name="msg_share_using">Teilen Sie mit</string>
    <string name="msg_profile_update_successfully">Profil update erfolgreich</string>
    <string name="msg_username">Benutzername</string>
    <string name="msg_username_or_email">Benutzername oder E-Mail</string>

--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,6 +2,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
    <string name="title_log_in">Iniciar sesión</string>
+    <string name="title_share_the_app">Compartir aplicación</string>
    <string name="title_register_username">Registrar nombre de usuario</string>
    <string name="title_reset_password">Restablecer la contraseña</string>
    <string name="title_sign_up">Regístrate</string>
@@ -56,11 +57,14 @@
        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
        <item name="item_password">Cambia la contraseña</item>
        <item name="item_password">Acerca de</item>
+        <item name="item_share_app">Compartir aplicación</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Lo sentimos, ha ocurrido un error, por favor intente de nuevo</string>
    <string name="msg_no_data_to_display">No hay información para mostrar</string>
+    <string name="msg_check_this_out">Mira esto</string>
+    <string name="msg_share_using">Compartir usando</string>
    <string name="msg_profile_update_successfully">Actualización de perfil con éxito</string>
    <string name="msg_username">usuario</string>
    <string name="msg_username_or_email">Nombre de usuario o correo electrónico</string>

--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
    <string name="title_log_in">S\'identifier</string>
+    <string name="title_share_the_app">Partager l\'application</string>
    <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
    <string name="title_reset_password">Réinitialiser mot de passe</string>
    <string name="title_sign_up">S\'inscrire</string>
@@ -60,11 +61,14 @@
        <item name="item_preferences">Préférences</item>
        <item name="item_password">Changer le mot de passe</item>
        <item name="item_password">À propos</item>
+        <item name="item_share_app">Partager l\'application</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Désolé, une erreur s\'est produite. Veuillez réessayer</string>
    <string name="msg_no_data_to_display">Aucune donnée à afficher</string>
+    <string name="msg_check_this_out">regarde ça</string>
+    <string name="msg_share_using">Partager en utilisant</string>
    <string name="msg_profile_update_successfully">Mise à jour du profil avec succès</string>
    <string name="msg_username">nom d\'utilisateur</string>
    <string name="msg_username_or_email">Nom d\'utilisateur ou email</string>

--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">अपने सर्वर में साइन इन करें</string>
    <string name="title_log_in">लॉग इन करें</string>
+    <string name="title_share_the_app">ऐप शेयर करे</string>
    <string name="title_register_username">रजिस्टर उपयोगकर्ता नाम</string>
    <string name="title_reset_password">पासवर्ड रीसेट करें</string>
    <string name="title_sign_up">साइन अप करें</string>
@@ -59,11 +60,14 @@
        <item name="item_preferences">प्राथमिकताएँ</item>
        <item name="item_password">पासवर्ड बदलें</item>
        <item name="item_password">परिचय</item>
+        <item name="item_share_app">ऐप शेयर करें</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">क्षमा करें, एक त्रुटि हुई है, कृपया पुनः प्रयास करें</string>
    <string name="msg_no_data_to_display">डेटा प्रदर्शित करने के लिए उपलब्ध नहीं हैं</string>
+    <string name="msg_check_this_out">इसकी जांच करें</string>
+    <string name="msg_share_using">उपयोग कर साझा करें</string>
    <string name="msg_profile_update_successfully">प्रोफ़ाइल सफलतापूर्वक अपडेट हो गया है</string>
    <string name="msg_username">यूजरनेम</string>
    <string name="msg_username_or_email">यूजरनेम या ईमेल</string>

--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -5,6 +5,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">サーバーに接続</string>
    <string name="title_log_in">ログイン</string>
+    <string name="title_share_the_app">アプリを共有する</string>
    <string name="title_register_username">ユーザー名を登録する</string>
    <string name="title_reset_password">パスワードリセット</string>
    <string name="title_sign_up">サインアップ</string>
@@ -15,14 +16,14 @@
    <string name="title_members">メンバー</string>
    <string name="title_counted_members">メンバー (%d)</string>
    <string name="title_settings">設定</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
-    <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_preferences">環境設定</string>
+    <string name="title_change_password">パスワードの変更</string>
+    <string name="title_admin_panel">管理パネル</string>
    <string name="title_password">パスワードの変更</string>
    <string name="title_update_profile">プロフィールの更新</string>
    <string name="title_about">About</string>
-    <string name="title_create_channel">新しいチャネルを作成します</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+    <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_confirmation">ログアウトしますか?</string>


    <!-- Actions -->
@@ -36,7 +37,7 @@
    <string name="action_create_channel">チャンネル作成</string>
    <string name="action_create">作ります</string>
    <string name="action_logout">ログアウト</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
+    <string name="action_stay">いいえ</string>
    <string name="action_files">ファイル</string>
    <string name="action_confirm_password">変更したパスワードの確認</string>
    <string name="action_join_chat">チャットに参加</string>
@@ -47,25 +48,28 @@
    <string name="action_invisible">状態を隠す</string>
    <string name="action_drawing">絵を描く</string>
    <string name="action_save_to_gallery">ギャラリーに保存</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Take photo</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">ギャラリーの写真を選択</string>
+    <string name="action_take_photo">写真を撮る</string>
+    <string name="action_reset_avatar">アバターをリセット</string>
+    <string name="action_connect_server">サーバーに接続</string>
+    <string name="action_join_community">コミュニティに参加</string>
+    <string name="action_create_server">新規サーバーを作成</string>
+    <string name="action_register">登録</string>
+    <string name="action_confirm">確認</string>

    <!-- Settings List -->
    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
-        <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">環境設定</item>
+        <item name="item_password">パスワードの変更</item>
+        <item name="item_password">アプリ情報</item>
+        <item name="item_share_app">アプリを共有する</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">エラーが発生しました。もう一度お試しください。</string>
    <string name="msg_no_data_to_display">表示するデータがありません</string>
+    <string name="msg_check_this_out">これをチェックする</string>
+    <string name="msg_share_using">共有する</string>
    <string name="msg_profile_update_successfully">プロフィールの更新に成功しました</string>
    <string name="msg_username">ユーザー名</string>
    <string name="msg_username_or_email">メールアドレスまたはユーザー名</string>
@@ -75,28 +79,28 @@
    <string name="msg_avatar_url">アバター URL</string>
    <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
    <string name="msg_new_user">新規ユーザー? %1$s</string>
-    <string name="msg_forgot__your_password">パスワードをお忘れですか? %1$s</string>
+    <string name="msg_forgot__your_password">パスワードをお忘れですか?</string>
    <string name="msg_reset">リセット</string>
    <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
    <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
    <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
-    <string name="msg_today">Today</string> <!-- TODO Add translation -->
+    <string name="msg_today">今日</string>
    <string name="msg_yesterday">昨日</string>
    <string name="msg_message">メッセージ</string>
    <string name="msg_this_room_is_read_only">この部屋は読み取り専用です</string>
    <string name="msg_invalid_2fa_code">無効な 2FA コード</string>
    <string name="msg_invalid_file">無効なファイル</string>
    <string name="msg_invalid_server_url">無効なサーバー URL</string>
-    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_github">Login using Github</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_google">Login using Google</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_send_message">メッセージを送信</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_facebook">Facebookでログイン</string>
+    <string name="msg_content_description_log_in_using_github">Githubでログイン</string>
+    <string name="msg_content_description_log_in_using_google">Googleでログイン</string>
+    <string name="msg_content_description_log_in_using_linkedin">Linkedinでログイン</string>
+    <string name="msg_content_description_log_in_using_meteor">Meteorでログイン</string>
+    <string name="msg_content_description_log_in_using_twitter">Twitterでログイン</string>
+    <string name="msg_content_description_log_in_using_gitlab">Gitlabでログイン</string>
+    <string name="msg_content_description_log_in_using_wordpress">WordPressでログイン</string>
+    <string name="msg_content_description_send_message">メッセージを送信</string>
+    <string name="msg_content_description_show_more_login_options">その他ログインオプション</string>
    <string name="msg_content_description_show_attachment_options">添付ファイルオプションを表示する</string>
    <string name="msg_you">あなた</string>
    <string name="msg_unknown">不明</string>
@@ -138,22 +142,22 @@
    <string name="msg_file_description">ファイルの説明</string>
    <string name="msg_send">送信</string>
    <string name="msg_sent_attachment">添付ファイルを送信しました</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
+    <string name="msg_welcome_to_rocket_chat">Rocket.Chatへようこそ</string>
+    <string name="msg_team_communication">チームコミュニケーション</string>
+    <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
+    <string name="msg_create_account">アカウントを作成</string>
+    <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
+    <string name="msg_continue_with_github"><b>Github</b>でログイン</string>
+    <string name="msg_continue_with_google"><b>Google</b>でログイン</string>
+    <string name="msg_continue_with_linkedin"><b>Linkedin</b>でログイン</string>
+    <string name="msg_continue_with_gitlab"><b>GitLab</b>でログイン</string>
+    <string name="msg_continue_with_wordpress"><b>WordPress</b>でログイン</string>
+    <string name="msg_two_factor_authentication">二要素認証</string>
+    <string name="msg__your_2fa_code">あなたの 2FA コードは何ですか?</string>
+
+    <string name="msg_view_more">更に表示</string>
+
+    <string name="msg_view_less">隠す</string>
    <!-- TODO - Add proper translation -->
    <string name="msg_muted_on_this_channel">You are muted on this channel</string>

@@ -171,14 +175,14 @@
    <string name="msg_message_copied">メッセージをコピー</string>
    <string name="msg_delete_message">メッセージを削除</string>
    <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+
+    <string name="msg_permalink_copied">パーマリンクのコピー</string>

    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">トラッキングの分析</string>
+    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
+    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>

    <!-- System messages -->
    <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
@@ -210,7 +214,7 @@
    <string name="action_title_editing">メッセージの編集</string>
    <string name="action_msg_add_reaction">リアクションする</string>
    <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_copy_permalink">パーマリンクのコピー</string>

    <!-- Permission messages -->
    <string name="permission_editing_not_allowed">編集は許可されていません</string>
@@ -295,7 +299,7 @@
    <string name="menu_chatroom_sort">ソート</string>
    <string name="dialog_sort_title">ソート</string>
    <string name="dialog_sort_by_alphabet">アルファベット順</string>
-    <string name="dialog_sort_by_activity">アクティビティで並べ替える</string>
+    <string name="dialog_sort_by_activity">アクティビティ順</string>
    <string name="dialog_group_by_type">グループ別</string>
    <string name="dialog_group_favourites">お気に入りのグループ</string>
    <string name="chatroom_header">ヘッダ</string>
@@ -310,12 +314,13 @@
    <string name="header_unknown">不明</string>

    <!--Notifications-->
-    <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
+    <string name="share_label">共有メッセージの編集</string>
    <string name="notif_action_reply_hint">返信</string>
    <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
    <string name="notif_success_sending">メッセージは %1$s に送信されました!</string>
    <string name="read_by">読者</string>
    <string name="message_information_title">メッセージ情報</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
+
 </resources>
\ No newline at end of file
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Faça login no seu servidor</string>
    <string name="title_log_in">Entrar</string>
+    <string name="title_share_the_app">Compartilhe o aplicativo</string>
    <string name="title_register_username">Registre o nome de usuário</string>
    <string name="title_reset_password">Redefinir senha</string>
    <string name="title_sign_up">Inscreva-se</string>
@@ -59,11 +60,14 @@
        <item name="item_preferences">Preferencias</item>
        <item name="item_password">Alterar senha</item>
        <item name="item_password">Sobre</item>
+        <item name="item_share_app">Compartilhe o aplicativo</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Desculpe, ocorreu um erro, tente novamente</string>
    <string name="msg_no_data_to_display">Nenhum dado para exibir</string>
+    <string name="msg_check_this_out">Veja isso</string>
+    <string name="msg_share_using">compartilhar usando</string>
    <string name="msg_profile_update_successfully">Perfil atualizado com sucesso</string>
    <string name="msg_username">nome de usuário</string>
    <string name="msg_username_or_email">Nome de usuário ou email</string>

--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Ваш сервер</string>
    <string name="title_log_in">Войти</string>
+    <string name="title_share_the_app">добавить приложение</string>
    <string name="title_register_username">Зарегистрировать имя</string>
    <string name="title_reset_password">Сброс пароля</string>
    <string name="title_sign_up">Зарегистрироваться</string>
@@ -59,11 +60,14 @@
        <item name="item_preferences">Персональные</item>
        <item name="item_password">Изменить пароль</item>
        <item name="item_password">О программе</item>
+        <item name="item_share_app">добавить приложение</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Произошла ошибка, повторите попытку.</string>
    <string name="msg_no_data_to_display">Нет данных для отображения</string>
+    <string name="msg_check_this_out">Проверь это</string>
+    <string name="msg_share_using">Совместное использование</string>
    <string name="msg_profile_update_successfully">Профиль успешно обновлен</string>
    <string name="msg_username">имя пользователя</string>
    <string name="msg_username_or_email">имя пользователя или e-mail</string>

--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Sunucunuza Bağlantı Kurun</string>
    <string name="title_log_in">Giriş Yapın</string>
+    <string name="title_share_the_app">uygulamayı Paylaş</string>
    <string name="title_register_username">Kullanıcı Adıyla Kaydolun</string>
    <string name="title_reset_password">Şifre Sıfırlama</string>
    <string name="title_sign_up">Kayıt Olun</string>
@@ -59,11 +60,14 @@
        <item name="item_preferences">Tercihler</item>
        <item name="item_password">Şifre Değiştir</item>
        <item name="item_password">Hakkında</item>
+        <item name="item_share_app">uygulamayı Paylaş</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Üzgünüz! bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.</string>
    <string name="msg_no_data_to_display">Görüntülenecek veri bulunmamaktadır.</string>
+    <string name="msg_check_this_out">bunu kontrol et</string>
+    <string name="msg_share_using">kullanarak paylaş</string>
    <string name="msg_profile_update_successfully">Profil bilgileri başarıyla güncellenmiştir.</string>
    <string name="msg_username">kullanıcı adı</string>
    <string name="msg_username_or_email">kullanıcı adı veya eposta</string>

--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3,6 +3,7 @@
    <!-- Titles -->
    <string name="title_sign_in_your_server">Ваш сервер</string>
    <string name="title_log_in">Увійти</string>
+    <string name="title_share_the_app">поділитися прикладом</string>
    <string name="title_register_username">Зареєструвати ім\'я</string>
    <string name="title_reset_password">Відновлення паролю</string>
    <string name="title_sign_up">Зареєструватися</string>
@@ -59,11 +60,14 @@
        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
        <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_share_app">поділитися прикладом</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Сталася помилка, спробуйте ще раз.</string>
    <string name="msg_no_data_to_display">Немає даних для відображення</string>
+    <string name="msg_check_this_out">Перевір це</string>
+    <string name="msg_share_using">поділитися використанням</string>
    <string name="msg_profile_update_successfully">"Профіль оновлено успішно "</string>
    <string name="msg_username">Ім\'я користувача</string>
    <string name="msg_username_or_email">Ім\'я користувача або e-mail</string>

--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -4,4 +4,5 @@
    <string name="server_hint_url" translatable="false">your-company.rocket.chat</string>
    <string name="community_server_url" translatable="false">open.rocket.chat</string>
    <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
+    <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
 </resources>
\ No newline at end of file
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
    <!-- Titles -->
    <string name="title_sign_in_your_server">Sign in to your server</string>
    <string name="title_log_in">Login</string>
+    <string name="title_share_the_app">Share App</string>
    <string name="title_register_username">Register username</string>
    <string name="title_reset_password">Reset password</string>
    <string name="title_sign_up">Sign up</string>
@@ -70,11 +71,14 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
        <item name="item_preferences">Preferences</item>
        <item name="item_password">Change Password</item>
        <item name="item_password">About</item>
+        <item name="item_share_app">Share App</item>
    </string-array>

    <!-- Regular information messages -->
    <string name="msg_generic_error">Sorry, an error has occurred, please try again</string>
    <string name="msg_no_data_to_display">No data to display</string>
+    <string name="msg_check_this_out">Check this out</string>
+    <string name="msg_share_using">Share using</string>
    <string name="msg_profile_update_successfully">Profile update successfully</string>
    <string name="msg_username">username</string>
    <string name="msg_username_or_email">Username or email</string>