Merge branch 'develop' into fix#1938

1e95f43e · Govind Dixit · GitHub · 9735849e · cf7ffd51 · 1e95f43e
Unverified Commit 1e95f43e authored Feb 04, 2019 by Govind Dixit Committed by GitHub Feb 04, 2019
19 changed files
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -72,7 +72,6 @@ import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.clearLightStatusBar
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
-import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.isNotNullNorEmpty
@@ -346,10 +345,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
        if (resultCode == Activity.RESULT_OK) {
            when (requestCode) {
-                REQUEST_CODE_FOR_PERFORM_CAMERA -> takenPhotoUri?.let { uri ->
-                    uri.getBitmpap(requireContext())?.let { bitmap ->
-                        presenter.uploadImage(chatRoomId, "image/png", uri, bitmap, "")
-                    }
+                REQUEST_CODE_FOR_PERFORM_CAMERA -> takenPhotoUri?.let {
+                    showFileAttachmentDialog(it)
                }
                REQUEST_CODE_FOR_PERFORM_SAF -> resultData?.data?.let {
                    showFileAttachmentDialog(it)
@@ -1122,13 +1119,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
            val builder = AlertDialog.Builder(it)
            builder.setTitle(it.getString(R.string.msg_delete_message))
                .setMessage(it.getString(R.string.msg_delete_description))
-                .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ ->
+                .setPositiveButton(it.getString(android.R.string.ok)) { _, _ ->
                    presenter.deleteMessage(
                        roomId,
                        id
                    )
                }
-                .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ -> }
+                .setNegativeButton(it.getString(android.R.string.cancel)) { _, _ -> }
                .show()
        }
    }

--- a/app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt
@@ -97,4 +97,4 @@ fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {

    cancelButton.setOnClickListener { alertDialog?.dismiss() }
    alertDialog?.show()
-}
\ No newline at end of file
+}
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -196,7 +196,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
                    BuildConfig.RECOMMENDED_SERVER_VERSION
                )
            )
-            .setPositiveButton(R.string.msg_ok, null)
+            .setPositiveButton(android.R.string.ok, null)
            .create()
            .show()
    }
@@ -210,7 +210,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
                )
            )
            .setOnDismissListener { presenter.logout() }
-            .setPositiveButton(R.string.msg_ok, null)
+            .setPositiveButton(android.R.string.ok, null)
            .create()
            .show()
    }

