Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/custom-oauth

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -3,7 +3,6 @@ package chat.rocket.android.authentication.login.ui
 import DrawableHelper
 import android.app.Activity
 import android.content.Intent
-import android.graphics.Color
 import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
@@ -13,7 +12,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import android.widget.*
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.ScrollView
+import androidx.core.view.isVisible
 import androidx.core.view.postDelayed
 import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
@@ -36,7 +39,8 @@ internal const val REQUEST_CODE_FOR_CAS = 1
 internal const val REQUEST_CODE_FOR_OAUTH = 2
 
 class LoginFragment : Fragment(), LoginView {
-    @Inject lateinit var presenter: LoginPresenter
+    @Inject
+    lateinit var presenter: LoginPresenter
     private var isOauthViewEnable = false
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         areLoginOptionsNeeded()
@@ -60,7 +64,11 @@ class LoginFragment : Fragment(), LoginView {
         deepLinkInfo = arguments?.getParcelable(DEEP_LINK_INFO)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
         container?.inflate(R.layout.fragment_authentication_log_in)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -93,7 +101,10 @@ class LoginFragment : Fragment(), LoginView {
                 }
             } else if (requestCode == REQUEST_CODE_FOR_OAUTH) {
                 data?.apply {
-                    presenter.authenticateWithOauth(getStringExtra(INTENT_OAUTH_CREDENTIAL_TOKEN), getStringExtra(INTENT_OAUTH_CREDENTIAL_SECRET))
+                    presenter.authenticateWithOauth(
+                        getStringExtra(INTENT_OAUTH_CREDENTIAL_TOKEN),
+                        getStringExtra(INTENT_OAUTH_CREDENTIAL_SECRET)
+                    )
                 }
             }
         }
@@ -101,25 +112,29 @@ class LoginFragment : Fragment(), LoginView {
 
     private fun tintEditTextDrawableStart() {
         ui {
-            val personDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_assignment_ind_black_24dp, it)
+            val personDrawable =
+                DrawableHelper.getDrawableFromId(R.drawable.ic_assignment_ind_black_24dp, it)
             val lockDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_lock_black_24dp, it)
 
             val drawables = arrayOf(personDrawable, lockDrawable)
             DrawableHelper.wrapDrawables(drawables)
             DrawableHelper.tintDrawables(drawables, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundDrawables(arrayOf(text_username_or_email, text_password), drawables)
+            DrawableHelper.compoundDrawables(
+                arrayOf(text_username_or_email, text_password),
+                drawables
+            )
         }
     }
 
     override fun showLoading() {
         ui {
-            view_loading.setVisible(true)
+            view_loading.isVisible = true
         }
     }
 
     override fun hideLoading() {
         ui {
-            view_loading.setVisible(false)
+            view_loading.isVisible = false
         }
     }
 
@@ -141,23 +156,25 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun showFormView() {
         ui {
-            text_username_or_email.setVisible(true)
-            text_password.setVisible(true)
+            text_username_or_email.isVisible = true
+            text_password.isVisible = true
         }
     }
 
     override fun hideFormView() {
         ui {
-            text_username_or_email.setVisible(false)
-            text_password.setVisible(false)
+            text_username_or_email.isVisible = false
+            text_password.isVisible = false
         }
     }
 
     override fun setupLoginButtonListener() {
         ui {
             button_log_in.setOnClickListener {
-                presenter.authenticateWithUserAndPassword(text_username_or_email.textContent,
-                        text_password.textContent)
+                presenter.authenticateWithUserAndPassword(
+                    text_username_or_email.textContent,
+                    text_password.textContent
+                )
             }
         }
     }
