Merge branch 'develop' into room-info

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

 package chat.rocket.android.settings.ui
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.about.ui.AboutFragment
@@ -84,7 +87,15 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
                 startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
             }
+            resources.getString(R.string.title_rate_us) -> startAppPlayStore()
+        }
+    }
 
+    private fun startAppPlayStore() {
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
+        } catch (error: ActivityNotFoundException) {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.play_store_link).toUri()))
         }
     }
 

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Einstellungen</string>
     <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
     <string name="title_change_password">Ändere Passwort</string>
+    <string name="title_rate_us">Bewerten Sie uns</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">Bewerten Sie uns</item>
+        <item name="item_password">Über</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -15,6 +15,7 @@
     <string name="title_settings">Configuraciones</string>
     <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
     <string name="title_change_password">Cambia la contraseña</string>
+    <string name="title_rate_us">Nos califica</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Cambia la contraseña</string>
     <string name="title_update_profile">Actualización del perfil</string>
@@ -61,8 +62,9 @@
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">Nos califica</item>
+        <item name="item_password">Acerca de</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Paramètres</string>
     <string name="title_preferences">Préférences</string>
     <string name="title_change_password">Changer le mot de passe</string>
+    <string name="title_rate_us">évaluez nous</string>
     <string name="title_admin_panel">Administration</string>
     <string name="title_password">Changer le mot de passe</string>
     <string name="title_update_profile">Mettre à jour le profil</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">évaluez nous</item>
+        <item name="item_password">À propos</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,6 +16,7 @@
     <string name="title_settings">सेटिंग्स</string>
     <string name="title_preferences">प्राथमिकताएँ</string>
     <string name="title_change_password">पासवर्ड बदलें</string>
+    <string name="title_rate_us">हमें रेटिंग दें</string>
     <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
-        <item name="item_password">परिचय</item>
         <item name="item_share_app">ऐप शेयर करें</item>
+        <item name="item_rate_us">हमें रेटिंग दें</item>
+        <item name="item_password">परिचय</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,14 +16,15 @@
     <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_rate_us">私たちを評価してください</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_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_are_you_sure">本気ですか？</string>        
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">トピック</string>
     <string name="title_announcement">発表</string>
@@ -50,22 +51,23 @@
     <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_delete_account">Delete account</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>
+    <string name="action_delete_account">アカウントを削除する</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_share_app">アプリを共有する</item>
+        <item name="item_rate_us">私たちを評価してください</item>
+        <item name="item_password">アプリ情報</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -82,28 +84,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>
@@ -145,7 +147,6 @@
     <string name="msg_file_description">ファイルの説明</string>
     <string name="msg_send">送信</string>
     <string name="msg_sent_attachment">添付ファイルを送信しました</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>
@@ -158,12 +159,10 @@
     <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>
+    <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
+
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -179,17 +178,16 @@
     <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>    
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- 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>
@@ -220,8 +218,7 @@
     <string name="action_msg_share">Share</string>
     <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>
@@ -306,7 +303,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>
@@ -321,12 +318,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

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Configurações</string>
     <string name="title_preferences">Preferencias</string>
     <string name="title_change_password">Alterar senha</string>
+    <string name="title_rate_us">nos avalie</string>
     <string name="title_admin_panel">Painel administrativo</string>
     <string name="title_password">Alterar senha</string>
     <string name="title_update_profile">Editar perfil</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">nos avalie</item>
+        <item name="item_password">Sobre</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Настройки</string>
     <string name="title_preferences">Персональные</string>
     <string name="title_change_password">Изменить пароль</string>
+    <string name="title_rate_us">оцените нас</string>
     <string name="title_admin_panel">Панель админа</string>
     <string name="title_password">Изменить пароль</string>
     <string name="title_update_profile">Обновить профиль</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
-        <item name="item_password">О программе</item>
+        <item name="item_rate_us">оцените нас</item>
         <item name="item_share_app">добавить приложение</item>
+        <item name="item_password">О программе</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Ayarlar</string>
     <string name="title_preferences">Tercihler</string>
     <string name="title_change_password">Şifre Değişikliği</string>
+    <string name="title_rate_us">Bizi değerlendirin</string>
     <string name="title_admin_panel">Yönetici Paneli</string>
     <string name="title_password">Şifrenizi Değiştirin</string>
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
@@ -62,8 +63,9 @@
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">Bizi değerlendirin</item>
+        <item name="item_password">Hakkında</item>
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -16,6 +16,7 @@
     <string name="title_settings">Налаштування</string>
     <string name="title_preferences">Персональні</string>
     <string name="title_change_password">Змінити пароль</string>
+    <string name="title_rate_us">Оцініть нас</string>
     <string name="title_admin_panel">Панель адміністратора</string>
     <string name="title_password">Змінити пароль</string>
     <string name="title_update_profile">Оновити профіль</string>
@@ -62,8 +63,9 @@
     <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_share_app">поділитися прикладом</item>
+        <item name="item_rate_us">Оцініть нас</item>
+        <item name="item_password">About</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->

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

@@ -5,4 +5,5 @@
     <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>
+    <string name="market_link" translatable="false">market://details?id=chat.rocket.android</string>
 </resources>
\ No newline at end of file

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

@@ -28,6 +28,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_settings">Settings</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_change_password">Change Password</string>
+    <string name="title_rate_us">Rate Us</string>
     <string name="title_admin_panel">Admin panel</string>
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
@@ -74,8 +75,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string-array name="settings_actions">
         <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>
+        <item name="item_rate_us">Rate Us</item>
+        <item name="item_password">About</item>
     </string-array>
 
     <!-- Regular information messages -->