Merge remote-tracking branch 'origin/ver-name-number' into ver-name-number

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

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_register_username">Registre o nome de usuário</string>
     <string name="title_sign_up">Inscreva-se</string>
     <string name="title_authentication">Autenticação</string>
     <string name="title_legal_terms">Termos Legais</string>
@@ -16,6 +17,7 @@
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
+    <string name="action_use_this_username">Usar este nome de usuário</string>
     <string name="action_login_or_sign_up">Toque este botão para fazer login ou criar uma conta</string>
     <string name="action_terms_of_service">Termos de Serviço</string>
     <string name="action_privacy_policy">Política de Privacidade</string>
@@ -75,16 +77,18 @@
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
-    <string name="msg_requires_username">Nome de usuário requerido: Por favor, crie um nome de usuário através da versão web e volte para fazer login.</string>
-    <string name="msg_ok">OK</string>
+<<<<<<<<< Temporary merge branch 1
     <string name="msg_version">Versão</string>
     <string name="msg_build">Build</string>
+=========
+    <string name="msg_ok">OK</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.
     </string>
     <string name="msg_ver_not_minimum">
         Parece que a versão do seu servidor está abaixo da mínima requerida %1$s.\nPor favor, atualize seus servidores antes de continuar!
     </string>
+>>>>>>>>> Temporary merge branch 2
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>

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

@@ -4,6 +4,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Sign in your server</string>
     <string name="title_log_in">Log in</string>
+    <string name="title_register_username">Register username</string>
     <string name="title_sign_up">Sign up</string>
     <string name="title_authentication">Authentication</string>
     <string name="title_legal_terms">Legal Terms</string>
@@ -17,6 +18,7 @@
 
     <!-- Actions -->
     <string name="action_connect">Connect</string>
+    <string name="action_use_this_username">Use this username</string>
     <string name="action_login_or_sign_up">Tap this button to log in or create an account</string>
     <string name="action_terms_of_service">Terms of Service</string>
     <string name="action_privacy_policy">Privacy Policy</string>
@@ -77,15 +79,17 @@
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_no_messages_yet">No messages yet</string>
-    <string name="msg_requires_username">Username required: Please, create an username through the web version and come back to log in.</string>
-    <string name="msg_ok">OK</string>
+<<<<<<<<< Temporary merge branch 1
     <string name="msg_version">Version</string>
     <string name="msg_build">Build</string>
+=========
+    <string name="msg_ok">OK</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>
     <string name="msg_ver_not_minimum">
         Looks like your server version is below the minimum required version %1$s.\nPlease upgrade your server to login!
     </string>
+>>>>>>>>> Temporary merge branch 2
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>