@@ -180,21 +197,23 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun showCasButton() {
         ui {
-            button_cas.setVisible(true)
+            button_cas.isVisible = true
         }
     }
 
     override fun hideCasButton() {
         ui {
-            button_cas.setVisible(false)
+            button_cas.isVisible = false
         }
     }
 
     override fun setupCasButtonListener(casUrl: String, casToken: String) {
         ui { activity ->
             button_cas.setOnClickListener {
-                startActivityForResult(activity.casWebViewIntent(casUrl, casToken),
-                        REQUEST_CODE_FOR_CAS)
+                startActivityForResult(
+                    activity.casWebViewIntent(casUrl, casToken),
+                    REQUEST_CODE_FOR_CAS
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -202,7 +221,7 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun showSignUpView() {
         ui {
-            text_new_to_rocket_chat.setVisible(true)
+            text_new_to_rocket_chat.isVisible = true
         }
     }
 
@@ -223,7 +242,7 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun hideSignUpView() {
         ui {
-            text_new_to_rocket_chat.setVisible(false)
+            text_new_to_rocket_chat.isVisible = false
         }
     }
 
@@ -231,26 +250,26 @@ class LoginFragment : Fragment(), LoginView {
         ui {
             isOauthViewEnable = true
             showThreeSocialAccountsMethods()
-            social_accounts_container.setVisible(true)
+            social_accounts_container.isVisible = true
         }
     }
 
     override fun disableOauthView() {
         ui {
             isOauthViewEnable = false
-            social_accounts_container.setVisible(false)
+            social_accounts_container.isVisible = false
         }
     }
 
     override fun showLoginButton() {
         ui {
-            button_log_in.setVisible(true)
+            button_log_in.isVisible = true
         }
     }
 
     override fun hideLoginButton() {
         ui {
-            button_log_in.setVisible(false)
+            button_log_in.isVisible = false
         }
     }
 
@@ -263,7 +282,10 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupFacebookButtonListener(facebookOauthUrl: String, state: String) {
         ui { activity ->
             button_facebook.setOnClickListener {
-                startActivityForResult(activity.oauthWebViewIntent(facebookOauthUrl, state), REQUEST_CODE_FOR_OAUTH)
+                startActivityForResult(
+                    activity.oauthWebViewIntent(facebookOauthUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -278,7 +300,10 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupGithubButtonListener(githubUrl: String, state: String) {
         ui { activity ->
             button_github.setOnClickListener {
-                startActivityForResult(activity.oauthWebViewIntent(githubUrl, state), REQUEST_CODE_FOR_OAUTH)
+                startActivityForResult(
+                    activity.oauthWebViewIntent(githubUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -290,11 +315,15 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    // TODO: Use custom tabs instead of web view. See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
+    // TODO: Use custom tabs instead of web view.
+    // See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
     override fun setupGoogleButtonListener(googleUrl: String, state: String) {
         ui { activity ->
             button_google.setOnClickListener {
-                startActivityForResult(activity.oauthWebViewIntent(googleUrl, state), REQUEST_CODE_FOR_OAUTH)
+                startActivityForResult(
+                    activity.oauthWebViewIntent(googleUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -309,7 +338,10 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupLinkedinButtonListener(linkedinUrl: String, state: String) {
         ui { activity ->
             button_linkedin.setOnClickListener {
-                startActivityForResult(activity.oauthWebViewIntent(linkedinUrl, state), REQUEST_CODE_FOR_OAUTH)
+                startActivityForResult(
+                    activity.oauthWebViewIntent(linkedinUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -336,7 +368,10 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupGitlabButtonListener(gitlabUrl: String, state: String) {
         ui { activity ->
             button_gitlab.setOnClickListener {
-                startActivityForResult(activity.oauthWebViewIntent(gitlabUrl, state), REQUEST_CODE_FOR_OAUTH)
+                startActivityForResult(
+                    activity.oauthWebViewIntent(gitlabUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
             }
         }
@@ -365,7 +400,7 @@ class LoginFragment : Fragment(), LoginView {
 
     override fun setupFabListener() {
         ui {
-            button_fab.setVisible(true)
+            button_fab.isVisible = true
             button_fab.setOnClickListener({
                 button_fab.hide()
                 showRemainingSocialAccountsView()
@@ -375,8 +410,9 @@ class LoginFragment : Fragment(), LoginView {
     }
 
     override fun setupGlobalListener() {
-        // We need to setup the layout to hide and show the oauth interface when the soft keyboard is shown
-        // (means that the user touched the text_username_or_email or text_password EditText to fill that respective fields).
+        // We need to setup the layout to hide and show the oauth interface when the soft keyboard
+        // is shown (which means that the user has touched the text_username_or_email or
+        // text_password EditText to fill that respective fields).
         if (!isGlobalLayoutListenerSetUp) {
             scroll_view.viewTreeObserver.addOnGlobalLayoutListener(layoutListener)
             isGlobalLayoutListenerSetUp = true
@@ -403,9 +439,9 @@ class LoginFragment : Fragment(), LoginView {
         social_accounts_container.postDelayed(300) {
             ui {
                 (0..social_accounts_container.childCount)
-                        .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
-                        .filter { it.isClickable }
-                        .forEach { it.setVisible(true) }
+                    .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
+                    .filter { it.isClickable }
+                    .forEach { it.isVisible = true }
             }
         }
     }
@@ -433,28 +469,29 @@ class LoginFragment : Fragment(), LoginView {
     }
 
     // Returns true if *all* EditTexts are empty.
-    private fun isEditTextEmpty(): Boolean  {
+    private fun isEditTextEmpty(): Boolean {
         return text_username_or_email.textContent.isBlank() && text_password.textContent.isEmpty()
     }
 
     private fun showThreeSocialAccountsMethods() {
         (0..social_accounts_container.childCount)
             .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
-            .filter { it.isClickable  }
+            .filter { it.isClickable }
             .take(3)
-            .forEach { it.setVisible(true) }
+            .forEach { it.isVisible = true }
     }
 
     private fun showOauthView() {
         if (isOauthViewEnable) {
-            social_accounts_container.setVisible(true)
+            social_accounts_container.isVisible = true
+            button_fab.isVisible = true
         }
     }
 
     private fun hideOauthView() {
         if (isOauthViewEnable) {
-            social_accounts_container.setVisible(false)
-            button_fab.setVisible(false)
+            social_accounts_container.isVisible = false
+            button_fab.isVisible = false
         }
     }
 

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import android.app.NotificationManager
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
-import android.arch.lifecycle.LifecycleOwner
 import android.arch.persistence.room.Room
 import android.content.ComponentName
 import android.content.Context
@@ -15,7 +14,6 @@ import chat.rocket.android.app.RocketChatDatabase
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.qualifier.ForFresco
 import chat.rocket.android.dagger.qualifier.ForMessages
 import chat.rocket.android.helper.FrescoAuthInterceptor
@@ -26,29 +24,6 @@ import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.*
-import chat.rocket.android.server.domain.AccountsRepository
-import chat.rocket.android.server.domain.ChatRoomsRepository
-import chat.rocket.android.server.domain.CurrentServerRepository
-import chat.rocket.android.server.domain.GetAccountInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.GetPermissionsInteractor
-import chat.rocket.android.server.domain.GetSettingsInteractor
-import chat.rocket.android.server.domain.JobSchedulerInteractor
-import chat.rocket.android.server.domain.MessagesRepository
-import chat.rocket.android.server.domain.MultiServerTokenRepository
-import chat.rocket.android.server.domain.RoomRepository
-import chat.rocket.android.server.domain.SettingsRepository
-import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.domain.UsersRepository
-import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
-import chat.rocket.android.server.infraestructure.MemoryChatRoomsRepository
-import chat.rocket.android.server.infraestructure.MemoryRoomRepository
-import chat.rocket.android.server.infraestructure.MemoryUsersRepository
-import chat.rocket.android.server.infraestructure.ServerDao
-import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesMessagesRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
@@ -59,6 +34,7 @@ import chat.rocket.common.util.Logger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.AttachmentAdapterFactory
+import chat.rocket.core.internal.ReactionsAdapter
 import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
 import com.facebook.imagepipeline.core.ImagePipelineConfig
@@ -168,10 +144,10 @@ class AppModule {
         listeners.add(RequestLoggingListener())
 
         return OkHttpImagePipelineConfigFactory.newBuilder(context, okHttpClient)
-                .setRequestListeners(listeners)
-                .setDownsampleEnabled(true)
-                //.experiment().setBitmapPrepareToDraw(true).experiment()
-                .experiment().setPartialImageCachingEnabled(true).build()
+            .setRequestListeners(listeners)
+            .setDownsampleEnabled(true)
+            //.experiment().setBitmapPrepareToDraw(true).experiment()
+            .experiment().setPartialImageCachingEnabled(true).build()
     }
 
     @Provides
@@ -200,7 +176,7 @@ class AppModule {
     @Provides
     @ForMessages
     fun provideMessagesSharedPreferences(context: Application) =
-            context.getSharedPreferences("messages", Context.MODE_PRIVATE)
+        context.getSharedPreferences("messages", Context.MODE_PRIVATE)
 
     @Provides
     @Singleton
@@ -259,6 +235,7 @@ class AppModule {
                 ISO8601Date::class.java,
                 TimestampAdapter(CalendarISO8601Converter())
             )
+            .add(ReactionsAdapter())
             .build()
     }
 
@@ -287,15 +264,15 @@ class AppModule {
     fun provideConfiguration(context: Application, client: OkHttpClient): SpannableConfiguration {
         val res = context.resources
         return SpannableConfiguration.builder(context)
-                .asyncDrawableLoader(AsyncDrawableLoader.builder()
-                        .client(client)
-                        .executorService(Executors.newCachedThreadPool())
-                        .resources(res)
-                        .build())
-                .theme(SpannableTheme.builder()
-                        .linkColor(res.getColor(R.color.colorAccent))
-                        .build())
-                .build()
+            .asyncDrawableLoader(AsyncDrawableLoader.builder()
+                .client(client)
+                .executorService(Executors.newCachedThreadPool())
+                .resources(res)
+                .build())
+            .theme(SpannableTheme.builder()
+                .linkColor(res.getColor(R.color.colorAccent))
+                .build())
+            .build()
     }
 
     @Provides
@@ -313,11 +290,11 @@ class AppModule {
     @Provides
     @Singleton
     fun provideAccountsRepository(preferences: SharedPreferences, moshi: Moshi): AccountsRepository =
-            SharedPreferencesAccountsRepository(preferences, moshi)
+        SharedPreferencesAccountsRepository(preferences, moshi)
 
     @Provides
     fun provideNotificationManager(context: Application) =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
     @Provides
     @Singleton
@@ -326,12 +303,12 @@ class AppModule {
     @Provides
     @Singleton
     fun providePushManager(
-            context: Application,
-            groupedPushes: GroupedPush,
-            manager: NotificationManager,
-            moshi: Moshi,
-            getAccountInteractor: GetAccountInteractor,
-            getSettingsInteractor: GetSettingsInteractor): PushManager {
+        context: Application,
+        groupedPushes: GroupedPush,
+        manager: NotificationManager,
+        moshi: Moshi,
+        getAccountInteractor: GetAccountInteractor,
+        getSettingsInteractor: GetSettingsInteractor): PushManager {
         return PushManager(groupedPushes, manager, moshi, getAccountInteractor, getSettingsInteractor, context)
     }
 
@@ -343,9 +320,9 @@ class AppModule {
     @Provides
     fun provideSendMessageJob(context: Application): JobInfo {
         return JobInfo.Builder(MessageService.RETRY_SEND_MESSAGE_ID,
-                ComponentName(context, MessageService::class.java))
-                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                .build()
+            ComponentName(context, MessageService::class.java))
+            .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+            .build()
     }
 
     @Provides

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

@@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import chat.rocket.android.R
 
+// TODO: Remove. Use KTX instead.
 fun View.setVisible(visible: Boolean) {
     visibility = if (visible) {
         View.VISIBLE

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

 <resources>
     <!-- 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>
+    <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
+    <string name="title_log_in">Iniciar sesión</string>
+    <string name="title_register_username">Registrar nombre de usuario</string>
+    <string name="title_sign_up">Regístrate</string>
+    <string name="title_authentication">Autenticación</string>
+    <string name="title_legal_terms">Términos legales</string>
     <string name="title_chats">Chats</string>
-    <string name="title_profile">Profile</string>
-    <string name="title_members">Members (%d)</string>
-    <string name="title_settings">Settings</string>
-    <string name="title_password">Change Password</string>
-    <string name="title_update_profile">Update profile</string>
-    <string name="title_about">About</string>
+    <string name="title_profile">Perfil</string>
+    <string name="title_members">Miembros (%d)</string>
+    <string name="title_settings">Configuraciones</string>
+    <string name="title_password">Cambia la contraseña</string>
+    <string name="title_update_profile">Actualización del perfil</string>
+    <string name="title_about">Acerca de</string>
 
     <!-- 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>
-    <string name="action_search">Search</string>
-    <string name="action_update">Update</string>
-    <string name="action_settings">Settings</string>
-    <string name="action_logout">Logout</string>
-    <string name="action_files">Files</string>
-    <string name="action_confirm_password">Confirm Password Change</string>
-    <string name="action_join_chat">Join Chat</string>
-    <string name="action_add_account">Add account</string>
-    <string name="action_online">Online</string>
-    <string name="action_away">Away</string>
-    <string name="action_busy">Busy</string>
+    <string name="action_connect">Conectar</string>"'
+    <string name="action_use_this_username">Usa este nombre de usuario</string>
+    <string name="action_login_or_sign_up">Toca en este botón para iniciar sesión o crear una cuenta</string>
+    <string name="action_terms_of_service">Términos de Servicio</string>
+    <string name="action_privacy_policy">Política de Privacidad</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_update">Actualizar</string>
+    <string name="action_settings">Configuraciones</string>
+    <string name="action_logout">Cerrar sesión</string>
+    <string name="action_files">Archivos</string>
+    <string name="action_confirm_password">Confirmar cambio de contraseña</string>
+    <string name="action_join_chat">Unirse al chat</string>
+    <string name="action_add_account">Añadir cuenta</string>
+    <string name="action_online">Conectado(s)</string>
+    <string name="action_away">Ausente</string>
+    <string name="action_busy">Ocupado</string>
     <string name="action_invisible">Invisible</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_password">Change Password</item>
-        <item name="item_password">About</item>
+        <item name="item_password">Cambia la contraseña</item>
+        <item name="item_password">Acerca de</item>
     </string-array>
 
     <!-- Regular information messages -->
-    <string name="msg_generic_error">Sorry, an error has occurred, please try again</string>
-    <string name="msg_no_data_to_display">No data to display</string>
-    <string name="msg_profile_update_successfully">Profile update successfully</string>
-    <string name="msg_username">username</string>
-    <string name="msg_username_or_email">username or email</string>
-    <string name="msg_password">password</string>
-    <string name="msg_name">name</string>
-    <string name="msg_email">email</string>
-    <string name="msg_avatar_url">avatar URL</string>
-    <string name="msg_or_continue_using_social_accounts">Or continue using social accounts</string>
-    <string name="msg_new_user">New user? %1$s</string>
-    <string name="msg_new_user_agreement">By proceeding you are agreeing to our\n%1$s and %2$s</string>
-    <string name="msg_2fa_code">2FA Code</string>
-    <string name="msg_yesterday">Yesterday</string>
-    <string name="msg_message">Message</string>
-    <string name="msg_this_room_is_read_only">This room is read only</string>
-    <string name="msg_invalid_2fa_code">Invalid 2FA Code</string>
-    <string name="msg_invalid_file">Invalid file</string>
-    <string name="msg_invalid_server_url">Invalid server URL</string>
-    <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_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>
-    <string name="msg_content_description_send_message">Send message</string>
-    <string name="msg_content_description_show_attachment_options">Show attachment options</string>
-    <string name="msg_you">You</string>
-    <string name="msg_unknown">Unknown</string>
-    <string name="msg_email_address">E-mail address</string>
-    <string name="msg_utc_offset">UTC offset</string>
-    <string name="msg_new_password">Enter New Password</string>
-    <string name="msg_confirm_password">Confirm New Password</string>
-    <string name="msg_unread_messages">Unread messages</string>
-    <string name="msg_preview_video">Video</string>
+    <string name="msg_generic_error">Lo sentimos, ha ocurrido un error, por favor intente de nuevo</string>
+    <string name="msg_no_data_to_display">No hay información para mostrar</string>
+    <string name="msg_profile_update_successfully">Actualización de perfil con éxito</string>
+    <string name="msg_username">usuario</string>
+    <string name="msg_username_or_email">nombre de usuario o correo electrónico</string>
+    <string name="msg_password">contraseña</string>
+    <string name="msg_name">nombre</string>
+    <string name="msg_email">correo electrónico</string>
+    <string name="msg_avatar_url">URL del avatar</string>
+    <string name="msg_or_continue_using_social_accounts">O continuar usando cuentas sociales</string>
+    <string name="msg_new_user">Nuevo usuario? %1$s</string>
+    <string name="msg_new_user_agreement">Al continuar estás aceptando nuestra\n%1$s y %2$s</string>
+    <string name="msg_2fa_code">Código 2FA</string>
+    <string name="msg_yesterday">Ayer</string>
+    <string name="msg_message">Mensaje</string>
+    <string name="msg_this_room_is_read_only">Esta sala es de solo lectura</string>
+    <string name="msg_invalid_2fa_code">Código 2FA no válido</string>
+    <string name="msg_invalid_file">Archivo inválido</string>
+    <string name="msg_invalid_server_url">URL del servidor inválido</string>
+    <string name="msg_content_description_log_in_using_facebook">Inicia sesión usando Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Inicia sesión usando Github</string>
+    <string name="msg_content_description_log_in_using_google">Inicia sesión usando Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Inicia sesión usando Linkedin</string>
+    <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_send_message">Enviar mensaje</string>
+    <string name="msg_content_description_show_attachment_options">Mostrar opciones de archivo adjunto</string>
+    <string name="msg_you">Tú</string>
+    <string name="msg_unknown">Desconocido</string>
+    <string name="msg_email_address">Dirección de correo electrónico</string>
+    <string name="msg_utc_offset">Desplazamiento UTC</string>
+    <string name="msg_new_password">Introduzca nueva contraseña</string>
+    <string name="msg_confirm_password">Confirmar nueva contraseña</string>
+    <string name="msg_unread_messages">Mensajes no leídos</string>
+    <string name="msg_preview_video">Vídeo</string>
     <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_version">Version %1$s</string>
+    <string name="msg_preview_photo">Foto</string>
+    <string name="msg_no_messages_yet">Aún no hay mensajes</string>
+    <string name="msg_version">Versión %1$s</string>
     <string name="msg_build">Build %1$d</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>
+        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">
-        Looks like your server version is below the minimum required version %1$s.\nPlease upgrade your server to login!
+        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_proceed">PROCEED</string>
-    <string name="msg_cancel">CANCEL</string>
-    <string name="msg_warning">WARNING</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>
+    <string name="msg_proceed">PROCEDER</string>
+    <string name="msg_cancel">CANCELAR</string>
+    <string name="msg_warning">ADVERTENCIA</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>
 
     <!-- System messages -->
-    <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>
-    <string name="message_user_added_by">User %1$s added by %2$s</string>
-    <string name="message_user_removed_by">User %1$s removed by %2$s</string>
-    <string name="message_user_left">Has left the channel.</string>
-    <string name="message_user_joined_channel">Has joined the channel.</string>
-    <string name="message_welcome">Welcome %s</string>
-    <string name="message_removed">Message removed</string>
-    <string name="message_pinned">Pinned a message:</string>
+    <string name="message_room_name_changed">Nombre de la sala cambiado para: %1$s por %2$s</string>
+    <string name="message_user_added_by">Usuario %1$s añadido por %2$s</string>
+    <string name="message_user_removed_by">Usuario %1$s eliminado por %2$s</string>
+    <string name="message_user_left">Ha salido del canal.</string>
+    <string name="message_user_joined_channel">Se ha unido al canal.</string>
+    <string name="message_welcome">Bienvenido %s</string>
+    <string name="message_removed">Mensaje eliminado</string>
+    <string name="message_pinned">Fijado una mensaje:</string>
 
     <!-- Message actions -->
-    <string name="action_msg_reply">Reply</string>
-    <string name="action_msg_edit">Edit</string>
-    <string name="action_msg_copy">Copy</string>
-    <string name="action_msg_quote">Quote</string>
-    <string name="action_msg_delete">Delete</string>
-    <string name="action_msg_pin">Pin Message</string>
-    <string name="action_msg_unpin">Unpin Message</string>
-    <string name="action_msg_star">Star Message</string>
-    <string name="action_msg_share">Share</string>
-    <string name="action_title_editing">Editing Message</string>
-    <string name="action_msg_add_reaction">Add reaction</string>
+    <string name="action_msg_reply">Respuesta</string>
+    <string name="action_msg_edit">Editar</string>
+    <string name="action_msg_copy">Copiar</string>
+    <string name="action_msg_quote">Citar</string>
+    <string name="action_msg_delete">Borrar</string>
+    <string name="action_msg_pin">Fijar mensaje</string>
+    <string name="action_msg_unpin">Soltar mensaje</string>
+    <string name="action_msg_star">Star mensaje</string>
+    <string name="action_msg_share">Compartir</string>
+    <string name="action_title_editing">Edición de mensaje</string>
+    <string name="action_msg_add_reaction">Añadir una reacción</string>
 
     <!-- Permission messages -->
-    <string name="permission_editing_not_allowed">Editing is not allowed</string>
-    <string name="permission_deleting_not_allowed">Deleting is not allowed</string>
-    <string name="permission_pinning_not_allowed">Pinning is not allowed</string>
+    <string name="permission_editing_not_allowed">La edición no és permitida</string>
+    <string name="permission_deleting_not_allowed">Eliminar no és permitido</string>
+    <string name="permission_pinning_not_allowed">Fijar no és permitido</string>
 
     <!-- Members List -->
-    <string name="title_members_list">Members List</string>
+    <string name="title_members_list">Lista de miembros</string>
 
     <!-- Pinned Messages -->
-    <string name="title_pinned_messages">Pinned Messages</string>
-    <string name="no_pinned_messages">No pinned messages</string>
-    <string name="no_pinned_description">All the pinned messages\nappear here.</string>
+    <string name="title_pinned_messages">Mensajes fijados</string>
+    <string name="no_pinned_messages">Sin mensajes fijadas</string>
+    <string name="no_pinned_description">Todas las mensajes fijadas\naparecen aquí.</string>
 
     <!-- Upload Messages -->
-    <string name="max_file_size_exceeded">File size %1$d bytes exceeded max upload size of %2$d bytes</string>
+    <string name="max_file_size_exceeded">Tamaño del archivo (%1$d bytes) excedió el tamaño máximo de carga de %2$d bytes</string>
 
     <!-- Socket status -->
-    <string name="status_connected">Connected</string>
-    <string name="status_disconnected">Disconnected</string>
-    <string name="status_connecting">Connecting</string>
-    <string name="status_authenticating">Authenticating</string>
-    <string name="status_disconnecting">Disconnecting</string>
-    <string name="status_waiting">Connecting in %d seconds</string>
+    <string name="status_connected">Conectado</string>
+    <string name="status_disconnected">Desconectado</string>
+    <string name="status_connecting">Conectando</string>
+    <string name="status_authenticating">Autenticando</string>
+    <string name="status_disconnecting">Desconectando</string>
+    <string name="status_waiting">Conectando en %d segundos</string>
 
     <!--Suggestions-->
-    <string name="suggest_all_description">Notify all in this room</string>
-    <string name="suggest_here_description">Notify active users in this room</string>
+    <string name="suggest_all_description">Notificar a todos en esta sala</string>
+    <string name="suggest_here_description">Notificar usuarios activos en esta sala</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>
+    <string name="Slash_Gimme_Description">Muestra ༼ つ ◕_◕ ༽つ antes de su mensaje</string>
+    <string name="Slash_LennyFace_Description">Mustra ( ͡° ͜ʖ ͡°) después de tu mensaje</string>
+    <string name="Slash_Shrug_Description">Muestra ¯\_(ツ)_/¯ después de tu mensaje</string>
+    <string name="Slash_Tableflip_Description">Muestra (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Muestra ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Crea un nuevo canal</string>
+    <string name="Show_the_keyboard_shortcut_list">Mostrar la lista de atajos de teclado</string>
+    <string name="Invite_user_to_join_channel_all_from">Invita a todos los usuarios de [#canal] a unirse a este canal</string>
+    <string name="Invite_user_to_join_channel_all_to">Invita a todos los usuarios de este canal a unirse a [#canal]</string>
+    <string name="Archive">Archivo</string>
+    <string name="Remove_someone_from_room">Quita a alguien de la sala</string>
+    <string name="Leave_the_current_channel">Deja el canal actual</string>
+    <string name="Displays_action_text">Muestra texto de acción</string>
+    <string name="Direct_message_someone">Mensaje directo a alguien</string>
+    <string name="Mute_someone_in_room">Silenciar a alguien en la sala</string>
+    <string name="Unmute_someone_in_room">Dejar de silenciar a alguien en la sala</string>
+    <string name="Invite_user_to_join_channel">Invita a un usuario a unirse a este canal</string>
+    <string name="Unarchive">Desarchivar</string>
+    <string name="Join_the_given_channel">Únete al canal dado</string>
+    <string name="Guggy_Command_Description">Genera un gif basado en el texto proporcionado</string>
+    <string name="Slash_Topic_Description">Establecer tema</string>
 
     <!-- Emoji message-->
-    <string name="msg_no_recent_emoji">No recent emoji</string>
+    <string name="msg_no_recent_emoji">Sin emojis recientes</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Sort</string>
-    <string name="dialog_sort_title">Sort by</string>
-    <string name="dialog_sort_by_alphabet">Alphabetical</string>
-    <string name="dialog_sort_by_activity">Activity</string>
-    <string name="dialog_group_by_type">Group by type</string>
-    <string name="dialog_group_favourites">Group favourites</string>
-    <string name="chatroom_header">Header</string>
+    <string name="menu_chatroom_sort">Ordenar</string>
+    <string name="dialog_sort_title">Ordenar por</string>
+    <string name="dialog_sort_by_alphabet">Alfabético</string>
+    <string name="dialog_sort_by_activity">Actividad</string>
+    <string name="dialog_group_by_type">Agrupar por tipo</string>
+    <string name="dialog_group_favourites">Agrupar favoritos</string>
+    <string name="chatroom_header">Cabezazo</string>
 
     <!--ChatRooms Headers-->
-    <string name="header_channel">Channels</string>
-    <string name="header_private_groups">Private Groups</string>
-    <string name="header_direct_messages">Direct Messages</string>
-    <string name="header_live_chats">Live Chats</string>
-    <string name="header_unknown">Unknown</string>
+    <string name="header_channel">Canales</string>
+    <string name="header_private_groups">Grupos privados</string>
+    <string name="header_direct_messages">Mensajes directos</string>
+    <string name="header_live_chats">Chats en vivo</string>
+    <string name="header_unknown">Desconocido</string>
 
     <!--Notifications-->
-    <string name="notif_action_reply_hint">REPLY</string>
-    <string name="notif_error_sending">Reply has failed. Please try again.</string>
-    <string name="notif_success_sending">Message sent to %1$s!</string>
-</resources>
\ No newline at end of file
+    <string name="notif_action_reply_hint">RESPUESTA</string>
+    <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
+    <string name="notif_success_sending">Mensaje enviado a %1$s!</string>
+</resources>

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

+<resources>
+    <!-- Titles -->
+    <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
+    <string name="title_log_in">S\'identifier</string>
+    <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
+    <string name="title_sign_up">S\'inscrire</string>
+    <string name="title_authentication">Authentification</string>
+    <string name="title_legal_terms">Termes légaux</string>
+    <string name="title_chats">Chats</string>
+    <string name="title_profile">Profil</string>
+    <string name="title_members">Membres (%d)</string>
+    <string name="title_settings">Paramètres</string>
+    <string name="title_password">Changer le mot de passe</string>
+    <string name="title_update_profile">Update profile</string>
+    <string name="title_about">Sur</string>
+
+    <!-- Actions -->
+    <string name="action_connect">Se connecter</string>
+    <string name="action_use_this_username">Utilisez ce nom d\'utilisateur</string>
+    <string name="action_login_or_sign_up">Touchez ce bouton pour vous connecter ou créer un compte</string>
+    <string name="action_terms_of_service">Conditions d\'utilisation</string>
+    <string name="action_privacy_policy">Politique de confidentialité</string>
+    <string name="action_search">Chercher</string>
+    <string name="action_update">Mettre à jour</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_logout">Se déconnecter</string>
+    <string name="action_files">Fichiers</string>
+    <string name="action_confirm_password">Confirmer le mot de passe</string>
+    <string name="action_join_chat">Rejoignez le chat</string>
+    <string name="action_add_account">Ajouter un compte</string>
+    <string name="action_online">En ligne</string>
+    <string name="action_away">Loin</string>
+    <string name="action_busy">Occupé</string>
+    <string name="action_invisible">Invisible</string>
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_password">Changer le mot de passe</item>
+        <item name="item_password">Sur</item>
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">Désolé, une erreur s\'est produite. Veuillez réessayer</string>
+    <string name="msg_no_data_to_display">Aucune donnée à afficher</string>
+    <string name="msg_profile_update_successfully">Mise à jour du profil avec succès</string>
+    <string name="msg_username">nom d\'utilisateur</string>
+    <string name="msg_username_or_email">nom d\'utilisateur ou email</string>
+    <string name="msg_password">mot de passe</string>
+    <string name="msg_name">prénom</string>
+    <string name="msg_email">email</string>
+    <string name="msg_avatar_url">URL de l\'avatar</string>
+    <string name="msg_or_continue_using_social_accounts">Ou continuer en utilisant les comptes sociaux</string>
+    <string name="msg_new_user">Nouvel utilisateur? %1$s</string>
+    <string name="msg_new_user_agreement">En procédant, vous acceptez notre\n%1$s et %2$s</string>
+    <string name="msg_2fa_code">Code 2FA</string>
+    <string name="msg_yesterday">Hier</string>
+    <string name="msg_message">Message</string>
+    <string name="msg_this_room_is_read_only">Cette salle est seulement de lecture</string>
+    <string name="msg_invalid_2fa_code">Code 2FA non valide</string>
+    <string name="msg_invalid_file">Fichier non valide</string>
+    <string name="msg_invalid_server_url">URL de serveur non valide</string>
+    <string name="msg_content_description_log_in_using_facebook">Connectez-vous en utilisant Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Connectez-vous en utilisant Github</string>
+    <string name="msg_content_description_log_in_using_google">Connectez-vous en utilisant Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Connectez-vous en utilisant Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Connectez-vous en utilisant Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Connectez-vous en utilisant Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant Gitlab</string>
+    <string name="msg_content_description_send_message">Envoyer message</string>
+    <string name="msg_content_description_show_attachment_options">Afficher les options de fichiers</string>
+    <string name="msg_you">Toi</string>
+    <string name="msg_unknown">Inconnu</string>
+    <string name="msg_email_address">Adresse e-mail</string>
+    <string name="msg_utc_offset">Décalage UTC</string>
+    <string name="msg_new_password">Entrez un nouveau mot de passe</string>
+    <string name="msg_confirm_password">Confirmer le nouveau mot de passe</string>
+    <string name="msg_unread_messages">Messages non lus</string>
+    <string name="msg_preview_video">Vidéo</string>
+    <string name="msg_preview_audio">Audio</string>
+    <string name="msg_preview_photo">Photo</string>
+    <string name="msg_no_messages_yet">Aucun message pour le moment</string>
+    <string name="msg_version">Version %1$s</string>
+    <string name="msg_build">Build %1$d</string>
+    <string name="msg_ok">OK</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_proceed">PROCÉDER</string>
+    <string name="msg_cancel">ANNULER</string>
+    <string name="msg_warning">ATTENTION</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>
+
+    <!-- System messages -->
+    <string name="message_room_name_changed">Le nom de le salle a changé à: %1$s par %2$s</string>
+    <string name="message_user_added_by">Utilisateur %1$s ajouté par %2$s</string>
+    <string name="message_user_removed_by">Utilisateur %1$s enlevé par %2$s</string>
+    <string name="message_user_left">A quitté de la salle.</string>
+    <string name="message_user_joined_channel">A rejoint la salle.</string>
+    <string name="message_welcome">Bienvenue %s</string>
+    <string name="message_removed">Message supprimé</string>
+    <string name="message_pinned">Épinglé un message:</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">Répondre</string>
+    <string name="action_msg_edit">Modifier</string>
+    <string name="action_msg_copy">Copier</string>
+    <string name="action_msg_quote">Citation</string>
+    <string name="action_msg_delete">Effacer</string>
+    <string name="action_msg_pin">Épingle message</string>
+    <string name="action_msg_unpin">Enlever message</string>
+    <string name="action_msg_star">Star message</string>
+    <string name="action_msg_share">Partager</string>
+    <string name="action_title_editing">Modification du message</string>
+    <string name="action_msg_add_reaction">Ajouter une réaction</string>
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">L\'édition n\'est pas autorisée</string>
+    <string name="permission_deleting_not_allowed">La suppression n\'est pas autorisée</string>
+    <string name="permission_pinning_not_allowed">L\'épinglage n\'est pas autorisé</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">Liste des membres</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">Messages épinglés</string>
+    <string name="no_pinned_messages">Aucun message épinglé</string>
+    <string name="no_pinned_description">Tous les messages épinglés\napparaissent ici.</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Taille du fichier (%1$d bytes) dépassé la taille de téléchargement maximale de %2$d bytes</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">Connecté</string>
+    <string name="status_disconnected">Détaché</string>
+    <string name="status_connecting">Connexion</string>
+    <string name="status_authenticating">Authentification</string>
+    <string name="status_disconnecting">Déconnexion</string>
+    <string name="status_waiting">Connexion en %d secondes</string>
+
+    <!--Suggestions-->
+    <string name="suggest_all_description">Notifier tout dans cette salle</string>
+    <string name="suggest_here_description">Notifier les utilisateurs actifs dans cette salle</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Affiche ༼ つ ◕_◕ ༽つ avant votre message</string>
+    <string name="Slash_LennyFace_Description">Affiche ( ͡° ͜ʖ ͡°) après votre message</string>
+    <string name="Slash_Shrug_Description">Affiche ¯\_(ツ)_/¯ après votre message</string>
+    <string name="Slash_Tableflip_Description">Affiche (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Affiche ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Créer une nouvelle salle</string>
+    <string name="Show_the_keyboard_shortcut_list">Afficher la liste des raccourcis clavier</string>
+    <string name="Invite_user_to_join_channel_all_from">Inviter tous les utilisateurs de [#salle] à rejoindre cette salle</string>
+    <string name="Invite_user_to_join_channel_all_to">Inviter tous les utilisateurs de cette salle à rejoindre [#salle]</string>
+    <string name="Archive">Archiver</string>
+    <string name="Remove_someone_from_room">Retirer quelqu\'un de la salle</string>
+    <string name="Leave_the_current_channel">Sortir de la salle actuelle</string>
+    <string name="Displays_action_text">Affiche le texte d\'action</string>
+    <string name="Direct_message_someone">Message direct avec quelqu\'un</string>
+    <string name="Mute_someone_in_room">Mettre en sourdine une personne dans la salle</string>
+    <string name="Unmute_someone_in_room">Retirer la sourdine d\'une personne dans la salle</string>
+    <string name="Invite_user_to_join_channel">Inviter un utilisateur à rejoindre cette salle</string>
+    <string name="Unarchive">Désarchiver</string>
+    <string name="Join_the_given_channel">Rejoignez la salle fourni</string>
+    <string name="Guggy_Command_Description">Génère un gif basé sur le texte fourni</string>
+    <string name="Slash_Topic_Description">Définir le sujet</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Aucun emoji récent</string>
+
+    <!-- Sorting and grouping-->
+    <string name="menu_chatroom_sort">Trier</string>
+    <string name="dialog_sort_title">Trier par</string>
+    <string name="dialog_sort_by_alphabet">Alphabétique</string>
+    <string name="dialog_sort_by_activity">Activité</string>
+    <string name="dialog_group_by_type">Grouper par type</string>
+    <string name="dialog_group_favourites">Grouper favoris</string>
+    <string name="chatroom_header">Entête</string>
+
+    <!--ChatRooms Headers-->
+    <string name="header_channel">Salles</string>
+    <string name="header_private_groups">Groupes privés</string>
+    <string name="header_direct_messages">Messages directs</string>
+    <string name="header_live_chats">Chats en direct</string>
+    <string name="header_unknown">Inconnu</string>
+
+    <!--Notifications-->
+    <string name="notif_action_reply_hint">RÉPONDRE</string>
+    <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>
+    <string name="notif_success_sending">Message envoyé à %1$s!</string>
+</resources>

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

@@ -18,7 +18,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_login_or_sign_up">Toque neste 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>
     <string name="action_search">Pesquisar</string>
@@ -59,7 +59,7 @@
     <string name="msg_this_room_is_read_only">Este chat é apenas de leitura</string>
     <string name="msg_invalid_2fa_code">Código 2FA inválido</string>
     <string name="msg_invalid_file">Arquivo inválido</string>
-    <string name="msg_invalid_server_url">URL de servidor inválida</string>
+    <string name="msg_invalid_server_url">URL de servidor inválido</string>
     <string name="msg_content_description_log_in_using_facebook">Fazer login através do Facebook</string>
     <string name="msg_content_description_log_in_using_github">Fazer login através do Github</string>
     <string name="msg_content_description_log_in_using_google">Fazer login através do Google</string>
@@ -101,7 +101,7 @@
     <string name="message_user_added_by">Usuário %1$s adicionado por %2$s</string>
     <string name="message_user_removed_by">Usuário %1$s removido por %2$s</string>
     <string name="message_user_left">Saiu da sala.</string>
-    <string name="message_user_joined_channel">Entrou no sala.</string>
+    <string name="message_user_joined_channel">Entrou na sala.</string>
     <string name="message_welcome">Bem-vindo, %s</string>
     <string name="message_removed">Mensagem removida</string>
     <string name="message_pinned">Pinou uma mensagem:</string>
@@ -122,7 +122,7 @@
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Edição não permitida</string>
     <string name="permission_deleting_not_allowed">Remoção não permitida</string>
-    <string name="permission_pinning_not_allowed">Fixar não permitido</string>
+    <string name="permission_pinning_not_allowed">Pinagem não permitida</string>
 
     <!-- Members List -->
     <string name="title_members_list">Lista de Membros</string>
@@ -162,8 +162,8 @@
     <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="Mute_someone_in_room">Silenciar alguém</string>
+    <string name="Unmute_someone_in_room">De-silenciar 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>
@@ -193,4 +193,4 @@
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
     <string name="notif_success_sending">Mensagem enviada para %1$s!</string>
-</resources>
\ No newline at end of file
+</resources>