--- a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
+++ b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
@@ -136,12 +136,7 @@ class MembersFragment : Fragment(), MembersView {
    private fun setupToolbar(totalMembers: Long? = null) {
        with((activity as ChatRoomActivity)) {
            if (totalMembers != null) {
-                showToolbarTitle(
-                    (getString(
-                        R.string.title_counted_members,
-                        totalMembers
-                    ))
-                )
+                showToolbarTitle((getString(R.string.title_counted_members, totalMembers)))
            } else {
                showToolbarTitle((getString(R.string.title_members)))
            }

--- a/app/src/main/java/chat/rocket/android/util/HttpLoggingInterceptor.kt
+++ b/app/src/main/java/chat/rocket/android/util/HttpLoggingInterceptor.kt
@@ -7,8 +7,6 @@ import okhttp3.MediaType
 import okhttp3.OkHttpClient
 import okhttp3.Response
 import okhttp3.internal.http.HttpHeaders
-import okhttp3.internal.platform.Platform
-import okhttp3.internal.platform.Platform.INFO
 import okio.Buffer
 import okio.GzipSource
 import java.io.EOFException

--- a/app/src/main/res/layout/file_attachments_dialog.xml
+++ b/app/src/main/res/layout/file_attachments_dialog.xml
@@ -98,7 +98,7 @@
            app:layout_constraintEnd_toStartOf="@id/button_send"
            android:layout_margin="16dp"
            style="@style/Base.Widget.AppCompat.Button.Borderless"
-            android:text="@string/msg_cancel" />
+            android:text="@android:string/cancel" />
    </androidx.constraintlayout.widget.ConstraintLayout>

 </ScrollView>
\ No newline at end of file
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,7 +32,6 @@
    <string name="title_description">Beschreibung</string>
    <string name="title_licence">Lizenz</string>

-
    <!-- Actions -->
    <string name="action_connect">Verbinde</string>
    <string name="action_use_this_username">Benutze den Benutzernamen</string>
@@ -44,9 +43,7 @@
    <string name="action_create_channel">Erstelle Raum</string>
    <string name="action_create">Erstelle</string>
    <string name="action_logout">Abmelden</string>
-
    <string name="action_attach_a_files">Eine Datei anhängen</string>
-  
    <string name="action_confirm_password">Bestätige Passwort Änderung</string>
    <string name="action_join_chat">Trete Chat bei</string>
    <string name="action_add_account">Erstelle Account</string>
@@ -55,8 +52,7 @@
    <string name="action_busy">Beschäftigt</string>
    <string name="action_invisible">Unsichtbar</string>
    <string name="action_drawing">Zeichnung</string>
-    <string name="action_save_to_gallery">Sichern in Gallerie</string>
-
+    <string name="action_save_to_gallery">Sichern in Galerie</string>
    <string name="action_select_photo_from_gallery">Foto aus der Galerie auswählen</string>
    <string name="action_take_a_photo">Ein Foto aufnehmen und senden</string>
    <string name="action_reset_avatar">Avatar zurücksetzen</string>
@@ -71,7 +67,7 @@
    <string-array name="settings_actions">
        <item name="item_preferences">Eigenschaften</item>
        <item name="item_password">Passwort ändern</item>
-        <item name="change_language">Change Language</item>
+        <item name="change_language">Change language</item> <!-- TODO Add translation -->
        <item name="item_share_app">Link zur App teilen</item>
        <item name="item_rate_us">Bewerten Sie uns</item>
        <item name="item_contact_us">Kontaktieren Sie uns</item>
@@ -132,17 +128,16 @@
    <string name="msg_preview_photo">Bild</string>
    <string name="msg_preview_file">Datei</string>
    <string name="msg_no_messages_yet">Noch keine Nachrichten</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">Server Version veraltet. Bitte kontaktieren Sie ihren Server Administrator.</string>
    <string name="msg_ver_not_recommended">Die Server Version scheint älter als die empfolene Version %1$s zu sein.\nSie können sich trotzdem einloggen, aber es kann zu einem unerwartetem Verhalten kommen.</string>
    <string name="msg_ver_not_minimum">Die Server Version scheint älter als die minimale Version %1$s zu sein.\nBitte updaten Sie Ihren Server um sich einloggen zu können!</string>
    <string name="msg_no_chat_title">Keine Chat Nachrichten</string>
    <string name="msg_no_chat_description">Starte die Konversation um Ihre \nNachrichten hier zu sehen.</string>
-    <string name="msg_cancel">ABBRUCH</string>
    <string name="msg_http_insecure">Bei HTTP verbinden Sie sich usicher zu einem Server. Wir empfehlen HTTPS zu benutzen.</string>
    <string name="msg_error_checking_server_version">Ein Fehler ist aufgetreten beim prüfen der Server Version, bitte versuchen Sie es noch einmal</string>
    <string name="msg_invalid_server_protocol">Das ausgewählte Protokoll wird vom Server nicht akzeptiert, versuchen Sie HTTPS</string>
-    <string name="msg_image_saved_successfully">Bild wurde in der Gallerie gespeichert</string>
+    <string name="msg_image_saved_successfully">Bild wurde in der Galerie gespeichert</string>
    <string name="msg_image_saved_failed">Bild speichern fehlgeschlagen</string>
    <string name="msg_edited">(bearbeitet)</string>
    <string name="msg_and">\u0020und\u0020</string>
@@ -317,7 +312,7 @@

    <!-- Emoji message-->
    <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
-    <string name="alert_title_default_skin_tone">Standart Hautton</string>
+    <string name="alert_title_default_skin_tone">Standard Hautton</string>

    <!-- Sorting and grouping-->
    <string name="msg_sort">Sortiere</string>

--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
 <resources>
+
    <!-- Titles -->
    <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
    <string name="title_log_in">Iniciar sesión</string>
@@ -63,7 +64,7 @@
    <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="change_language">Change Language</item> <!-- TODO Add translation -->
+        <item name="change_language">Change language</item> <!-- TODO Add translation -->
        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
@@ -104,7 +105,7 @@
    <string name="msg_content_description_log_in_using_meteor">Inicia sesión usando Meteor</string>
    <string name="msg_content_description_log_in_using_twitter">Inicia sesión usando Twitter</string>
    <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Inicia sesión usando WordPress</string>
    <string name="msg_content_description_send_message">Enviar mensaje</string>
    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
    <string name="msg_content_description_show_attachment_options">Mostrar opciones de archivo adjunto</string>
@@ -120,14 +121,13 @@
    <string name="msg_preview_photo">Foto</string>
    <string name="msg_preview_file">Fichero</string>
    <string name="msg_no_messages_yet">Aún no hay mensajes</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">Versión del servidor actualizada. Póngase en contacto con el administrador del servidor para actualizar la versión del servidor y continuar.</string>
    <string name="msg_ver_not_recommended">
        Parece que la versión de tu servidor está por debajo de la versión recomendada %1$s.\nAún puede iniciar sesión, pero puede experimentar comportamientos inesperados.</string>
    <string name="msg_ver_not_minimum">
        Parece que la versión del servidor está por debajo de la versión mínima requerida %1$s.\nActualice su servidor para iniciar sesión!
    </string>
-    <string name="msg_cancel">CANCELAR</string>
    <string name="msg_http_insecure">Al usar HTTP, te estás conectando a un servidor inseguro. No te recomendamos que hagas eso.</string>
    <string name="msg_error_checking_server_version">Se ha producido un error al verificar la versión de su servidor, intente de nuevo</string>
    <string name="msg_invalid_server_protocol">El protocolo seleccionado no es aceptado por este servidor, intente usar HTTPS</string>

--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -64,7 +64,7 @@
    <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="change_language">Change Language</item> <!-- TODO Add translation -->
+        <item name="change_language">Change language</item> <!-- TODO Add translation -->
        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
@@ -121,14 +121,13 @@
    <string name="msg_preview_photo">Photo</string>
    <string name="msg_preview_file">Fichier</string>
    <string name="msg_no_messages_yet">Aucun message pour le moment</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">La version du serveur est trop ancienne. Veuillez contacter l\'administateur pour mettre à jour le serveur afin de pouvoir vous y connecter.</string>
    <string name="msg_ver_not_recommended">
        On dirait que la version de votre serveur est en dessous de la version recommandée %1$s.\nVous pouvez toujours vous connecter mais vous pouvez rencontrer des comportements inattendus.</string>
    <string name="msg_ver_not_minimum">
        On dirait que la version de votre serveur est inférieure à la version minimale requise %1$s.\nVeuillez mettre à jour votre serveur pour vous connecter!
    </string>
-    <string name="msg_cancel">ANNULER</string>
    <string name="msg_http_insecure">Lorsque vous utilisez HTTP, vous vous connectez à un serveur non sécurisé. Nous ne vous recommandons pas de le faire.</string>
    <string name="msg_error_checking_server_version">Une erreur est survenue lors de la vérification de la version de votre serveur, veuillez réessayer</string>
    <string name="msg_invalid_server_protocol">Le protocole sélectionné n\'est pas accepté par ce serveur, essayez d\'utiliser HTTPS</string>
@@ -335,8 +334,8 @@
    <string name="message_information_title">Informations sur le message</string>
    <string name="msg_log_out">Déconnecter…</string>
    <string name="msg_sent_attachment">Envoyé un fichier</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">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
+

    <!-- User Details -->
    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->

--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -121,15 +121,14 @@
    <string name="msg_preview_file">फ़ाइल</string>
    <string name="msg_unread_messages">अपठित संदेश</string>
    <string name="msg_no_messages_yet">अभी तक कोई पोस्ट नहीं</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">पुराना सर्वर वर्शन। जारी रखने के लिए सर्वर वर्शन को अद्यतन करने के लिए कृपया सर्वर व्यवस्थापक से संपर्क करें।</string>
-    <string name="msg_ok">ठीक है</string>
    <string name="msg_ver_not_recommended">
        ऐसा लगता है कि आपका सर्वर संस्करण अनुशंसित संस्करण %1$s के नीचे है।\nआप अभी भी लॉगिन कर सकते हैं लेकिन आप अप्रत्याशित व्यवहार का अनुभव कर सकते हैं
    </string>
    <string name="msg_ver_not_minimum">
        ऐसा लगता है कि आपका सर्वर संस्करण न्यूनतम आवश्यक संस्करण %1$s से कम है।\nकृपया लॉगिन करने के लिए अपने सर्वर को अपग्रेड करें!
    </string>
-    <string name="msg_cancel">रद्द करना</string>
    <string name="msg_http_insecure">HTTP का उपयोग करते समय, आप एक असुरक्षित सर्वर से कनेक्ट हो रहे हैं। हम आपको ऐसा करने की सलाह नहीं देते हैं।</string>
    <string name="msg_error_checking_server_version">आपके सर्वर संस्करण की जांच करते समय एक त्रुटि आई है, कृपया पुनः प्रयास करें</string>
    <string name="msg_invalid_server_protocol">चयनित प्रोटोकॉल इस सर्वर द्वारा स्वीकार नहीं किया गया है, HTTPS का उपयोग करने का प्रयास करें</string>

--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,7 +64,7 @@
    <string-array name="settings_actions">
        <item name="item_preferences">Preferenze</item>
        <item name="item_password">Cambia password</item>
-        <item name="change_language">Change Language</item><!-- TODO Add translation -->
+        <item name="change_language">Cambia lingua</item>
        <item name="item_share_app">Condividi app</item>
        <item name="item_rate_us">Votaci</item>
        <item name="item_contact_us">Contattaci</item>
@@ -123,13 +123,12 @@
    <string name="msg_preview_photo">Foto</string>
    <string name="msg_preview_file">Documento</string>
    <string name="msg_no_messages_yet">Nessun nuovo messaggio</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Versione %1$d - %2$s - %3$s</string>
    <string name="msg_update_app_version_in_order_to_continue">Versione server non aggiornata. Si prega di contattare l\'amministratore del server per aggiornare la versione del server per continuare.</string>
    <string name="msg_ver_not_recommended">Sembra che la versione del tuo server sia inferiore alla versione consigliata %1$s.\nÈ ancora possibile accedere ma è possibile che si verifichino comportamenti imprevisti.</string>
    <string name="msg_ver_not_minimum">Sembra che la versione del tuo server sia inferiore alla versione minima richiesta %1$s.\nSi prega di aggiornare il server per accedere!</string>
    <string name="msg_no_chat_title">Nessun messaggio chat</string>
    <string name="msg_no_chat_description">Inizia a conversare per vedere i tuoi\nmessagggi qui.</string>
-    <string name="msg_cancel">CANCELLARE</string>
    <string name="msg_http_insecure">Quando si utilizza HTTP, ci si connette a un server non sicuro. Non ti consigliamo di farlo.</string>
    <string name="msg_error_checking_server_version">Si è verificato un errore durante il controllo della versione del server, riprovare</string>
    <string name="msg_invalid_server_protocol">Il protocollo selezionato non è accettato da questo server, prova a utilizzare HTTPS</string>
@@ -338,4 +337,4 @@
    <string name="submit">Invia</string>
    <string name="required">*necessario</string>
    <string name="report_sent">Il tuo resoconto è stato inviato!</string>
-</resources>
\ No newline at end of file
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -64,7 +64,7 @@
    <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="change_language">Change Language</item><!-- TODO Add translation -->
+        <item name="change_language">Change language </item><!-- TODO Add translation -->
        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
@@ -123,7 +123,7 @@
    <string name="msg_preview_photo">写真</string>
    <string name="msg_preview_file">ファイル</string>
    <string name="msg_no_messages_yet">メッセージはまだありません</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">古いバージョンのサーバーを使用しています。続行するには、管理者にサーバーのバージョンを更新するよう連絡してください。</string>
    <string name="msg_ver_not_recommended">
        ご使用のサーバーのバージョンは推薦バージョン %1$s よりも古いものです。\nログインは可能ですが、予期しない動作が発生する可能性があります。</string>
@@ -132,7 +132,6 @@
    </string>
    <string name="msg_no_chat_title">メッセージがまだありません</string>
    <string name="msg_no_chat_description">ここから会話を始めましょう</string>
-    <string name="msg_cancel">キャンセル</string>
    <string name="msg_http_insecure">HTTPを使用している場合、安全ではないサーバーに接続します。安全なサーバーに接続することをお勧めします。</string>
    <string name="msg_error_checking_server_version">サーバーのバージョンを確認中にエラーが発生しました。もう一度お試しください。</string>
    <string name="msg_invalid_server_protocol">選択したプロトコルはこのサーバーでは使用できません。HTTPSを選択してください。</string>
@@ -228,8 +227,7 @@
    <string name="action_title_editing">メッセージの編集</string>
    <string name="action_msg_add_reaction">リアクションする</string>
    <string name="action_msg_copy_permalink">パーマリンクのコピー</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Report</string> <!-- TODO - Add proper translation -->

    <!-- Permission messages -->
    <string name="permission_editing_not_allowed">編集は許可されていません</string>

--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -121,7 +121,7 @@
    <string name="msg_preview_photo">Foto</string>
    <string name="msg_preview_file">Arquivo</string>
    <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Versão %1$d - %2$s - %3$s</string>
    <string name="msg_update_app_version_in_order_to_continue">Versão do servidor desatualizada. Por favor, entre em contato com o administrador do sistema para continuar.</string>
    <string name="msg_ver_not_recommended">
        Parece que a versão do seu servidor está abaixo da recomendada %1$s.\nVocê ainda assim pode logar e continuar mas podem ocorrer alguns problemas inesperados.
@@ -131,7 +131,6 @@
    </string>
    <string name="msg_no_chat_title">Nenhuma mensagem de chat</string>
    <string name="msg_no_chat_description">Comece a conversar para ver suas\nmensagens aqui.</string>
-    <string name="msg_cancel">CANCELAR</string>
    <string name="msg_http_insecure">Usando HTTP, você estará conectando a um servidor não seguro, não recomendamos sua utilização.</string>
    <string name="msg_error_checking_server_version">Ocorreu um erro verificando a versão do servidor, por favor tente novamente</string>
    <string name="msg_invalid_server_protocol">O protocolo selecionado não é suportado pelo servidor, por favor utilize HTTPS e tente novamente</string>

--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -122,13 +122,11 @@
    <string name="msg_preview_file">Файл</string>
    <string name="msg_no_messages_yet">Нет сообщений</string>
    <string name="msg_build">Сборка %1$d - %2$s - %3$s</string>
-    <string name="msg_ok">OK</string>
    <string name="msg_update_app_version_in_order_to_continue">Версия сервера устарела. Пожалуйста, свяжитесь с администратором, чтобы обновить сервер.</string>
    <string name="msg_ver_not_recommended">Похоже, версия сервера меньше рекомендуемой %1$s.\nМожно войти, но могут возникнуть те или иные проблемы при работе.\n</string>
    <string name="msg_ver_not_minimum">Похоже, версия сервера меньше минимально необходимой %1$s.\nДля работы потребуется обновить сервер!</string>
    <string name="msg_no_chat_title">Нет сообщений</string>
    <string name="msg_no_chat_description">Начните общаться, чтобы увидеть\nтут сообщения.</string>
-    <string name="msg_cancel">ОТМЕНА</string>
    <string name="msg_http_insecure">При использовании HTTP вы подключаетесь к небезопасному серверу. Мы не рекомендуем вам это делать.</string>
    <string name="msg_error_checking_server_version">При проверке версии вашего сервера произошла ошибка, повторите попытку.</string>
    <string name="msg_invalid_server_protocol">Выбранный протокол не разрешен на этом сервере, попробуйте использовать HTTPS</string>

--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -64,7 +64,7 @@
    <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="change_language">Change Language</item> <!-- TODO Add translation -->
+        <item name="change_language">Change language</item> <!-- TODO Add translation -->
        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
@@ -123,7 +123,7 @@
    <string name="msg_preview_photo">Fotoğraf</string>
    <string name="msg_preview_file">Dosya</string>
    <string name="msg_no_messages_yet">Henüz mesaj gönderilmedi</string>
-    <string name="msg_ok">Tamam</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string> <!-- TODO Add translation -->
    <string name="msg_update_app_version_in_order_to_continue">Geçerliliğini yitirmiş uygulamanızın sürümü. Lütfen, sistem yöneticisine bildiriniz.</string>
    <string name="msg_ver_not_recommended">
        Görünüşe göre uygulamanızın sürümü önerilen %1$s sürümünden daha düşük.\nBuna rağmen sisteme giriş yapıp kullanabilirsiniz, fakat beklenmeyen hatalarla karşılaşabilirsiniz.</string>
@@ -132,7 +132,6 @@
    </string>
    <string name="msg_no_chat_title">Mesaj bulunmamaktadır</string>
    <string name="msg_no_chat_description">Mesajlarınızı burada görmek için \nyazışmaya başlayın.</string>
-    <string name="msg_cancel">İPTAL</string>
    <string name="msg_http_insecure">HTTP kullanırken güvensiz bir sunucuya bağlanıyorsunuz, bunu önermiyoruz.</string>
    <string name="msg_error_checking_server_version">Sunucu sürümünüzü kontrol ederken bir hata oluştu, lütfen tekrar deneyiniz</string>
    <string name="msg_invalid_server_protocol">Seçilen protokol bu sunucu tarafından kabul edilmiyor, lütfen HTTPS kullanın</string>

--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -64,7 +64,7 @@
    <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="change_language">Change Language</item> <!-- TODO Add translation -->
+        <item name="change_language">Change language</item> <!-- TODO Add translation -->
        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
@@ -120,13 +120,11 @@
    <string name="msg_preview_audio">Аудіо</string>
    <string name="msg_preview_photo">Фото</string>
    <string name="msg_preview_file">Файл</string>
-    <string name="msg_no_messages_yet">"Немає повідомлень "</string>
+    <string name="msg_no_messages_yet">"Немає повідомлень"</string>
    <string name="msg_build">Збірка %1$d - %2$s - %3$s</string>
-    <string name="msg_ok">ОК</string>
    <string name="msg_update_app_version_in_order_to_continue">Версія сервера застаріла. Будь ласка, зв\'яжіться з адміністратором, щоб оновити сервер.</string>
    <string name="msg_ver_not_recommended">Здається, версія сервера менше ніж рекомендована %1$s. \nМожна увійти, але можуть виникнути ті чи інші проблеми під час роботи.</string>
    <string name="msg_ver_not_minimum">Здається, версія сервера менше ніж мінімально необхідна %1$s.\nДля роботи потрібно оновити сервер!</string>
-    <string name="msg_cancel">ВІДМІНА</string>
    <string name="msg_http_insecure">При використанні HTTP ви підключаєтеся до потенційно небезпечного сервера. Ми не радимо вам це робити.</string>
    <string name="msg_error_checking_server_version">Під час перевірки версії вашого сервера сталася помилка, спробуйте ще раз.</string>
    <string name="msg_invalid_server_protocol">Використання обраного протоколу не дозволено на цьому сервері, спробуйте використати HTTPS</string>

--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -124,13 +124,11 @@
    <string name="msg_preview_file">文件</string>
    <string name="msg_no_messages_yet">尚无消息</string>
    <string name="msg_build">Build %1$d - %2$s - %3$s</string>
-    <string name="msg_ok">OK</string>
    <string name="msg_update_app_version_in_order_to_continue">服务器版本过老。请联系服务器管理员更新服务器版本。</string>
    <string name="msg_ver_not_recommended">您的服务器版本低于建议的版本%1$s.\n仍然可以登录，但是可能存在部分功能不正常的情况.</string>
    <string name="msg_ver_not_minimum">您的服务器版本低于建议的版本%1$s.\n必须更新服务器才能登录!</string>
    <string name="msg_no_chat_title">没有聊天信息</string>
    <string name="msg_no_chat_description">开始您的对话\n消息在此.</string>
-    <string name="msg_cancel">取消</string>
    <string name="msg_http_insecure">您正在使用HTTP方式不加密连接到服务器. 我们不建议您这么做.</string>
    <string name="msg_error_checking_server_version">检查服务器版本时发生错误，请重试</string>
    <string name="msg_invalid_server_protocol">您选择的协议被服务器拒绝，请使用HTTPS</string>
@@ -342,5 +340,4 @@
    <string name="submit">提交</string>
    <string name="required">*必须</string>
    <string name="report_sent">您的报告已提交!</string>
-
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@ Please, follow the rules as shown here (by adding a new string in the correct se
 Coding style:
 https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strings
 -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
    <string name="app_name" translatable="false">Rocket.Chat</string>

    <!-- Titles -->
@@ -76,7 +76,7 @@ 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="change_language">Change Language</item>
+        <item name="change_language">Change language</item>
        <item name="item_share_app">Share app</item>
        <item name="item_rate_us">Rate us</item>
        <item name="item_contact_us">Contact us</item>
@@ -114,7 +114,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string>
    <string name="msg_content_description_log_in_using_github">Login using Github</string>
    <string name="msg_content_description_log_in_using_google">Login using Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Login using LinkedIn</string>
    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string>
    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string>
    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string>
@@ -136,8 +136,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
    <string name="msg_preview_photo">Photo</string>
    <string name="msg_preview_file">File</string>
    <string name="msg_no_messages_yet">No messages yet</string>
-    <string name="msg_build" tools:ignore="MissingTranslation">Build %1$d - %2$s - %3$s</string>
-    <string name="msg_ok">OK</string>
+    <string name="msg_build">Build %1$d - %2$s - %3$s</string>
    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
    <string name="msg_ver_not_recommended">
        Looks like your server version is below the recommended version %1$s.\nYou can still login but you may experience unexpected behaviors.</string>
@@ -146,7 +145,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
    </string>
    <string name="msg_no_chat_title">No chat messages</string>
    <string name="msg_no_chat_description">Start conversing to see your\nmessages here.</string>
-    <string name="msg_cancel">CANCEL</string>
    <string name="msg_http_insecure">When using HTTP you\'re connecting to an insecure server. We don\'t recommend you doing that.</string>
    <string name="msg_error_checking_server_version">An error has occurred while checking your server version, please try again</string>
    <string name="msg_invalid_server_protocol">The selected protocol is not accepted by this server, try using HTTPS</string>