fixed conflicted file

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

@@ -117,4 +117,27 @@
 
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Exibir ༼ つ ◕_◕ ༽つ antes de sua mensagem</string>
+    <string name="Slash_LennyFace_Description">Exibir ( ͡° ͜ʖ ͡°) depois de sua mensagem</string>
+    <string name="Slash_Shrug_Description">Exibir ¯\_(ツ)_/¯ depois de sua mensagem</string>
+    <string name="Slash_Tableflip_Description">Exibir (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Exibir ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Criar um novo canal</string>
+    <string name="Show_the_keyboard_shortcut_list">Show the keyboard shortcut list</string>
+    <string name="Invite_user_to_join_channel_all_from"> do [#canal] para entrar neste</string>
+    <string name="Invite_user_to_join_channel_all_to">Convidar todos os usuários deste canal para entrar no [#canal]</string>
+    <string name="Archive">Arquivar</string>
+    <string name="Remove_someone_from_room">Remover alguém do canal</string>
+    <string name="Leave_the_current_channel">Sair do canal atual</string>
+    <string name="Displays_action_text">Exibir texto de ação</string>
+    <string name="Direct_message_someone">Enviar DM para alguém</string>
+    <string name="Mute_someone_in_room">Mutar alguém</string>
+    <string name="Unmute_someone_in_room">Desmutar alguém na sala</string>
+    <string name="Invite_user_to_join_channel">Convidar algum usuário para entrar neste canal</string>
+    <string name="Unarchive">Desarquivar</string>
+    <string name="Join_the_given_channel">Entrar no canal especificado</string>
+    <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
+    <string name="Slash_Topic_Description">Definir tópico</string>
 </resources>
\ No newline at end of file

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

@@ -119,4 +119,27 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">No recent emoji</string>
 
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Displays ༼ つ ◕_◕ ༽つ before your message</string>
+    <string name="Slash_LennyFace_Description">Displays ( ͡° ͜ʖ ͡°) after your message</string>
+    <string name="Slash_Shrug_Description">Displays ¯\_(ツ)_/¯ after your message</string>
+    <string name="Slash_Tableflip_Description">Displays (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Displays ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Create a new channel</string>
+    <string name="Show_the_keyboard_shortcut_list">Show the keyboard shortcut list</string>
+    <string name="Invite_user_to_join_channel_all_from">Invite all users from [#channel] to join this channel</string>
+    <string name="Invite_user_to_join_channel_all_to">Invite all users from this channel to join [#channel]</string>
+    <string name="Archive">Archive</string>
+    <string name="Remove_someone_from_room">Remove someone from the room</string>
+    <string name="Leave_the_current_channel">Leave the current channel</string>
+    <string name="Displays_action_text">Displays action text</string>
+    <string name="Direct_message_someone">Direct message someone</string>
+    <string name="Mute_someone_in_room">Mute someone in the room</string>
+    <string name="Unmute_someone_in_room">Unmute someone in the room</string>
+    <string name="Invite_user_to_join_channel">Invite one user to join this channel</string>
+    <string name="Unarchive">Unarchive</string>
+    <string name="Join_the_given_channel">Join the given channel</string>
+    <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
+    <string name="Slash_Topic_Description">Set topic</string>
+
 </resources>
\ No newline at end of file