fixed conflicts

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

@@ -135,6 +135,10 @@
     // TODO: Add proper translation.
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    // TODO: Add proper translation.
+    <string name="msg_upload_file">Upload file</string>
+    <string name="msg_file_description">File description</string>
+    <string name="msg_send">Send</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -135,6 +135,10 @@
     // TODO: Add proper translation.
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    // TODO: Add proper translation.
+    <string name="msg_upload_file">Upload file</string>
+    <string name="msg_file_description">File description</string>
+    <string name="msg_send">Send</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -125,6 +125,9 @@
     <string name="msg_message_copied">संदेश कॉपी किया गया</string>
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
+    <string name="msg_upload_file">फाइल अपलोड करें</string>
+    <string name="msg_file_description">फाइल विवरण</string>
+    <string name="msg_send">भेजें</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

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

@@ -122,6 +122,10 @@
     // TODO: Add proper translation.
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    // TODO: Add proper translation.
+    <string name="msg_upload_file">Upload file</string>
+    <string name="msg_file_description">File description</string>
+    <string name="msg_send">Send</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>

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

@@ -120,6 +120,10 @@
     <string name="msg_delete_description">Вы уверены, что хотите удалить это сообщение?</string>
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</string>
+    // TODO: Add proper translation.
+    <string name="msg_upload_file">Upload file</string>
+    <string name="msg_file_description">File description</string>
+    <string name="msg_send">Send</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>

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

@@ -119,6 +119,9 @@
     <string name="msg_are_typing">\u0020are typing…</string>
     <string name="msg_several_users_are_typing">Several users are typing…</string>
     <string name="msg_no_search_found">No result found</string>
+    <string name="msg_upload_file">Upload file</string>
+    <string name="msg_file_description">File description</string>
+    <string name="msg_send">Send</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>