diff --git a/app/src/main/java/com/zurichat/app/ui/activities/CreateDialog.kt b/app/src/main/java/com/zurichat/app/ui/activities/CreateDialog.kt
index 196aa258..7ecf7c91 100644
--- a/app/src/main/java/com/zurichat/app/ui/activities/CreateDialog.kt
+++ b/app/src/main/java/com/zurichat/app/ui/activities/CreateDialog.kt
@@ -57,7 +57,7 @@ class CreateDialog(private val layoutInflaterr: LayoutInflater,
                 //save to shared preferences
                 val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
                 val editor = preferences.edit()
-                editor.putString("name", java.lang.String.valueOf(name.text.toString()))
+                editor.putString(getString(R.string.name), java.lang.String.valueOf(name.text.toString()))
                 editor.apply()
             }
         }
@@ -89,7 +89,7 @@ class CreateDialog(private val layoutInflaterr: LayoutInflater,
 
                 val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
                 val editor = preferences.edit()
-                editor.putString("about", java.lang.String.valueOf(about.text.toString()))
+                editor.putString(getString(R.string.about), java.lang.String.valueOf(about.text.toString()))
                 editor.apply()
             }
         }
diff --git a/app/src/main/java/com/zurichat/app/ui/activities/DocumentSentActivity.java b/app/src/main/java/com/zurichat/app/ui/activities/DocumentSentActivity.java
index 4b7a0d88..ea49a4ac 100644
--- a/app/src/main/java/com/zurichat/app/ui/activities/DocumentSentActivity.java
+++ b/app/src/main/java/com/zurichat/app/ui/activities/DocumentSentActivity.java
@@ -143,7 +143,7 @@ private void startrecord() {
         try {
             mediaRecorder.prepare();
             mediaRecorder.start();
-            Toast.makeText(DocumentSentActivity.this, "recording", Toast.LENGTH_SHORT).show();
+            Toast.makeText(DocumentSentActivity.this, getString(R.string.recording), Toast.LENGTH_SHORT).show();
         }catch (Exception e){
             e.printStackTrace();
             // Toast.makeText(MainActivity.this, "recording error", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/zurichat/app/ui/activities/MainActivity.kt b/app/src/main/java/com/zurichat/app/ui/activities/MainActivity.kt
index 74491465..c872ff31 100644
--- a/app/src/main/java/com/zurichat/app/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/activities/MainActivity.kt
@@ -66,9 +66,9 @@ class MainActivity : AppCompatActivity() {
         val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
             //Shows Toast message if permission is granted or denied.
             if (isGranted) {
-                Toast.makeText(this, "Permission Granted!", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.permission_granted), Toast.LENGTH_LONG).show()
             } else {
-                Toast.makeText(this, "Permission Denied!", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.permission_denied), Toast.LENGTH_LONG).show()
             }
         }
 
@@ -96,7 +96,7 @@ class MainActivity : AppCompatActivity() {
         val isConnected: Boolean = activeNetwork?.isConnectedOrConnecting == true
 
         if(!isConnected){
-            Toast.makeText(applicationContext,"No Internet Connection!",Toast.LENGTH_LONG).show()
+            Toast.makeText(applicationContext,getString(R.string.hello_blank_fragment),Toast.LENGTH_LONG).show()
         }
     }
 
diff --git a/app/src/main/java/com/zurichat/app/ui/activities/OpenCameraActivity.java b/app/src/main/java/com/zurichat/app/ui/activities/OpenCameraActivity.java
index adecb579..e826a62b 100644
--- a/app/src/main/java/com/zurichat/app/ui/activities/OpenCameraActivity.java
+++ b/app/src/main/java/com/zurichat/app/ui/activities/OpenCameraActivity.java
@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
             if (intent.resolveActivity(getPackageManager()) != null){
                 activityResultLauncher.launch(intent);
             }else{
-                Toast.makeText(OpenCameraActivity.this, "Unable to Start Camera!",
+                Toast.makeText(OpenCameraActivity.this, getString(R.string.unable_to_start_camera),
                         Toast.LENGTH_SHORT).show();
             }
         });
diff --git a/app/src/main/java/com/zurichat/app/ui/activities/ProfileActivity.kt b/app/src/main/java/com/zurichat/app/ui/activities/ProfileActivity.kt
index 7ce75d2b..96f9e206 100644
--- a/app/src/main/java/com/zurichat/app/ui/activities/ProfileActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/activities/ProfileActivity.kt
@@ -69,7 +69,7 @@ open class ProfileActivity: AppCompatActivity() {
 
         //user = intent.extras?.getParcelable("USER")!!
 
-        user = intent.getParcelableExtra<User>("USER") as User
+        user = intent.getParcelableExtra<User>(getString(R.string.user)) as User
         setContentView(R.layout.activity_profile)
 
         token = user?.token
@@ -154,8 +154,8 @@ open class ProfileActivity: AppCompatActivity() {
             val phoneTextView = findViewById<TextView>(R.id.tv_phoneno)
 
             with(builder){
-                setTitle("Edit Phone Number")
-                setPositiveButton("Save"){ _, _ ->
+                setTitle(getString(R.string.edit_number))
+                setPositiveButton(getString(R.string.save)){ _, _ ->
 
                     phoneTextView.text = editText.text.toString() // populates the value of the
 
@@ -169,7 +169,7 @@ open class ProfileActivity: AppCompatActivity() {
                     editor.apply()
 
                 }
-                setNegativeButton("Cancel") { _, _ ->
+                setNegativeButton(getString(R.string.cancel_mute_channel_settings)) { _, _ ->
                     Timber.d("This button clicked successfully!!") //just for log purposes
                 }
                 setView(dialogLayout)
@@ -196,7 +196,7 @@ open class ProfileActivity: AppCompatActivity() {
             //set profile photo to image uri
             profilePhoto.setImageURI(uri)
             profilePhoto.invalidate()
-            Toast.makeText(this, "Update Successful", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.successful), Toast.LENGTH_SHORT).show()
             updateProfilePhoto(uri)
         }
     }
diff --git a/app/src/main/java/com/zurichat/app/ui/audio/AudiosActivity.java b/app/src/main/java/com/zurichat/app/ui/audio/AudiosActivity.java
index 84f44dbb..a1843eb0 100644
--- a/app/src/main/java/com/zurichat/app/ui/audio/AudiosActivity.java
+++ b/app/src/main/java/com/zurichat/app/ui/audio/AudiosActivity.java
@@ -67,15 +67,15 @@ private void sendAudio() {
             @java.lang.Override
             public void onResponse(Call call, Response response) {
                 if(response.isSuccessful()){
-                    Toast.makeText(AudiosActivity.this, "Sent Successfully", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(AudiosActivity.this, getString(R.string.sent_successfully), Toast.LENGTH_SHORT).show();
                 }else if (response.code() == 400){
-                    Toast.makeText(AudiosActivity.this, "Error 400, invalid", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(AudiosActivity.this, getString(R.string.invalid_error), Toast.LENGTH_SHORT).show();
 
                 }else if (response.code() == 404){
-                    Toast.makeText(AudiosActivity.this, "Error 404, Not found", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(AudiosActivity.this, getString(R.string.not_found_error), Toast.LENGTH_SHORT).show();
 
                 }else if (response.code() == 401){
-                    Toast.makeText(AudiosActivity.this, "Error 400, invalid", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(AudiosActivity.this, getString(R.string.invalid_error), Toast.LENGTH_SHORT).show();
 
                 }
             }
diff --git a/app/src/main/java/com/zurichat/app/ui/dm/DMFragment.kt b/app/src/main/java/com/zurichat/app/ui/dm/DMFragment.kt
index e813c877..9b16b2d2 100644
--- a/app/src/main/java/com/zurichat/app/ui/dm/DMFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/dm/DMFragment.kt
@@ -83,7 +83,7 @@ class DMFragment : Fragment(R.layout.fragment_dm) {
         senderId = roomList.room_user_ids.last()
 
         binding.iconBtn.setOnClickListener {
-            Toast.makeText(context, "Show Emoji", Toast.LENGTH_LONG).show()
+            Toast.makeText(context, getString(R.string.show_emoji), Toast.LENGTH_LONG).show()
         }
 
 //        arguments?.let { bundle ->
@@ -202,7 +202,7 @@ class DMFragment : Fragment(R.layout.fragment_dm) {
         when (imageResult) {
             is ImageResult.Success -> handleAttachmentUpload(listOf(imageResult.value))
             is ImageResult.Failure -> {
-                Toast.makeText(requireContext(), "Picture not taken", Toast.LENGTH_LONG).show()
+                Toast.makeText(requireContext(), getString(R.string.picture_not_taken), Toast.LENGTH_LONG).show()
             }
         }
     }
diff --git a/app/src/main/java/com/zurichat/app/ui/dm/dm_notification/DMWorkerUtils.kt b/app/src/main/java/com/zurichat/app/ui/dm/dm_notification/DMWorkerUtils.kt
index 33975507..d2715b8c 100644
--- a/app/src/main/java/com/zurichat/app/ui/dm/dm_notification/DMWorkerUtils.kt
+++ b/app/src/main/java/com/zurichat/app/ui/dm/dm_notification/DMWorkerUtils.kt
@@ -35,7 +35,7 @@ fun makeNotification(context: Context, message: String) {
     val notification = NotificationCompat.Builder(context, CHANNEL_ID)
                        .setContentText(message)
                        .setAutoCancel(true)
-                       .setContentTitle("New message")
+                       .setContentTitle(context.getString(R.string.new_message))
                        .setPriority(NotificationCompat.PRIORITY_HIGH)
                        .setSmallIcon(R.drawable.notifications_icon)
                        .setContentIntent(pendingIntent)
diff --git a/app/src/main/java/com/zurichat/app/ui/dm_chat/fragment/RoomFragment.kt b/app/src/main/java/com/zurichat/app/ui/dm_chat/fragment/RoomFragment.kt
index e50f20b6..676e6bfd 100644
--- a/app/src/main/java/com/zurichat/app/ui/dm_chat/fragment/RoomFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/dm_chat/fragment/RoomFragment.kt
@@ -3,8 +3,6 @@ package com.zurichat.app.ui.dm_chat.fragment
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.text.format.DateUtils
 import android.util.Log
 import android.view.LayoutInflater
@@ -29,16 +27,12 @@ import com.zurichat.app.models.User
 import com.zurichat.app.ui.add_channel.BaseItem
 import com.zurichat.app.ui.add_channel.BaseListAdapter
 import com.zurichat.app.ui.dm.MEDIA
-import com.zurichat.app.ui.dm_chat.apiservice.ApiDMService
 import com.zurichat.app.ui.dm_chat.model.request.SendMessageBody
 import com.zurichat.app.ui.dm_chat.model.response.message.BaseRoomData
 import com.zurichat.app.ui.dm_chat.model.response.message.Data
-import com.zurichat.app.ui.dm_chat.model.response.message.Result
 import com.zurichat.app.ui.dm_chat.model.response.message.SendMessageResponse
 import com.zurichat.app.ui.dm_chat.model.response.room.RoomsListResponseItem
-import com.zurichat.app.ui.dm_chat.repository.Repository
 import com.zurichat.app.ui.dm_chat.viewmodel.RoomViewModel
-import com.zurichat.app.ui.dm_chat.viewmodel.RoomViewModelFactory
 import com.zurichat.app.ui.fragments.channel_chat.ChannelHeaderItem
 import com.zurichat.app.ui.fragments.home_screen.CentrifugeClient
 import com.zurichat.app.util.isInternetAvailable
diff --git a/app/src/main/java/com/zurichat/app/ui/documents/DocumentActivity.java b/app/src/main/java/com/zurichat/app/ui/documents/DocumentActivity.java
index 976f5cef..3d44112b 100644
--- a/app/src/main/java/com/zurichat/app/ui/documents/DocumentActivity.java
+++ b/app/src/main/java/com/zurichat/app/ui/documents/DocumentActivity.java
@@ -80,15 +80,15 @@ private void sendDocument() {
             @java.lang.Override
             public void onResponse(Call call, Response response) {
                 if(response.isSuccessful()){
-                    Toast.makeText(DocumentActivity.this, "Sent Successfully", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(DocumentActivity.this, getString(R.string.successful), Toast.LENGTH_SHORT).show();
                 }else if (response.code() == 400){
-                    Toast.makeText(DocumentActivity.this, "Error 400, invalid", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(DocumentActivity.this, getString(R.string.invalid_error), Toast.LENGTH_SHORT).show();
 
                 }else if (response.code() == 404){
-                    Toast.makeText(DocumentActivity.this, "Error 404, Not found", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(DocumentActivity.this, getString(R.string.not_found_error), Toast.LENGTH_SHORT).show();
 
                 }else if (response.code() == 401){
-                    Toast.makeText(DocumentActivity.this, "Error 400, invalid", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(DocumentActivity.this, getString(R.string.invalid_error), Toast.LENGTH_SHORT).show();
 
                 }
             }
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/channel_chat/ChannelChatFragment.kt b/app/src/main/java/com/zurichat/app/ui/fragments/channel_chat/ChannelChatFragment.kt
index 6734abfb..015b5b91 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/channel_chat/ChannelChatFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/channel_chat/ChannelChatFragment.kt
@@ -237,7 +237,7 @@ class ChannelChatFragment : Fragment() {
                     //sendVoiceNote.visibility = View.VISIBLE
                     dimmerBox.visibility = View.GONE
                     toolbar.subtitle = channel.members.plus(1).toString().plus(" Members")
-                    Toast.makeText(requireContext(), "Joined Channel Successfully", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.join_channel_success), Toast.LENGTH_SHORT).show()
                     binding.channelJoinBar.visibility = View.GONE
                     channelJoined = true
                 } else {
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/home_screen/chats_and_channels/ChannelsFragment.kt b/app/src/main/java/com/zurichat/app/ui/fragments/home_screen/chats_and_channels/ChannelsFragment.kt
index 41549602..8ad650d5 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/home_screen/chats_and_channels/ChannelsFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/home_screen/chats_and_channels/ChannelsFragment.kt
@@ -336,8 +336,8 @@ class ChannelsFragment : Fragment(R.layout.fragment_channels) {
 
     private fun showSnackBar() {
         val view: View = CoordinatorLayout(requireContext())
-        val snack = Snackbar.make(view, "An Error Occurred!", Snackbar.LENGTH_INDEFINITE)
-        snack.setAction("Retry") {
+        val snack = Snackbar.make(view, getString(R.string.an_error_occured), Snackbar.LENGTH_INDEFINITE)
+        snack.setAction(getString(R.string.retry)) {
             viewModel.getChannelsList(organizationID)
         }
         snack.show()
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/AccountsFragment.kt b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/AccountsFragment.kt
index d7770bcd..236b374d 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/AccountsFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/AccountsFragment.kt
@@ -54,7 +54,7 @@ class AccountsFragment : Fragment() {
             if (!user.isNullOrEmpty())textView.visibility = View.GONE
             adapter.setData(user)
             if (user.isNotEmpty()){
-                toolbar.subtitle = user.size.toString()+ " Account(s)"
+                toolbar.subtitle = user.size.toString()+ getString(R.string.accts)
             }
         })
 
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ChangePassFragment.kt b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ChangePassFragment.kt
index 4a4ca505..e929af52 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ChangePassFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ChangePassFragment.kt
@@ -58,10 +58,10 @@ class ChangePassFragment: Fragment(R.layout.fragment_confirm_password) {
         val newPassFld = binding.textEditNewpass
         val confPassFld = binding.textEditConfirmpassWord
         if (newPassFld.text.toString()==confPassFld.text.toString()){
-            Toast.makeText(requireContext(), "Password match", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), getString(R.string.password_match), Toast.LENGTH_SHORT).show()
             updatePass(newPassFld.text.toString())
         }else if (newPassFld.text.toString()!=confPassFld.text.toString()){
-            binding.textEditNewpass.error = "Password doesn't match"
+            binding.textEditNewpass.error = getString(R.string.password_not_match)
             }
     }
 
@@ -83,19 +83,19 @@ class ChangePassFragment: Fragment(R.layout.fragment_confirm_password) {
 
         userViewModel.deleteUser(args.account)
         val action = ChangePassFragmentDirections.actionChangePassFragmentToLoginActivity()
-        Toast.makeText(requireContext(), "password change successful\n Fresh sign in required",
+        Toast.makeText(requireContext(), getString(R.string.fresh_sign_in),
             Toast.LENGTH_SHORT).show()
         findNavController().navigate(action)
         requireActivity().finish()
     }
 
     private fun updateError(throwable: Throwable){
-        Toast.makeText(requireContext(), "Please try again", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), getString(R.string.please_try_again), Toast.LENGTH_SHORT).show()
         Timber.e(throwable)
     }
 
     private fun handleLoading(){
-        Toast.makeText(requireContext(), "Please wait", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), getString(R.string.pls_wait), Toast.LENGTH_SHORT).show()
     }
 
     //update user state in database
@@ -119,16 +119,16 @@ class ChangePassFragment: Fragment(R.layout.fragment_confirm_password) {
             when (it) {
                 is Result.Success -> {
                     Toast.makeText(context,
-                        "You have been successfully logged out of previous account",
+                        getString(R.string.log_out_success),
                         Toast.LENGTH_SHORT).show()
                     updateUser()
                     logoutSuccess()
                 }
                 is Result.Error -> {
-                    Toast.makeText(context, "Error", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, getString(R.string.error), Toast.LENGTH_SHORT).show()
                 }
                 is Result.Loading -> {
-                    Toast.makeText(context, "Loading", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, getString(R.string.loading), Toast.LENGTH_SHORT).show()
                 }
             }
         })
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/EnterOtpACFragment.kt b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/EnterOtpACFragment.kt
index 6bd07129..8fb3eb2b 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/EnterOtpACFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/EnterOtpACFragment.kt
@@ -62,7 +62,7 @@ class EnterOtpACFragment:Fragment(R.layout.fragment_enter_otp) {
     }
 
     private fun resetSuccess(){
-        Toast.makeText(requireContext(), "correct code", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), getString(R.string.correct_code), Toast.LENGTH_SHORT).show()
         val otpCode = binding.pinView.text.toString()
         val action = EnterOtpACFragmentDirections
             .actionEnterOtpACFragmentToChangePassFragment(args.account,otpCode,args.curUser)
@@ -70,12 +70,12 @@ class EnterOtpACFragment:Fragment(R.layout.fragment_enter_otp) {
     }
 
     private fun resetError(throwable: Throwable){
-        Toast.makeText(requireContext(), "Wrong code try again", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), getString(R.string.wrong_code_retry), Toast.LENGTH_SHORT).show()
         Timber.e(throwable)
     }
 
     private fun handleLoading() {
-        Toast.makeText(context, "Please wait", Toast.LENGTH_LONG).show()
+        Toast.makeText(context, getString(R.string.pls_wait), Toast.LENGTH_LONG).show()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ForgetAccountPassword.kt b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ForgetAccountPassword.kt
index 048b4342..6f8d9b8e 100644
--- a/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ForgetAccountPassword.kt
+++ b/app/src/main/java/com/zurichat/app/ui/fragments/switch_account/ForgetAccountPassword.kt
@@ -40,10 +40,10 @@ class ForgetAccountPassword : Fragment(R.layout.fragment_forget_account_pass) {
                     success(message)
                 }
                 is Result.Error -> {
-                    Toast.makeText(requireContext(), "please try again", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.please_try_again), Toast.LENGTH_SHORT).show()
                 }
                 is Result.Loading ->{
-                    Toast.makeText(requireContext(), "please wait", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.pls_wait), Toast.LENGTH_SHORT).show()
                 }
             }
         })
@@ -51,12 +51,12 @@ class ForgetAccountPassword : Fragment(R.layout.fragment_forget_account_pass) {
 
     private fun dialogue (){
         MaterialAlertDialogBuilder(requireContext())
-            .setTitle("Confirmation ")
-            .setMessage("Are you sure you want to reset the password for this account?")
-            .setNegativeButton("No"){dialog,which->
+            .setTitle(getString(R.string.confirm))
+            .setMessage(getString(R.string.sure_reset_password))
+            .setNegativeButton(getString(R.string.no)){dialog,which->
 
             }
-            .setPositiveButton("Yes"){dialog,which->
+            .setPositiveButton(getString(R.string.yes)){dialog,which->
                 viewModel.passwordReset(PasswordResetBody(args.account.email))
             }
             .show()
diff --git a/app/src/main/java/com/zurichat/app/ui/login/LoginActivity.kt b/app/src/main/java/com/zurichat/app/ui/login/LoginActivity.kt
index 6dc13ee8..9bd1927b 100644
--- a/app/src/main/java/com/zurichat/app/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/login/LoginActivity.kt
@@ -56,7 +56,7 @@ class LoginActivity : AppCompatActivity() {
         val isConnected: Boolean = activeNetwork?.isConnectedOrConnecting == true
 
         if(!isConnected){
-            Toast.makeText(applicationContext,"No Internet Connection!",Toast.LENGTH_LONG).show()
+            Toast.makeText(applicationContext,getString(R.string.hello_blank_fragment),Toast.LENGTH_LONG).show()
             /*val ft = supportFragmentManager.beginTransaction()
             ft.replace(R.id.fragment_placeholder, InternetFragment())
             ft.commit()*/
diff --git a/app/src/main/java/com/zurichat/app/ui/login/LoginViewModel.kt b/app/src/main/java/com/zurichat/app/ui/login/LoginViewModel.kt
index 49d114a3..73e7bb92 100644
--- a/app/src/main/java/com/zurichat/app/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/zurichat/app/ui/login/LoginViewModel.kt
@@ -1,6 +1,9 @@
 package com.zurichat.app.ui.login
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.zurichat.app.data.repository.UserRepository
 import com.zurichat.app.models.*
 import com.zurichat.app.ui.login.password.confirm.ConfirmPasswordData
@@ -9,10 +12,10 @@ import com.zurichat.app.ui.login.password.resetuserpass.ResetUserPasswordRespons
 import com.zurichat.app.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
 
 @HiltViewModel
 class LoginViewModel @Inject constructor(private val repository: UserRepository) : ViewModel() {
diff --git a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/NewChannelDataFragment.kt b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/NewChannelDataFragment.kt
index 2a6bd842..3182c0e3 100644
--- a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/NewChannelDataFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/NewChannelDataFragment.kt
@@ -259,7 +259,7 @@ class NewChannelDataFragment : Fragment(R.layout.fragment_new_channel_data) {
         bundle.putBoolean("Channel Joined", true)
 
         if (binding.channelName.text!!.isEmpty()) {
-            binding.channelName.error = "Channel name can't be empty."
+            binding.channelName.error = getString(R.string.channel_name_not_empty)
         } else {
             try {
                 findNavController().navigate(R.id.channelChatFragment,
diff --git a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectMemberFragment.kt b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectMemberFragment.kt
index 5c350883..754a374b 100644
--- a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectMemberFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectMemberFragment.kt
@@ -103,13 +103,14 @@ class SelectMemberFragment : Fragment(R.layout.fragment_select_member) {
             if (it.isEmpty()) {
                 binding.topRecyclerView.visibility = View.GONE
                 binding.fabAddChannel.visibility = View.GONE
-                binding.toolbar.subtitle = "Choose Channel Members"
+                binding.toolbar.subtitle = getString(R.string.choose_channel_members)
             } else {
                 binding.topRecyclerView.visibility = View.VISIBLE
                 binding.fabAddChannel.visibility = View.VISIBLE
                 selectedMemberAdapter.selectedUserList = it
                 selectedMemberAdapter.notifyDataSetChanged()
-                binding.toolbar.subtitle = "${selectedUsers.size} out of ${userList.size} selected"
+                binding.toolbar.subtitle = "${selectedUsers.size}" + getString(R.string.out_of) + "${userList.size}" + getString(
+                                    R.string.selected)
                 binding.topRecyclerView.smoothScrollToPosition(selectedUsers.size - 1)
 
             }
diff --git a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectNewChannelFragment.kt b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectNewChannelFragment.kt
index 8549dbae..3628bfc1 100644
--- a/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectNewChannelFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/newchannel/fragment/SelectNewChannelFragment.kt
@@ -66,7 +66,7 @@ class SelectNewChannelFragment : Fragment(R.layout.fragment_select_new_channel)
 
                     progressDialog.dismiss()
                 }catch (e:Exception){
-                    Toast.makeText(requireContext(), "an error occurred please try again later", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.err_occured_try_again), Toast.LENGTH_SHORT).show()
                     progressDialog.dismiss()
                 }
 
@@ -213,7 +213,7 @@ class SelectNewChannelFragment : Fragment(R.layout.fragment_select_new_channel)
             viewModel._endPointResult.collect {
                 endPointLoadingState = it
                 if ( it is SelectNewChannelViewState.Error) {
-                    Toast.makeText(requireContext(),"Error in Loading data from server", Toast.LENGTH_LONG).show()
+                    Toast.makeText(requireContext(),getString(R.string.err_loading_data), Toast.LENGTH_LONG).show()
                 }
             }
         }
diff --git a/app/src/main/java/com/zurichat/app/ui/newchannel/newchannel_notification/NewChannelWorkerUtils.kt b/app/src/main/java/com/zurichat/app/ui/newchannel/newchannel_notification/NewChannelWorkerUtils.kt
index 0725638f..10bf7f36 100644
--- a/app/src/main/java/com/zurichat/app/ui/newchannel/newchannel_notification/NewChannelWorkerUtils.kt
+++ b/app/src/main/java/com/zurichat/app/ui/newchannel/newchannel_notification/NewChannelWorkerUtils.kt
@@ -35,7 +35,7 @@ fun makeNotification(context: Context, message: String) {
     val notification = NotificationCompat.Builder(context, CHANNEL_ID)
         .setContentText(message)
         .setAutoCancel(true)
-        .setContentTitle("New channel")
+        .setContentTitle(context.getString(R.string.new_channel))
         .setPriority(NotificationCompat.PRIORITY_HIGH)
         .setSmallIcon(R.drawable.notifications_icon)
         .setContentIntent(pendingIntent)
diff --git a/app/src/main/java/com/zurichat/app/ui/organizations/AddByEmailFragment.kt b/app/src/main/java/com/zurichat/app/ui/organizations/AddByEmailFragment.kt
index 00dfcbba..b9b0464c 100644
--- a/app/src/main/java/com/zurichat/app/ui/organizations/AddByEmailFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/organizations/AddByEmailFragment.kt
@@ -48,7 +48,7 @@ class AddByEmailFragment : Fragment(R.layout.fragment_add_by_email) {
 
         val toolbar = binding.toolbarContainer.toolbar
         progressDialog = ProgressDialog(context)
-        toolbar.title = "Invite By Email"
+        toolbar.title = getString(R.string.invite_by_email)
         toolbar.subtitle = organizationName
         binding.toolbarContainer.toolbar.setLogo(drawable.ic_back)
         val logoView = toolbar.getChildAt(1)
@@ -84,7 +84,7 @@ class AddByEmailFragment : Fragment(R.layout.fragment_add_by_email) {
                 list.add(recipientEmail.email)
             }
             if (list.size == 0){
-                binding.recipientEmailEdit.setError("You must at least add one email")
+                binding.recipientEmailEdit.setError(getString(R.string.add_one_email))
             }else{
                 val sendInviteBody = SentInviteBody(list)
                 val call = apiService.sendInvite(organizationId, sendInviteBody)
@@ -96,7 +96,7 @@ class AddByEmailFragment : Fragment(R.layout.fragment_add_by_email) {
                         response: Response<SendInviteResponse?>
                     ) {
                         if (response.code() == 200) {
-                            Toast.makeText(context, "Invitation sent successfully", Toast.LENGTH_SHORT)
+                            Toast.makeText(context, getString(R.string.invite_sent_succesfully), Toast.LENGTH_SHORT)
                                 .show()
                             val bundle = bundleOf(
                                 "organizationId" to organizationId,
diff --git a/app/src/main/java/com/zurichat/app/ui/organizations/NextFragment.kt b/app/src/main/java/com/zurichat/app/ui/organizations/NextFragment.kt
index 5ac498e8..6087ac4e 100644
--- a/app/src/main/java/com/zurichat/app/ui/organizations/NextFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/organizations/NextFragment.kt
@@ -37,8 +37,8 @@ class NextFragment : Fragment(R.layout.fragment_add_to_organization) {
         if(prevDestLabel.equals("fragment_add_by_email")){
 
         }else{
-            generateMaterialDialog(requireActivity(),"Successful","You have successfully created" +
-                    " $organizationName","Dismiss",null)
+            generateMaterialDialog(requireActivity(),getString(R.string.successful),getString(R.string.successfully_created) +
+                    " $organizationName",getString(R.string.dismiss),null)
         }
 
 
diff --git a/app/src/main/java/com/zurichat/app/ui/organizations/ShareLinkFragment.kt b/app/src/main/java/com/zurichat/app/ui/organizations/ShareLinkFragment.kt
index 44362851..381cfa0d 100644
--- a/app/src/main/java/com/zurichat/app/ui/organizations/ShareLinkFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/organizations/ShareLinkFragment.kt
@@ -59,7 +59,7 @@ class ShareLinkFragment : Fragment() {
             val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText("TextView", binding.linkGenerated.text.toString())
             clipboard.setPrimaryClip(clip)
-            Toast.makeText(context, "link copied", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, getString(R.string.link_copied), Toast.LENGTH_SHORT).show()
         }
         // Set function to each item on the toolbar when they are been clicked
         binding.toolbarAddToSL.setNavigationOnClickListener { requireActivity().onBackPressed() }
diff --git a/app/src/main/java/com/zurichat/app/ui/organizations/ui/SwitchOrganizationFragment.kt b/app/src/main/java/com/zurichat/app/ui/organizations/ui/SwitchOrganizationFragment.kt
index 1275b535..33146df3 100644
--- a/app/src/main/java/com/zurichat/app/ui/organizations/ui/SwitchOrganizationFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/organizations/ui/SwitchOrganizationFragment.kt
@@ -104,7 +104,7 @@ class SwitchOrganizationsFragment : Fragment(R.layout.fragment_switch_organizati
                         if (it.orgData.isNotEmpty()) {
                             firstTime = false
                             setUpViews(it.orgData)
-                            binding.toolbar4.subtitle = "${it.orgData.size} Organization(s)"
+                            binding.toolbar4.subtitle = "${it.orgData.size} " + getString(R.string.orgz)
                         } else {
                             firstTime = true
                         }
@@ -184,7 +184,7 @@ class SwitchOrganizationsFragment : Fragment(R.layout.fragment_switch_organizati
                             // progressLoader.hide()
                             if (firstTime) {
                                 progressLoader.hide()
-                                val errorMessage = "An Error Occurred"
+                                val errorMessage = getString(R.string.an_error_occured)
                                 snackBar(errorMessage)
                             }
                         }
@@ -211,7 +211,7 @@ class SwitchOrganizationsFragment : Fragment(R.layout.fragment_switch_organizati
                 adapter = userOrgAdapter
             }
         } catch (e: NullPointerException) {
-            Toast.makeText(context, "User has no organization", Toast.LENGTH_LONG).show()
+            Toast.makeText(context, getString(R.string.user_no_org), Toast.LENGTH_LONG).show()
         }
 
     }
@@ -256,7 +256,7 @@ class SwitchOrganizationsFragment : Fragment(R.layout.fragment_switch_organizati
                     requireActivity().finish()
                 }
                 is Result.Error -> {
-                    Toast.makeText(context, "Error", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, getString(R.string.error), Toast.LENGTH_SHORT).show()
                     progressLoader.hide()
                 }
                 is Result.Loading -> {
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/ChatBackupActivity.kt b/app/src/main/java/com/zurichat/app/ui/settings/ChatBackupActivity.kt
index 1fc16559..534f2e89 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/ChatBackupActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/ChatBackupActivity.kt
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.View
+import com.zurichat.app.R
 import com.zurichat.app.databinding.ActivityChatBackupBinding
 import com.zurichat.app.ui.settings.dialogs.BackUpGoogleDialogFragment
 import com.zurichat.app.ui.settings.dialogs.BackUpOverDialogFragment
@@ -40,12 +41,12 @@ class ChatBackupActivity : AppCompatActivity() {
 
         binding.btnBackupOver.setOnClickListener {
             val backupOverDialog = BackUpOverDialogFragment(this)
-            backupOverDialog.show(supportFragmentManager, "Back up Dialog")
+            backupOverDialog.show(supportFragmentManager, getString(R.string.backup_dialog))
         }
 
         binding.btnBackupGoogle.setOnClickListener {
             val backupGoogleDialog = BackUpGoogleDialogFragment(this)
-            backupGoogleDialog.show(supportFragmentManager, "Back up Google")
+            backupGoogleDialog.show(supportFragmentManager, getString(R.string.backup_google))
         }
 
 
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/LargerItemsActivity.kt b/app/src/main/java/com/zurichat/app/ui/settings/LargerItemsActivity.kt
index 1244fd33..bf403cc6 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/LargerItemsActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/LargerItemsActivity.kt
@@ -32,11 +32,11 @@ class LargerItemsActivity : AppCompatActivity() {
         return when (item.itemId) {
 
             R.id.action_save -> {
-                Toast.makeText(applicationContext, "click to save", Toast.LENGTH_SHORT).show()
+                Toast.makeText(applicationContext, getString(R.string.click_save), Toast.LENGTH_SHORT).show()
                 true
             }
             R.id.action_delete -> {
-                Toast.makeText(applicationContext, "click to delete", Toast.LENGTH_SHORT).show()
+                Toast.makeText(applicationContext, getString(R.string.click_delete), Toast.LENGTH_SHORT).show()
                 true
             }
             else ->
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/SettingsActivity.kt b/app/src/main/java/com/zurichat/app/ui/settings/SettingsActivity.kt
index fec4b1fd..094abf8d 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/SettingsActivity.kt
@@ -71,7 +71,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
         }
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        user = intent.extras?.getParcelable("USER")!!
+        user = intent.extras?.getParcelable(getString(R.string.user))!!
         if (!(user.first_name.isEmpty() && user.last_name.isEmpty())){
             nameTxt.text = user.first_name.plus(" "+user.last_name)
         }else if (user.first_name.isNotEmpty()){
@@ -140,15 +140,15 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.settings_preferences, rootKey)
 
-            user = requireActivity().intent.extras?.getParcelable("USER")!!
+            user = requireActivity().intent.extras?.getParcelable(getString(R.string.user))!!
 
 
-            val chatSettings = findPreference<Preference>("chat_header")
-            val securitySettings = findPreference<Preference>("security_header")
-            val storageSettings = findPreference<Preference>("storage_header")
-            val notificationSettings = findPreference<Preference>("notification_header")
+            val chatSettings = findPreference<Preference>(getString(R.string.chat_header))
+            val securitySettings = findPreference<Preference>(getString(R.string.security_header))
+            val storageSettings = findPreference<Preference>(getString(R.string.storage_header))
+            val notificationSettings = findPreference<Preference>(getString(R.string.notification_header))
             val languageSettings = findPreference<Preference>(getString(R.string.languages))
-            val logout = findPreference<Preference>("logout_header")
+            val logout = findPreference<Preference>(getString(R.string.logout_header))
             val profileContainer = activity?.findViewById<ConstraintLayout>(R.id.profile_container)
 
 
@@ -164,7 +164,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
             //make profile container clickable
             profileContainer?.setOnClickListener {
                 val bundle = Bundle()
-                bundle.putParcelable("USER",user)
+                bundle.putParcelable(getString(R.string.user),user)
                 val intent = Intent(requireContext(), ProfileActivity::class.java)
                 intent.putExtras(bundle)
                 startActivity(intent)
@@ -249,7 +249,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
                 //logout()
                 val callback: Callback = { logoutUser() }
                 val logoutDialog = LogOutDialogFragment(callback)
-                logoutDialog.show(childFragmentManager, "LOG_OUT")
+                logoutDialog.show(childFragmentManager, getString(R.string.logged_out))
                 true
             }
         }
@@ -258,7 +258,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
             userViewModel.logoutResponse.observe(viewLifecycleOwner, {
                 when (it) {
                     is Result.Success -> {
-                        ZuriSharePreference(requireContext()).setString("Current Organization ID","")
+                        ZuriSharePreference(requireContext()).setString(getString(R.string.current_org_id),"")
                         //Toast.makeText(context, "You have been successfully logged out", Toast.LENGTH_SHORT).show()
                         progressLoader.hide()
                         updateUser()
@@ -266,7 +266,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
                         startActivity(intent)
                     }
                     is Result.Error -> {
-                        Toast.makeText(requireContext(), "Error", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(requireContext(), getString(R.string.error), Toast.LENGTH_SHORT).show()
                         progressLoader.hide()
                     }
                     is Result.Loading -> {
@@ -329,39 +329,39 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 
             setPreferencesFromResource(R.xml.notifications_and_sound, rootKey)
-            val channelTones = findPreference<SwitchPreference>("channel_tones")
-            val messageTone = findPreference<SwitchPreference>("message_tone")
-            val vibrate = findPreference<SwitchPreference>("vibrate")
-            val highPriority = findPreference<SwitchPreference>("high_priority")
+            val channelTones = findPreference<SwitchPreference>(getString(R.string.channel_tones))
+            val messageTone = findPreference<SwitchPreference>(getString(R.string.message_tone))
+            val vibrate = findPreference<SwitchPreference>(getString(R.string.vibrate))
+            val highPriority = findPreference<SwitchPreference>(getString(R.string.high_priority))
 
 
             channelTones?.setOnPreferenceChangeListener { preference, newValue ->
                 if (channelTones.isChecked){
                     isChannelToneChecked = true
-                    Toast.makeText(activity, "Channel tones off", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.Channel_tones_off), Toast.LENGTH_SHORT).show()
                 }else{
                     isChannelToneChecked = false
-                    Toast.makeText(activity, "Channel tones on", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.channel_tones_on), Toast.LENGTH_SHORT).show()
                 }
                 return@setOnPreferenceChangeListener true
             }
             messageTone?.setOnPreferenceChangeListener { preference, newValue ->
                 if (messageTone.isChecked){
                     isMessageToneChecked = true
-                    Toast.makeText(activity, "Message tones off", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.message_tones_off), Toast.LENGTH_SHORT).show()
                 }else{
                     isMessageToneChecked = false
-                    Toast.makeText(activity, "Message tones on", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.message_tones_on), Toast.LENGTH_SHORT).show()
                 }
                 return@setOnPreferenceChangeListener true
             }
             vibrate?.setOnPreferenceChangeListener { preference, newValue ->
                 if (vibrate.isChecked){
                     isVibrateChecked = true
-                    Toast.makeText(activity, "Vibrate off", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.vibrate_off), Toast.LENGTH_SHORT).show()
                 }else{
                     isVibrateChecked = false
-                    Toast.makeText(activity, "Vibrate on", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.vibrate_on), Toast.LENGTH_SHORT).show()
                     vibrateDevice(requireContext())
                 }
                 return@setOnPreferenceChangeListener true
@@ -369,10 +369,10 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
             highPriority?.setOnPreferenceChangeListener { preference, newValue ->
                 if (highPriority.isChecked){
                     isHighPriorityChecked = true
-                    Toast.makeText(activity, "High priority Notifications off", Toast.LENGTH_LONG).show()
+                    Toast.makeText(activity, getString(R.string.high_priority_notification), Toast.LENGTH_LONG).show()
                 }else{
                     isHighPriorityChecked = false
-                    Toast.makeText(activity, "High priority Notifications on", Toast.LENGTH_LONG).show()
+                    Toast.makeText(activity, getString(R.string.high_priority_notifications_on), Toast.LENGTH_LONG).show()
                 }
                 return@setOnPreferenceChangeListener true
             }
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/WallpaperActivity.kt b/app/src/main/java/com/zurichat/app/ui/settings/WallpaperActivity.kt
index c842f11e..2164ed8d 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/WallpaperActivity.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/WallpaperActivity.kt
@@ -73,14 +73,14 @@ class WallpaperActivity : AppCompatActivity(),
 //                startActivity(Intent(activity, ManageWallpaperActivity::class.java))
 //            }
 
-            val change = findPreference<Preference>("change_wallpaper")
+            val change = findPreference<Preference>(getString(R.string.change_wallpaper))
             change?.setOnPreferenceClickListener {
                 startActivity(Intent(activity,ChooseWallpaperCategory::class.java))
                 true
             }
 
             //background dimming code
-            val barPref = findPreference<SeekBarPreference>("bar")
+            val barPref = findPreference<SeekBarPreference>(getString(R.string.bar))
             barPref?.updatesContinuously = true
 
             PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
@@ -89,7 +89,7 @@ class WallpaperActivity : AppCompatActivity(),
 
         override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
             val dimmer:View? = view?.findViewById<View>(R.id.dimmer_view)
-            if (key == "bar"){
+            if (key == getString(R.string.bar)){
                 val barIncr = sharedPreferences?.getInt("bar",50)?.toFloat()
                 val flt = barIncr?.div(100.0f)
                 if (flt != null) {
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpGoogleDialogFragment.kt b/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpGoogleDialogFragment.kt
index 0775c136..a4fa064b 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpGoogleDialogFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpGoogleDialogFragment.kt
@@ -14,7 +14,7 @@ class BackUpGoogleDialogFragment(val activity: Activity?) : DialogFragment() {
 
         return activity?.let {
             val builder = AlertDialog.Builder(it)
-            builder.setTitle("Back up to Google Drive")
+            builder.setTitle(getString(R.string.backup_google_drive))
                 .setMultiChoiceItems(
                     R.array.back_up_google,
                     null,
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpOverDialogFragment.kt b/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpOverDialogFragment.kt
index 3f6caa60..7b23878a 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpOverDialogFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/dialogs/BackUpOverDialogFragment.kt
@@ -14,7 +14,7 @@ class BackUpOverDialogFragment(val activity: Activity?) : DialogFragment() {
 
         return activity?.let {
             val builder = AlertDialog.Builder(it)
-            builder.setTitle("Back up Over")
+            builder.setTitle(getString(R.string.back_up_over))
                 .setSingleChoiceItems(
                     R.array.back_up_over,
                     0,
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChatFragment.kt b/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChatFragment.kt
index a02b3415..a7e1be60 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChatFragment.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChatFragment.kt
@@ -45,7 +45,7 @@ class ChatFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.chat_preferences, rootKey)
 
-        findPreference<Preference>("chat_backup")?.setOnPreferenceClickListener {
+        findPreference<Preference>(getString(R.string.chat_backup))?.setOnPreferenceClickListener {
             val intent = Intent(requireActivity(), ChatBackupActivity::class.java)
             startActivity(intent)
 
diff --git a/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChooseWallpaperCategory.kt b/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChooseWallpaperCategory.kt
index 35c0cfb4..a8822057 100644
--- a/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChooseWallpaperCategory.kt
+++ b/app/src/main/java/com/zurichat/app/ui/settings/fragments/ChooseWallpaperCategory.kt
@@ -9,7 +9,7 @@ class ChooseWallpaperCategory: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_choose_wallpaper_category)
-        title = "Choose Wallpaper Category"
+        title = getString(R.string.choose_category)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
diff --git a/app/src/main/java/com/zurichat/app/util/FragmentViewBindingDelegate.kt b/app/src/main/java/com/zurichat/app/util/FragmentViewBindingDelegate.kt
index 703cd815..1d621f79 100644
--- a/app/src/main/java/com/zurichat/app/util/FragmentViewBindingDelegate.kt
+++ b/app/src/main/java/com/zurichat/app/util/FragmentViewBindingDelegate.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
 import androidx.viewbinding.ViewBinding
+import com.zurichat.app.R
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
@@ -53,7 +54,7 @@ class FragmentViewBindingDelegate<T : ViewBinding>(
 
         val lifecycle = fragment.viewLifecycleOwner.lifecycle
         if (!lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)) {
-            throw IllegalStateException("Should not attempt to get bindings when Fragment views are destroyed.")
+            throw IllegalStateException(fragment.getString(R.string.fragment_view_destroyed))
         }
 
         return viewBindingFactory(thisRef.requireView()).also { this.binding = it }
diff --git a/app/src/main/res/menu/home_menu.xml b/app/src/main/res/menu/home_menu.xml
index 677b3057..6e9283fc 100644
--- a/app/src/main/res/menu/home_menu.xml
+++ b/app/src/main/res/menu/home_menu.xml
@@ -19,7 +19,7 @@
         android:visible="true" />-->
     <item
         android:id="@+id/switch_workspace"
-        android:title="Switch Organisation"
+        android:title="@string/switch_organisation"
         android:visible="true" />
    <!-- <item
         android:id="@+id/create_organisation"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 50fc34f0..0064246d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -258,4 +258,74 @@
 	<string name = "por"> البرتغالية </string>
     <string name="add_workspace">أضف مساحة العمل</string>
     <string name="create_workspace">قم بإنشاء مساحة عمل جديدة</string>
+	<string name = "current_org_id"> معرف المؤسسة الحالي </string>
+	<string name = "error"> خطأ </string>
+	<string name = "vibrate"> يهتز </string>
+	<string name = "high_priority"> أولوية عالية </string>
+	<string name = "Channel_tones_off"> نغمات القناة متوقفة </string>
+	<string name = "channel_tones_on"> نغمات القناة </string>
+	<string name = "message_tones_off"> إيقاف نغمات الرسائل </string>
+	<string name = "message_tones_on"> تشغيل نغمات الرسائل </string>
+	<string name = "vibrate_off"> إيقاف الاهتزاز </string>
+	<string name = "vibrate_on"> الاهتزاز عند </string>
+	<string name = "high_priority_notification"> إيقاف الإشعارات ذات الأولوية العالية </string>
+	<string name = "high_priority_notifications_on"> الإشعارات ذات الأولوية القصوى على </string>
+	<string name = "fragment_view_destroyed"> يجب عدم محاولة الحصول على ارتباطات عند إتلاف عروض التجزئة. </string>
+	<string name = "name"> name </string>
+	<string name = "about"> about </string>
+	<string name = "permission_granted"> تم منح الإذن! </string>
+	<string name = "permission_denied"> تم رفض الإذن! </string>
+	<string name = "recording"> تسجيل </string>
+	<string name = "unable_to_start_camera"> غير قادر على بدء الكاميرا! </string>
+	<string name = "edit_number"> تحرير رقم الهاتف </string>
+	<string name = "save"> حفظ </string>
+	<string name = "successful"> تم التحديث بنجاح </string>
+	<string name = "sent_successfully"> تم الإرسال بنجاح </string>
+	<string name = "invalid_error"> خطأ 400 ، غير صالح </string>
+	<string name = "not_found_error"> خطأ 404 ، غير موجود </string>
+	<string name = "new_message"> رسالة جديدة </string>
+	<string name = "show_emoji"> إظهار الرموز التعبيرية </string>
+	<string name = "picture_not_taken"> لم يتم التقاط الصورة </string>
+	<string name = "join_channel_success"> تم الانضمام إلى القناة بنجاح </string>
+	<string name = "retry"> إعادة المحاولة </string>
+	<string name = "accts"> \ "الحساب (الحسابات) \" </string>
+	<string name = "password_match"> تطابق كلمة المرور </string>
+	<string name = "password_not_match"> كلمة المرور غير متطابقة </string>
+	<string name = "fresh_sign_in"> \ "تم تغيير كلمة المرور بنجاح \ n مطلوب تسجيل دخول حديث \" </string>
+	<string name = "please_try_again"> الرجاء إعادة المحاولة </string>
+	<string name = "pls_wait"> الرجاء الانتظار </string>
+	<string name = "log_out_success"> تم تسجيل خروجك بنجاح من الحساب السابق </string>
+	<string name = "loading"> تحميل </string>
+	<string name = "wrong_code_retry"> رمز خاطئ حاول مرة أخرى </string>
+	<string name = "correct_code"> الرمز الحالي </string>
+	<string name = "sure_reset_password"> هل أنت متأكد أنك تريد إعادة تعيين كلمة المرور لهذا الحساب؟ </string>
+	<string name = "confirm"> تأكيد </string>
+	<string name = "err_occured_try_again"> \ "حدث خطأ يرجى المحاولة مرة أخرى \" </string>
+	<string name = "err_msg"> رسالة خطأ </string>
+	<string name = "channel_name_not_empty"> لا يمكن أن يكون اسم القناة فارغًا. </string>
+	<string name = "out_of"> خارج </string>
+	<string name = "selected"> المحدد </string>
+	<string name = "err_loading_data"> خطأ في تحميل البيانات من الخادم </string>
+	<string name = "user_no_org"> المستخدم ليس لديه مؤسسة </string>
+	<string name = "orgz"> المؤسسة (المنظمات) </string>
+	<string name = "invite_by_email"> دعوة بالبريد الإلكتروني </string>
+	<string name = "add_one_email"> يجب إضافة بريد إلكتروني واحد على الأقل </string>
+	<string name = "invite_sent_succesfully"> تم إرسال الدعوة بنجاح </string>
+	<string name = "dismiss"> رفض </string>
+	<string name = "successfully_created"> لقد نجحت في إنشاء </string>
+	<string name = "link_copied"> تم نسخ الرابط </string>
+	<string name = "backup_google_drive"> نسخ احتياطي إلى Google Drive </string>
+	<string name = "back_up_over"> النسخ الاحتياطي عبر </string>
+	<string name = "choose_category"> اختر فئة ورق الحائط </string>
+	<string name = "bar"> bar </string>
+	<string name = "click_save"> انقر للحفظ </string>
+	<string name = "click_delete"> انقر للحذف </string>
+	<string name = "backup_dialog"> مربع حوار النسخ الاحتياطي </string>
+	<string name = "backup_google"> نسخ Google احتياطيًا </string>
+	<string name = "privacy"> الخصوصية </string>
+	<string name = "storage_n_data"> التخزين والبيانات </string>
+	<string name = "chat_setting"> إعدادات الدردشة </string>
+	<string name = "notice_n_sounds"> الإخطار والأصوات </string>
+	<string name = "logout_"> تسجيل الخروج </string>
+	<string name="switch_organisation">منظمة التبديل</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9fdfa05e..f1633403 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,263 +1,335 @@
 <resources>
-<string name="create_workspace">Neuen Arbeitsbereich erstellen</string>
-<string name="add_workspace">Arbeitsbereich hinzufügen</string>
-<string name="por">Portugiesisch</string>
-<string name="iw">hebräisch</string>
-<string name="it">Italiano</string>
-<string name="sp">Spanisch</string>
-<string name="den">Deutsch</string>
-<string name="ar">Arabisch</string>
-<string name="zh">Chinesisch</string>
-<string name="fr">Französisch</string>
-<string name="english_us">Amerikanisches Englisch</string>
-<string name="english_uk">Englisch UK</string>
-<string name="select_language">Wählen Sie eine Sprachübersetzung aus</string>
-<string name="title">Titel</string>
-<string name="languages">Sprachen</string>
-<string name="continue_txt">Weitermachen</string>
-<string name="forgot_password_txt">Passwort vergessen?</string>
-<string name="create_new_organization">Neue Organisation erstellen</string>
-<string name="didn_t_receive_any_code">Haben Sie keinen Code erhalten?</string>
-<string name="notification_channel_description">Dies ist ein Beispiel für einen Benachrichtigungskanal zu Demonstrationszwecken.</string>
-<string name="notification">Neue Benachrichtigung</string>
-<string name="generated_link">Generierter Link</string>
-<string name="create_link">Link erstellen</string>
-<string name="channel_invite">Kanaleinladung</string>
-<string name="invite_link">Link generieren</string>
-<string name="empty_starrred_message_info">Tippen und halten Sie eine Nachricht 
+    <string name="create_workspace">Neuen Arbeitsbereich erstellen</string>
+    <string name="add_workspace">Arbeitsbereich hinzufügen</string>
+    <string name="por">Portugiesisch</string>
+    <string name="iw">hebräisch</string>
+    <string name="it">Italiano</string>
+    <string name="sp">Spanisch</string>
+    <string name="den">Deutsch</string>
+    <string name="ar">Arabisch</string>
+    <string name="zh">Chinesisch</string>
+    <string name="fr">Französisch</string>
+    <string name="english_us">Amerikanisches Englisch</string>
+    <string name="english_uk">Englisch UK</string>
+    <string name="select_language">Wählen Sie eine Sprachübersetzung aus</string>
+    <string name="title">Titel</string>
+    <string name="languages">Sprachen</string>
+    <string name="continue_txt">Weitermachen</string>
+    <string name="forgot_password_txt">Passwort vergessen?</string>
+    <string name="create_new_organization">Neue Organisation erstellen</string>
+    <string name="didn_t_receive_any_code">Haben Sie keinen Code erhalten?</string>
+    <string name="notification_channel_description">Dies ist ein Beispiel für einen Benachrichtigungskanal zu Demonstrationszwecken.</string>
+    <string name="notification">Neue Benachrichtigung</string>
+    <string name="generated_link">Generierter Link</string>
+    <string name="create_link">Link erstellen</string>
+    <string name="channel_invite">Kanaleinladung</string>
+    <string name="invite_link">Link generieren</string>
+    <string name="empty_starrred_message_info">Tippen und halten Sie eine Nachricht
 in einem Chat, um sie zu markieren, 
 damit Sie sie 
 später leicht wiederfinden</string>
-<string name="starred_messages">Markierte Nachrichten</string>
-<string name="retrieving_user_org">Abrufen der Benutzerorganisation....</string>
-<string name="successful_get_user_org">Nutzerorganisationen erfolgreich abgerufen</string>
-<string name="invite_user">Benutzer einladen</string>
-<string name="sign_in">Einloggen</string>
-<string name="switch_workspace">Arbeitsbereich wechseln</string>
-<string name="signout">Ausloggen</string>
-<string name="add_by_email">Per E-Mail hinzufügen</string>
-<string name="add_from_contacts">Aus Kontakten hinzufügen</string>
-<string name="share_a_link">Einen Link teilen</string>
-<string name="to_add_team">Um Teamkollegen hinzuzufügen, können Sie entweder einen Link senden oder von Ihren Kontakten einladen.</string>
-<string name="who_else_is">Wer arbeitet noch an diesem Projekt?</string>
-<string name="ok_mute_channel">OK</string>
-<string name="cancel_mute_channel_settings">Abbrechen</string>
-<string name="show_notifi">Zeige Benachrichtigungen</string>
-<string name="mute_for_always">Immer</string>
-<string name="mute_for_1_week">1 Woche</string>
-<string name="mute_for_8_hours">8 Stunden</string>
-<string name="mute_channel_notifications_for">Benachrichtigungen stummschalten für…</string>
-<string name="joined">Trat bei</string>
-<string name="you_are_already_a_member_of_this_channel">Du bist bereits Mitglied dieses Kanals</string>
-<string name="image8">WhatsApp-Videos</string>
-<string name="image7">WhatsApp-Bilder</string>
-<string name="image6">Xender-Bilder</string>
-<string name="image5">Xender-Bilder</string>
-<string name="image4">Bilder der Entwickler-App</string>
-<string name="image3">Kamera</string>
-<string name="image2">Alle Videos</string>
-<string name="image1">Alle Bilder</string>
-<string name="an_error_occured">Ein Fehler ist aufgetreten</string>
-<string name="gif">GIF</string>
-<string name="creating_new_channel">neuen Kanal erstellen.......</string>
-<string name="successful_new_channel_creation">Erfolgreich neuen Kanal erstellen</string>
-<string name="user_not_found">Benutzer wurde nicht gefunden</string>
-<string name="invalid_information">Kanal mit bereits vorhanden.</string>
-<string name="unable_to_create_new_channel">Kann keinen neuen Kanal erstellen</string>
-<string name="leave_channel_warning_leave_option">VERLASSEN</string>
-<string name="leave_channel_warning_cancel_option">Abbrechen</string>
-<string name="leave_channel_warning_message">Möchten Sie diesen Kanal wirklich verlassen? Du erhältst keine Nachrichten mehr von diesem Kanal, wenn du ihn verlässt</string>
-<string name="select_contact_">Wählen Sie Kontakt</string>
-<string name="choose_channel_members">Kanalmitglieder auswählen</string>
-<string name="select_members_">Mitglieder auswählen</string>
-<string name="make_my_channel_private">Mach meinen Kanal privat</string>
-<string name="make_my_channel_public">Mach meinen Kanal öffentlich</string>
-<string name="set_your_channel_privacy_here">Lege hier die Privatsphäre deines Kanals fest</string>
-<string name="enter_channel_name">Kanalnamen eingeben</string>
-<string name="provide_basic_information">Geben Sie grundlegende Informationen an</string>
-<string name="_add_channel">Kanal hinzufügen</string>
-<string name="leave_channel">Kanal verlassen</string>
-<string name="mute_channel">Kanal stummschalten</string>
-<string name="join_channel">Kanal beitreten</string>
-<string name="you_are_viewing">Sie sehen sich an</string>
-<string name="button_to_join_channel">Schaltfläche, um einem Kanal beizutreten</string>
-<string name="click_button_to_join_a_channel">Klicken Sie auf die Schaltfläche, um einem Kanal beizutreten</string>
-<string name="contacts_who_can_t_add_you">Kontakte, die dich nicht zu einem Kanal hinzufügen können, haben stattdessen die Möglichkeit, dich privat einzuladen.</string>
-<string name="you_aren_t_sharing_live_location">Du teilst keinen Live-Standort in Chats</string>
-<string name="thirty_minutes">Nach 30 Minuten</string>
-<string name="one_minute">Nach 1 Minute</string>
-<string name="immediately">Sofort</string>
-<string name="live_location_manage__device_settings">Live-Standort erfordert Hintergrundstandort. Sie können dies in Ihren Geräteeinstellungen verwalten.</string>
-<string name="nobody">Niemand</string>
-<string name="my_contacts_except">Meine Kontakte außer</string>
-<string name="my_contacts">Meine Kontakte</string>
-<string name="everyone">Jedermann</string>
-<string name="channels_who_add">Wer kann mich zu Kanälen hinzufügen</string>
-<string name="new_pass">Neues Kennwort</string>
-<string name="new_password">Ihr neues Passwort muss sich von dem zuvor verwendeten Passwort unterscheiden</string>
-<string name="forgotten_password">Passwort vergessen</string>
-<string name="label">Melden Sie sich bei Ihrem Zuri-Konto an</string>
-<string name="didn_t_rece">Haben Sie keinen Code erhalten?</string>
-<string name="back_to_sig">Zurück zur Anmeldung</string>
-<string name="email_addre">E-Mail-Addresse</string>
-<string name="please_ente">Bitte geben Sie die E-Mail-Adresse ein, die bei der Registrierung dieses Kontos verwendet wurde</string>
-<string name="no_account_to_switch_text">Melden Sie sich mit mehr als einem Konto auf diesem Gerät an, um diese Funktion zu verwenden</string>
-<string name="switch_accounts_toolbar_header">Zuvor verwendete Konten</string>
-<string name="final_logout">Ausloggen…</string>
-<string name="yes">Jawohl</string>
-<string name="no">Nein</string>
-<string name="logout_dialog">Möchten Sie sich abmelden?</string>
-<string name="logout">Ausloggen</string>
-<string name="switch_acc">Benutzer wechseln</string>
-<string name="forgot_pass_sub_1">Bitte drücken Sie weiter, um das Passwort für das Konto zurückzusetzen</string>
-<string name="confirm_pass">Bestätigen Sie das Passwort, um sich mit dem Konto anzumelden</string>
-<string name="confirm_pass_hdr">Kennwort bestätigen</string>
-<string name="welcome_rect">Willkommen oben Rechteck</string>
-<string name="welcome_zc_txt">Willkommen bei Zuri-Chat</string>
-<string name="sign_in_txt">Melden Sie sich bei Ihrem Zuri-Konto an</string>
-<string name="register_string">Registrieren</string>
-<string name="welcome_desc">Senden Sie ganz einfach DMs an Ihre Kontakte und Kanäle, starten Sie Unterhaltungen mit nur einem Klick</string>
-<string name="last_seen_">zuletzt gesehen um 5:50 Uhr</string>
-<string name="john_felix_doe">John Felix Doe</string>
-<string name="hi_there_this_is_the_beginning_of_n_the_conversation_in_this_channel">Hallo, dies ist der Beginn der 
+    <string name="starred_messages">Markierte Nachrichten</string>
+    <string name="retrieving_user_org">Abrufen der Benutzerorganisation....</string>
+    <string name="successful_get_user_org">Nutzerorganisationen erfolgreich abgerufen</string>
+    <string name="invite_user">Benutzer einladen</string>
+    <string name="sign_in">Einloggen</string>
+    <string name="switch_workspace">Arbeitsbereich wechseln</string>
+    <string name="signout">Ausloggen</string>
+    <string name="add_by_email">Per E-Mail hinzufügen</string>
+    <string name="add_from_contacts">Aus Kontakten hinzufügen</string>
+    <string name="share_a_link">Einen Link teilen</string>
+    <string name="to_add_team">Um Teamkollegen hinzuzufügen, können Sie entweder einen Link senden oder von Ihren Kontakten einladen.</string>
+    <string name="who_else_is">Wer arbeitet noch an diesem Projekt?</string>
+    <string name="ok_mute_channel">OK</string>
+    <string name="cancel_mute_channel_settings">Abbrechen</string>
+    <string name="show_notifi">Zeige Benachrichtigungen</string>
+    <string name="mute_for_always">Immer</string>
+    <string name="mute_for_1_week">1 Woche</string>
+    <string name="mute_for_8_hours">8 Stunden</string>
+    <string name="mute_channel_notifications_for">Benachrichtigungen stummschalten für…</string>
+    <string name="joined">Trat bei</string>
+    <string name="you_are_already_a_member_of_this_channel">Du bist bereits Mitglied dieses Kanals</string>
+    <string name="image8">WhatsApp-Videos</string>
+    <string name="image7">WhatsApp-Bilder</string>
+    <string name="image6">Xender-Bilder</string>
+    <string name="image5">Xender-Bilder</string>
+    <string name="image4">Bilder der Entwickler-App</string>
+    <string name="image3">Kamera</string>
+    <string name="image2">Alle Videos</string>
+    <string name="image1">Alle Bilder</string>
+    <string name="an_error_occured">Ein Fehler ist aufgetreten</string>
+    <string name="gif">GIF</string>
+    <string name="creating_new_channel">neuen Kanal erstellen.......</string>
+    <string name="successful_new_channel_creation">Erfolgreich neuen Kanal erstellen</string>
+    <string name="user_not_found">Benutzer wurde nicht gefunden</string>
+    <string name="invalid_information">Kanal mit bereits vorhanden.</string>
+    <string name="unable_to_create_new_channel">Kann keinen neuen Kanal erstellen</string>
+    <string name="leave_channel_warning_leave_option">VERLASSEN</string>
+    <string name="leave_channel_warning_cancel_option">Abbrechen</string>
+    <string name="leave_channel_warning_message">Möchten Sie diesen Kanal wirklich verlassen? Du erhältst keine Nachrichten mehr von diesem Kanal, wenn du ihn verlässt</string>
+    <string name="select_contact_">Wählen Sie Kontakt</string>
+    <string name="choose_channel_members">Kanalmitglieder auswählen</string>
+    <string name="select_members_">Mitglieder auswählen</string>
+    <string name="make_my_channel_private">Mach meinen Kanal privat</string>
+    <string name="make_my_channel_public">Mach meinen Kanal öffentlich</string>
+    <string name="set_your_channel_privacy_here">Lege hier die Privatsphäre deines Kanals fest</string>
+    <string name="enter_channel_name">Kanalnamen eingeben</string>
+    <string name="provide_basic_information">Geben Sie grundlegende Informationen an</string>
+    <string name="_add_channel">Kanal hinzufügen</string>
+    <string name="leave_channel">Kanal verlassen</string>
+    <string name="mute_channel">Kanal stummschalten</string>
+    <string name="join_channel">Kanal beitreten</string>
+    <string name="you_are_viewing">Sie sehen sich an</string>
+    <string name="button_to_join_channel">Schaltfläche, um einem Kanal beizutreten</string>
+    <string name="click_button_to_join_a_channel">Klicken Sie auf die Schaltfläche, um einem Kanal beizutreten</string>
+    <string name="contacts_who_can_t_add_you">Kontakte, die dich nicht zu einem Kanal hinzufügen können, haben stattdessen die Möglichkeit, dich privat einzuladen.</string>
+    <string name="you_aren_t_sharing_live_location">Du teilst keinen Live-Standort in Chats</string>
+    <string name="thirty_minutes">Nach 30 Minuten</string>
+    <string name="one_minute">Nach 1 Minute</string>
+    <string name="immediately">Sofort</string>
+    <string name="live_location_manage__device_settings">Live-Standort erfordert Hintergrundstandort. Sie können dies in Ihren Geräteeinstellungen verwalten.</string>
+    <string name="nobody">Niemand</string>
+    <string name="my_contacts_except">Meine Kontakte außer</string>
+    <string name="my_contacts">Meine Kontakte</string>
+    <string name="everyone">Jedermann</string>
+    <string name="channels_who_add">Wer kann mich zu Kanälen hinzufügen</string>
+    <string name="new_pass">Neues Kennwort</string>
+    <string name="new_password">Ihr neues Passwort muss sich von dem zuvor verwendeten Passwort unterscheiden</string>
+    <string name="forgotten_password">Passwort vergessen</string>
+    <string name="label">Melden Sie sich bei Ihrem Zuri-Konto an</string>
+    <string name="didn_t_rece">Haben Sie keinen Code erhalten?</string>
+    <string name="back_to_sig">Zurück zur Anmeldung</string>
+    <string name="email_addre">E-Mail-Adresse</string>
+    <string name="please_ente">Bitte geben Sie die E-Mail-Adresse ein, die bei der Registrierung dieses Kontos verwendet wurde</string>
+    <string name="no_account_to_switch_text">Melden Sie sich mit mehr als einem Konto auf diesem Gerät an, um diese Funktion zu verwenden</string>
+    <string name="switch_accounts_toolbar_header">Zuvor verwendete Konten</string>
+    <string name="final_logout">Ausloggen…</string>
+    <string name="yes">Jawohl</string>
+    <string name="no">Nein</string>
+    <string name="logout_dialog">Möchten Sie sich abmelden?</string>
+    <string name="logout">Ausloggen</string>
+    <string name="switch_acc">Benutzer wechseln</string>
+    <string name="forgot_pass_sub_1">Bitte drücken Sie weiter, um das Passwort für das Konto zurückzusetzen</string>
+    <string name="confirm_pass">Bestätigen Sie das Passwort, um sich mit dem Konto anzumelden</string>
+    <string name="confirm_pass_hdr">Kennwort bestätigen</string>
+    <string name="welcome_rect">Willkommen oben Rechteck</string>
+    <string name="welcome_zc_txt">Willkommen bei Zuri-Chat</string>
+    <string name="sign_in_txt">Melden Sie sich bei Ihrem Zuri-Konto an</string>
+    <string name="register_string">Registrieren</string>
+    <string name="welcome_desc">Senden Sie ganz einfach DMs an Ihre Kontakte und Kanäle, starten Sie Unterhaltungen mit nur einem Klick</string>
+    <string name="last_seen_">zuletzt gesehen um 5:50 Uhr</string>
+    <string name="john_felix_doe">John Felix Doe</string>
+    <string name="hi_there_this_is_the_beginning_of_n_the_conversation_in_this_channel">Hallo, dies ist der Beginn der
  Unterhaltung in diesem Kanal</string>
-<string name="item_action_phone">Item_action_phone</string>
-<string name="search_hint">Suche</string>
-<string name="channel_group_members">Lux, Hamid, Joe, +234707…</string>
-<string name="android_devs">Android-Entwickler</string>
-<string name="online">online</string>
-<string name="channels_">Kanäle</string>
-<string name="unread_messages">Ungelesene Nachrichten</string>
-<string name="dm_notification_channel_name">DM-Benachrichtigung</string>
-<string name="high_priority_summary">Vorschau der Benachrichtigung oben auf dem Bildschirm anzeigen</string>
-<string name="high_priority_header">Benachrichtigung mit hoher Priorität</string>
-<string name="vibrate_summary">Bei neuen Nachrichten vibrieren</string>
-<string name="vibrate_header">Vibrieren</string>
-<string name="message_tones_summary">Ton bei neuen Nachrichten abspielen</string>
-<string name="message_tones_header">Nachrichtentöne</string>
-<string name="messages_cat_header">Mitteilungen</string>
-<string name="channel_tones_summary">Ton für eingehende und ausgehende Nachrichten in Kanälen abspielen</string>
-<string name="channel_tones_header">Kanaltöne</string>
-<string name="search_for_channels">Nach Kanälen suchen</string>
-<string name="changephoneno_hint_txt">Geben Sie Ihre neue Telefonnummer ein</string>
-<string name="members">Mitglied(er)</string>
-<string name="select_contact">Wählen Sie Kontakt</string>
-<string name="channel_media">Kanalmedien</string>
-<string name="chanel_search">Suche</string>
-<string name="mute_notifications">Benachrichtigungen stummschalten</string>
-<string name="tab_title_links">LINKS</string>
-<string name="tab_title_docs">DOCS</string>
-<string name="tab_title_media">MEDIEN</string>
-<string name="Channel_info">Kanalinfo</string>
-<string name="channels">KANÄLE</string>
-<string name="_22">22</string>
-<string name="todo">MACHEN</string>
-<string name="et_channel_name">Name</string>
-<string name="make_your_channel_public">Mach deinen Kanal öffentlich</string>
-<string name="channel_members">Kanalmitglieder</string>
-<string name="set_your_channel_privacy">Lege die Privatsphäre deines Kanals fest</string>
-<string name="make_your_channel_private">Mach deinen Kanal privat</string>
-<string name="document">Dokumentieren</string>
-<string name="audio">Audio</string>
-<string name="gallery">Galerie</string>
-<string name="no_item_here_txt">Entschuldigung, Sie haben hier keinen Artikel.</string>
-<string name="profile_about">Über</string>
-<string name="_10_07">10:07</string>
-<string name="hey_what_s_good_">Hey was ist gut</string>
-<string name="username_">Nutzername</string>
-<string name="prefsThemesList_default">keiner</string>
-<string name="fingerprint_lock_header">Fingerabdrucksperre</string>
-<string name="blocked_contacts_header">Blockierte Kontakte</string>
-<string name="live_locations_header">Live-Standort</string>
-<string name="channels_header">Kanäle</string>
-<string name="read_receipt_summary">Wenn diese Option deaktiviert ist, werden keine Lesebestätigungen gesendet oder empfangen. Lesebestätigungen werden immer für Kanäle gesendet</string>
-<string name="read_receipt_header">Quittung lesen</string>
-<string name="status_header">Status</string>
-<string name="about_header">Über</string>
-<string name="profile_photo_header">Profilfoto</string>
-<string name="last_seen_header">Zuletzt gesehen</string>
-<string name="who_can_see_summary">Wenn Sie Ihre Zuletzt gesehen nicht teilen, können Sie die Zuletzt gesehen von anderen Personen nicht sehen</string>
-<string name="who_can_see_header">Wer kann meine persönlichen Daten sehen</string>
-<string name="default_wallpaper">Standard-Hintergrundbild</string>
-<string name="my_photos_cat">Meine Fotos</string>
-<string name="solid_cat">Feste Farben</string>
-<string name="dark_cat">Dunkel</string>
-<string name="bright_cat">Hell</string>
-<string name="change_wallpaper">Ändern</string>
-<string name="wallpaper_dimming_header">Hintergrundbild dimmen</string>
-<string name="larger_items_or_no_items_string">Kein Artikel hier</string>
-<string name="save_txt">speichern</string>
-<string name="delete_txt">löschen</string>
-<string name="profile_activity">Profil</string>
-<string name="string_manage_storage">Speicher verwalten</string>
-<string name="chat_history">Chatverlauf</string>
-<string name="chat_backup">Chat-Backup</string>
-<string name="font_size_default">Mittel</string>
-<string name="font_dialog">Wählen Sie die Schriftgröße</string>
-<string name="font_size_header">Schriftgröße</string>
-<string name="media_visibility_subtitle">Zeigen Sie neu heruntergeladene Medien in der Galerie Ihres Telefons an</string>
-<string name="media_visibility_header">Mediensichtbarkeit</string>
-<string name="enter_to_send_subtitle">Eingabetaste sendet Ihre Nachricht</string>
-<string name="enter_to_send_main">Eingeben ist senden</string>
-<string name="chat_settings_header">Chat Einstellungen</string>
-<string name="system_default">Systemfehler</string>
-<string name="enter_send">Eingeben ist senden</string>
-<string name="Wallpaper">Hintergrund</string>
-<string name="theme_dialog">Wählen Sie Ihr Thema</string>
-<string name="theme">Thema</string>
-<string name="display_header">Anzeige</string>
-<string name="chats">CHATS</string>
-<string name="profile_image">Profilbild</string>
-<string name="zuri">Zuri-Chat</string>
-<string name="settings">Einstellungen</string>
-<string name="saved_messages">Gespeicherte Nachrichten</string>
-<string name="new_channel">Neuer Kanal</string>
-<string name="search">Suche</string>
-<string name="type_a_message">Geben Sie eine Nachricht ein</string>
-<string name="network_usage">Netzwerknutzung</string>
-<string name="manage_storage">Speicher verwalten</string>
-<string name="attachment_summary_off">Laden Sie Anhänge nur herunter, wenn Sie manuell aufgefordert werden</string>
-<string name="attachment_summary_on">&quot;Anhänge für eingehende E-Mails automatisch herunterladen&quot;</string>
-<string name="attachment_title">Eingehende Anhänge herunterladen</string>
-<string name="sync_title">E-Mails regelmäßig synchronisieren</string>
-<string name="reply_title">Standardantwortaktion</string>
-<string name="signature_title">Ihre Unterschrift</string>
-<string name="sync_header">Synchronisieren</string>
-<string name="messages_header">Mitteilungen</string>
-<string name="action_voice_call">Sprachanruf</string>
-<string name="action_video_call">Videoanruf</string>
-<string name="tap_to_select">Zum Auswählen tippen</string>
-<string name="all_view">Alle %1$s</string>
-<string name="x_selected">%1$d ausgewählt</string>
-<string name="send_to">Senden an %1$s</string>
-<string name="welcome_image">Willkommensbild</string>
-<string name="register_mail">E-Mail-Addresse</string>
-<string name="welcome_text">Senden Sie ganz einfach DMs an Ihre Kontakte und Kanäle, starten Sie Gespräche mit nur einem Klick</string>
-<string name="welcome_title">Willkommen bei Zuri-Chat</string>
-<string name="title_activity_settings">Einstellungen</string>
-<string name="customize_your_chat_environment_to_suit_your_preference">Passen Sie Ihre Chat-Umgebung nach Ihren Wünschen an</string>
-<string name="customize_your_chat_experience">Passen Sie Ihr Chat-Erlebnis an</string>
-<string name="receive_notifications_on_chats_and_responds_swiftly">Erhalten Sie Benachrichtigungen in Chats und antworten Sie schnell</string>
-<string name="swift_response_to_dms">Schnelle Reaktion auf DMs</string>
-<string name="zuri_logo">Zuri-Logo</string>
-<string name="powered_by_zuri_chat">Unterstützt von Zuri Chat</string>
-<string name="sub_heading_1">Keine Entschuldigung mehr für fehlende Chats, nimm deinen Chat mit</string>
-<string name="never_miss_a_chat">Verpasse keinen Chat</string>
-<string name="slider_image">Slider-Bild</string>
-<string name="skip">Überspringen</string>
-<string name="verification_code">Ein Bestätigungscode wurde gesendet, bitte geben Sie den Code ein, um Ihr Konto zu bestätigen.</string>
-<string name="skip_intro">Intro überspringen</string>
-<string name="next">Nächste</string>
-<string name="title_text">Titeltext</string>
-<string name="description">Beschreibung</string>
-<string name="imagelogo">BildLogo</string>
-<string name="proceed_to_chat_button">Weiter zum Chat</string>
-<string name="continue_to_zuri_chat">Weiter zu Zuri Chat</string>
-<string name="email_verified">Email überprüft</string>
-<string name="verify_email">E-Mail bestätigen</string>
-<string name="enter_registered_email">Geben Sie die registrierte zuri-Chat-E-Mail ein</string>
-<string name="zuri_dms_team_tolstoy">TitZuri DMs: Team Tolstoy - Kotlin Java Mobile</string>
-<string name="app_name">Zuri Chat: Kanäle und DMs</string>
- <string name="lbl_terms_and_conditions"><u>Geschäftsbedingungen</u></string>
- <string name="hello_blank_fragment">Keine Internetverbindung!</string>
-</resources>
\ No newline at end of file
+    <string name="item_action_phone">Item_action_phone</string>
+    <string name="search_hint">Suche</string>
+    <string name="channel_group_members">Lux, Hamid, Joe, +234707…</string>
+    <string name="android_devs">Android-Entwickler</string>
+    <string name="online">online</string>
+    <string name="channels_">Kanäle</string>
+    <string name="unread_messages">Ungelesene Nachrichten</string>
+    <string name="dm_notification_channel_name">DM-Benachrichtigung</string>
+    <string name="high_priority_summary">Vorschau der Benachrichtigung oben auf dem Bildschirm anzeigen</string>
+    <string name="high_priority_header">Benachrichtigung mit hoher Priorität</string>
+    <string name="vibrate_summary">Bei neuen Nachrichten vibrieren</string>
+    <string name="vibrate_header">Vibrieren</string>
+    <string name="message_tones_summary">Ton bei neuen Nachrichten abspielen</string>
+    <string name="message_tones_header">Nachrichtentöne</string>
+    <string name="messages_cat_header">Mitteilungen</string>
+    <string name="channel_tones_summary">Ton für eingehende und ausgehende Nachrichten in Kanälen abspielen</string>
+    <string name="channel_tones_header">Kanaltöne</string>
+    <string name="search_for_channels">Nach Kanälen suchen</string>
+    <string name="changephoneno_hint_txt">Geben Sie Ihre neue Telefonnummer ein</string>
+    <string name="members">Mitglied(er)</string>
+    <string name="select_contact">Wählen Sie Kontakt</string>
+    <string name="channel_media">Kanalmedien</string>
+    <string name="chanel_search">Suche</string>
+    <string name="mute_notifications">Benachrichtigungen stummschalten</string>
+    <string name="tab_title_links">LINKS</string>
+    <string name="tab_title_docs">DOCS</string>
+    <string name="tab_title_media">MEDIEN</string>
+    <string name="Channel_info">Kanalinfo</string>
+    <string name="channels">KANÄLE</string>
+    <string name="_22">22</string>
+    <string name="todo">MACHEN</string>
+    <string name="et_channel_name">Name</string>
+    <string name="make_your_channel_public">Mach deinen Kanal öffentlich</string>
+    <string name="channel_members">Kanalmitglieder</string>
+    <string name="set_your_channel_privacy">Lege die Privatsphäre deines Kanals fest</string>
+    <string name="make_your_channel_private">Mach deinen Kanal privat</string>
+    <string name="document">Dokumentieren</string>
+    <string name="audio">Audio</string>
+    <string name="gallery">Galerie</string>
+    <string name="no_item_here_txt">Entschuldigung, Sie haben hier kein
+item.</string>
+    <string name="profile_about">Über</string>
+    <string name="_10_07">10:07</string>
+    <string name="hey_what_s_good_">Hey was ist gut</string>
+    <string name="username_">Nutzername</string>
+    <string name="prefsThemesList_default">keiner</string>
+    <string name="fingerprint_lock_header">Fingerabdrucksperre</string>
+    <string name="blocked_contacts_header">Blockierte Kontakte</string>
+    <string name="live_locations_header">Live-Standort</string>
+    <string name="channels_header">Kanäle</string>
+    <string name="read_receipt_summary">Wenn diese Option deaktiviert ist, werden keine Lesebestätigungen gesendet oder empfangen.
+Lesebestätigungen werden immer für Kanäle gesendet</string>
+    <string name="read_receipt_header">Quittung lesen</string>
+    <string name="status_header">Status</string>
+    <string name="about_header">Über</string>
+    <string name="profile_photo_header">Profilfoto</string>
+    <string name="last_seen_header">Zuletzt gesehen</string>
+    <string name="who_can_see_summary">Wenn Sie Ihre Zuletzt gesehen nicht teilen,
+Sie können die Zuletzt gesehen von anderen Personen nicht sehen</string>
+    <string name="who_can_see_header">Wer kann meine persönlichen Daten sehen</string>
+    <string name="default_wallpaper">Standard-Hintergrundbild</string>
+    <string name="my_photos_cat">Meine Fotos</string>
+    <string name="solid_cat">Feste Farben</string>
+    <string name="dark_cat">Dunkel</string>
+    <string name="bright_cat">Hell</string>
+    <string name="change_wallpaper">Ändern</string>
+    <string name="wallpaper_dimming_header">Hintergrundbild dimmen</string>
+    <string name="larger_items_or_no_items_string">Kein Artikel hier</string>
+    <string name="save_txt">speichern</string>
+    <string name="delete_txt">löschen</string>
+    <string name="profile_activity">Profil</string>
+    <string name="string_manage_storage">Speicher verwalten</string>
+    <string name="chat_history">Chatverlauf</string>
+    <string name="chat_backup">Chat-Backup</string>
+    <string name="font_size_default">Mittel</string>
+    <string name="font_dialog">Wählen Sie die Schriftgröße</string>
+    <string name="font_size_header">Schriftgröße</string>
+    <string name="media_visibility_subtitle">Zeigen Sie neu heruntergeladene Medien in der Galerie Ihres Telefons an</string>
+    <string name="media_visibility_header">Mediensichtbarkeit</string>
+    <string name="enter_to_send_subtitle">Eingabetaste sendet Ihre Nachricht</string>
+    <string name="enter_to_send_main">Eingeben ist senden</string>
+    <string name="chat_settings_header">Chat Einstellungen</string>
+    <string name="system_default">Systemfehler</string>
+    <string name="enter_send">Eingeben ist senden</string>
+    <string name="Wallpaper">Hintergrund</string>
+    <string name="theme_dialog">Wählen Sie Ihr Thema</string>
+    <string name="theme">Thema</string>
+    <string name="display_header">Anzeige</string>
+    <string name="chats">CHATS</string>
+    <string name="profile_image">Profilbild</string>
+    <string name="zuri">Zuri-Chat</string>
+    <string name="settings">Einstellungen</string>
+    <string name="saved_messages">Gespeicherte Nachrichten</string>
+    <string name="new_channel">Neuer Kanal</string>
+    <string name="search">Suche</string>
+    <string name="type_a_message">Geben Sie eine Nachricht ein</string>
+    <string name="network_usage">Netzwerknutzung</string>
+    <string name="manage_storage">Speicher verwalten</string>
+    <string name="attachment_summary_off">Laden Sie Anhänge nur herunter, wenn Sie manuell aufgefordert werden</string>
+    <string name="attachment_summary_on">Anhänge für eingehende E-Mails automatisch herunterladen</string>
+    <string name="attachment_title">Eingehende Anhänge herunterladen</string>
+    <string name="sync_title">E-Mails regelmäßig synchronisieren</string>
+    <string name="reply_title">Standardantwortaktion</string>
+    <string name="signature_title">Ihre Unterschrift</string>
+    <string name="sync_header">Synchronisieren</string>
+    <string name="messages_header">Mitteilungen</string>
+    <string name="action_voice_call">Sprachanruf</string>
+    <string name="action_video_call">Videoanruf</string>
+    <string name="tap_to_select">Zum Auswählen tippen</string>
+    <string name="all_view">Alle %1$s</string>
+    <string name="x_selected">%1$d ausgewählt</string>
+    <string name="send_to">Senden an %1$s</string>
+    <string name="welcome_image">Willkommensbild</string>
+    <string name="register_mail">E-Mail-Adresse</string>
+    <string name="welcome_text">Senden Sie ganz einfach DMs an Ihre Kontakte und Kanäle, starten Sie Unterhaltungen mit nur einem Klick</string>
+    <string name="welcome_title">Willkommen bei Zuri-Chat</string>
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="customize_your_chat_environment_to_suit_your_preference">Passen Sie Ihre Chat-Umgebung nach Ihren Wünschen an</string>
+    <string name="customize_your_chat_experience">Passen Sie Ihr Chat-Erlebnis an</string>
+    <string name="receive_notifications_on_chats_and_responds_swiftly">Erhalten Sie Benachrichtigungen in Chats und antworten Sie schnell</string>
+    <string name="swift_response_to_dms">Schnelle Reaktion auf DMs</string>
+    <string name="zuri_logo">Zuri-Logo</string>
+    <string name="powered_by_zuri_chat">Unterstützt von Zuri Chat</string>
+    <string name="sub_heading_1">Keine Entschuldigung mehr für fehlende Chats, nimm deinen Chat mit</string>
+    <string name="never_miss_a_chat">Verpasse keinen Chat</string>
+    <string name="slider_image">Slider-Bild</string>
+    <string name="skip">Überspringen</string>
+    <string name="verification_code">Ein Bestätigungscode wurde gesendet, bitte geben Sie den Code ein, um Ihr Konto zu bestätigen.</string>
+    <string name="skip_intro">Intro überspringen</string>
+    <string name="next">Nächste</string>
+    <string name="title_text">Titeltext</string>
+    <string name="description">Beschreibung</string>
+    <string name="imagelogo">BildLogo</string>
+    <string name="proceed_to_chat_button">Weiter zum Chat</string>
+    <string name="continue_to_zuri_chat">Weiter zu Zuri Chat</string>
+    <string name="email_verified">Email überprüft</string>
+    <string name="verify_email">E-Mail bestätigen</string>
+    <string name="enter_registered_email">Geben Sie die registrierte zuri-Chat-E-Mail ein</string>
+    <string name="zuri_dms_team_tolstoy">TitZuri DMs: Team Tolstoy - Kotlin Java Mobile</string>
+    <string name="lbl_terms_and_conditions"><u>Geschäftsbedingungen</u></string>
+    <string name="hello_blank_fragment">Keine Internetverbindung!</string>
+    <string name="current_org_id">Aktuelle Organisations-ID</string>
+    <string name="error">Fehler</string>
+    <string name="vibrate">vibrieren</string>
+    <string name="high_priority">high_priority</string>
+    <string name="Channel_tones_off">Kanaltöne aus</string>
+    <string name="channel_tones_on">Kanaltöne an</string>
+    <string name="message_tones_off">Nachrichtentöne aus</string>
+    <string name="message_tones_on">Nachrichtentöne an</string>
+    <string name="vibrate_off">Vibrieren aus</string>
+    <string name="vibrate_on">Vibrieren an</string>
+    <string name="high_priority_notification">Benachrichtigungen mit hoher Priorität aus</string>
+    <string name="high_priority_notifications_on">Benachrichtigungen mit hoher Priorität ein</string>
+    <string name="fragment_view_destroyed">Sollte nicht versuchen, Bindungen abzurufen, wenn Fragmentansichten zerstört werden.</string>
+    <string name="name">name</string>
+    <string name="about">über</string>
+    <string name="permission_granted">Berechtigung erteilt!</string>
+    <string name="permission_denied">Berechtigung verweigert!</string>
+    <string name="recording">Aufnahme</string>
+    <string name="unable_to_start_camera">Kamera kann nicht gestartet werden!</string>
+    <string name="edit_number">Telefonnummer bearbeiten</string>
+    <string name="save">Speichern</string>
+    <string name="successful">Update erfolgreich</string>
+    <string name="sent_successfully">Erfolgreich gesendet</string>
+    <string name="invalid_error">Fehler 400, ungültig</string>
+    <string name="not_found_error">Fehler 404, nicht gefunden</string>
+    <string name="new_message">Neue Nachricht</string>
+    <string name="show_emoji">Emoji anzeigen</string>
+    <string name="picture_not_taken">Bild nicht aufgenommen</string>
+    <string name="join_channel_success">Kanal erfolgreich beigetreten</string>
+    <string name="retry">Wiederholen</string>
+    <string name="accts">\" Account(s)\"</string>
+    <string name="password_match">Passwortübereinstimmung</string>
+    <string name="password_not_match">Passwort stimmt nicht überein</string>
+    <string name="fresh_sign_in">\"Passwortänderung erfolgreich\n Neue Anmeldung erforderlich\"</string>
+    <string name="please_try_again">Bitte erneut versuchen</string>
+    <string name="pls_wait">Bitte warten</string>
+    <string name="log_out_success">Sie wurden erfolgreich vom vorherigen Konto abgemeldet</string>
+    <string name="loading">Laden</string>
+    <string name="wrong_code_retry">Falscher Code versuche es noch einmal</string>
+    <string name="correct_code">Aktueller Code</string>
+    <string name="sure_reset_password">Möchten Sie das Passwort für dieses Konto wirklich zurücksetzen?</string>
+    <string name="confirm">Bestätigung</string>
+    <string name="err_occured_try_again">\"Ein Fehler ist aufgetreten, bitte versuche es noch einmal \"</string>
+    <string name="err_msg">FEHLERMELDUNG</string>
+    <string name="channel_name_not_empty">Kanalname darf nicht leer sein.</string>
+    <string name="out_of">aus</string>
+    <string name="selected">ausgewählt</string>
+    <string name="err_loading_data">Fehler beim Laden von Daten vom Server</string>
+    <string name="user_no_org">Benutzer hat keine Organisation</string>
+    <string name="orgz">Organisation(en)</string>
+    <string name="invite_by_email">Per E-Mail einladen</string>
+    <string name="add_one_email">Du musst mindestens eine E-Mail hinzufügen</string>
+    <string name="invite_sent_succesfully">Einladung erfolgreich gesendet</string>
+    <string name="dismiss">Verwerfen</string>
+    <string name="successfully_created">Sie haben erfolgreich erstellt</string>
+    <string name="link_copied">Link kopiert</string>
+    <string name="backup_google_drive">Auf Google Drive sichern</string>
+    <string name="back_up_over">Backup über</string>
+    <string name="choose_category">Hintergrundkategorie auswählen</string>
+    <string name="bar">Bar</string>
+    <string name="click_save">zum Speichern klicken</string>
+    <string name="click_delete">zum Löschen klicken</string>
+    <string name="backup_dialog">Sicherungsdialog</string>
+    <string name="backup_google">Google sichern</string>
+    <string name="privacy">Datenschutz</string>
+    <string name="storage_n_data">Speicher und Daten</string>
+    <string name="chat_setting">Chat-Einstellungen</string>
+    <string name="notice_n_sounds">Benachrichtigung und Töne</string>
+    <string name="logout_">Abmelden</string>
+    <string name="switch_organisation">Organisation wechseln</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fd97e46b..e347865f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -81,7 +81,7 @@
 <string name="click_button_to_join_a_channel">Haga clic en el botón para unirse a un canal</string>
 <string name="contacts_who_can_t_add_you">Los contactos que no puedan agregarte a un canal tendrán la opción de invitarte en privado.</string>
 <string name="you_aren_t_sharing_live_location">No estás compartiendo la ubicación en vivo en ningún chat</string>
-<string name="thirty_minutes">Despues de 30 minutos</string>
+<string name="thirty_minutes">Después de 30 minutos</string>
 <string name="one_minute">Después de 1 minuto</string>
 <string name="immediately">Inmediatamente</string>
 <string name="live_location_manage__device_settings">La ubicación en vivo requiere una ubicación en segundo plano. Puede administrar esto en la configuración de su dispositivo.</string>
@@ -228,7 +228,7 @@
 <string name="send_to">Enviar a %1$s</string>
 <string name="welcome_image">Imagen de bienvenida</string>
 <string name="register_mail">Dirección de correo electrónico</string>
-<string name="welcome_text">Envíe mensajes directos a sus contactos y canales con facilidad, inicie conversaciones con solo un clic</string>
+<string name="welcome_text">Envíe mensajes directos a sus contactos y canales con \ n facilidad, inicie conversaciones con solo un clic</string>
 <string name="welcome_title">Bienvenido a Zuri Chat</string>
 <string name="title_activity_settings">Ajustes</string>
 <string name="customize_your_chat_environment_to_suit_your_preference">Personalice su entorno de chat para que se adapte a sus preferencias</string>
@@ -253,7 +253,78 @@
 <string name="verify_email">Verificar correo electrónico</string>
 <string name="enter_registered_email">Ingrese el correo electrónico de chat de zuri registrado</string>
 <string name="zuri_dms_team_tolstoy">TitZuri DMs: Equipo Tolstoy - Kotlin Java Mobile</string>
-<string name="app_name">Zuri Chat: Canales y DM</string>
     <string name="lbl_terms_and_conditions"><u>Términos y condiciones</u></string>
     <string name="hello_blank_fragment">¡Sin conexión a Internet!</string>
+
+
+    <string name = "current_org_id"> ID de organización actual </string>
+    <string name = "error"> Error </string>
+    <string name = "vibrate">vibrar</string>
+    <string name = "high_priority"> high_priority </string>
+    <string name = "Channel_tones_off"> Tonos de canal desactivados </string>
+    <string name = "channel_tones_on"> Tonos de canal activados </string>
+    <string name = "message_tones_off"> Tonos de mensaje desactivados </string>
+    <string name = "message_tones_on"> Tonos de mensaje activados </string>
+    <string name = "vibrate_off"> Vibrar apagado </string>
+    <string name = "vibrate_on"> Vibrar </string>
+    <string name = "high_priority_notification"> Notificaciones de alta prioridad desactivadas </string>
+    <string name = "high_priority_notifications_on"> Notificaciones de alta prioridad en </string>
+    <string name = "fragment_view_destroyed"> No debe intentar obtener enlaces cuando se destruyen las vistas de fragmentos. </string>
+    <string name = "name"> nombre </string>
+    <string name = "about"> acerca de </string>
+    <string name = "permission_granted"> ¡Permiso concedido! </string>
+    <string name = "permission_denied"> ¡Permiso denegado! </string>
+    <string name = "recording"> grabando </string>
+    <string name = "unable_to_start_camera"> ¡No se puede iniciar la cámara! </string>
+    <string name = "edit_number"> Editar número de teléfono </string>
+    <string name = "save"> Guardar </string>
+    <string name = "successful"> Actualización exitosa </string>
+    <string name = "sent_successfully"> Enviado con éxito </string>
+    <string name = "invalid_error"> Error 400, no válido </string>
+    <string name = "not_found_error"> Error 404, no encontrado </string>
+    <string name = "new_message"> Nuevo mensaje </string>
+    <string name = "show_emoji"> Mostrar emoji </string>
+    <string name = "picture_not_taken"> Foto no tomada </string>
+    <string name = "join_channel_success"> Se unió al canal con éxito </string>
+    <string name = "retry"> Reintentar </string>
+    <string name = "accts"> \ "Cuenta (s) \" </string>
+    <string name = "password_match"> Coincidencia de contraseña </string>
+    <string name = "password_not_match"> La contraseña no coincide </string>
+    <string name = "fresh_sign_in"> \ "cambio de contraseña exitoso \ n Se requiere inicio de sesión nuevo \" </string>
+    <string name = "please_try_again"> Vuelva a intentarlo </string>
+    <string name = "pls_wait"> Espere </string>
+    <string name = "log_out_success"> Se ha cerrado con éxito la sesión de la cuenta anterior </string>
+    <string name = "loading"> Cargando </string>
+    <string name = "wrong_code_retry"> Código incorrecto, inténtelo de nuevo </string>
+    <string name = "correct_code"> Código actual </string>
+    <string name = "sure_reset_password"> ¿Está seguro de que desea restablecer la contraseña de esta cuenta? </string>
+    <string name = "confirm"> Confirmación </string>
+    <string name = "err_occured_try_again"> \ "Se produjo un error, inténtelo de nuevo \" </string>
+    <string name = "err_msg"> MENSAJE DE ERROR </string>
+    <string name = "channel_name_not_empty"> El nombre del canal no puede estar vacío. </string>
+    <string name = "out_of"> de </string>
+    <string name = "selected"> seleccionado </string>
+    <string name = "err_loading_data"> Error al cargar datos desde el servidor </string>
+    <string name = "user_no_org"> El usuario no tiene organización </string>
+    <string name = "orgz"> Organización (es) </string>
+    <string name = "invite_by_email"> Invitar por correo electrónico </string>
+    <string name = "add_one_email"> Debe agregar al menos un correo electrónico </string>
+    <string name = "invite_sent_succesfully"> Invitación enviada correctamente </string>
+    <string name = "dismiss"> Descartar </string>
+    <string name = "successfully_created"> Ha creado correctamente </string>
+    <string name = "link_copied"> enlace copiado </string>
+    <string name = "backup_google_drive"> Copia de seguridad en Google Drive </string>
+    <string name = "back_up_over"> Copia de seguridad en </string>
+    <string name = "choose_category"> Elija una categoría de papel tapiz </string>
+    <string name = "bar"> barra </string>
+    <string name = "click_save"> haga clic para guardar </string>
+    <string name = "click_delete"> haga clic para eliminar </string>
+    <string name = "backup_dialog"> Cuadro de diálogo de copia de seguridad </string>
+    <string name = "backup_google"> Copia de seguridad de Google </string>
+    <string name = "privacy"> Privacidad </string>
+    <string name = "storage_n_data"> Almacenamiento y datos </string>
+    <string name = "chat_setting"> Configuración de chat </string>
+    <string name = "notice_n_sounds"> Notificación y sonidos </string>
+    <string name = "logout_"> Cerrar sesión </string>
+    <string name="switch_organisation">Cambiar de organización</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4027fb88..a25baee1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -258,4 +258,74 @@
 	<string name="por">Portugais</string>
     <string name="add_workspace">Ajouter un espace de travail</string>
     <string name="create_workspace">Créer un nouvel espace de travail</string>
+	<string name="current_org_id">ID d\'organisation actuel</string>
+	<string name="error">Erreur</string>
+	<string name="high_priority">high_priority</string>
+	<string name="Channel_tones_off">Sons des canaux désactivés</string>
+	<string name="channel_tones_on">Sonneries de canal activées</string>
+	<string name="message_tones_off">Sonneries de message désactivées</string>
+	<string name="message_tones_on">Sonneries de message activées</string>
+	<string name="vibrate_off">Vibreur désactivé</string>
+	<string name="vibrate_on">Vibrer sur</string>
+	<string name="high_priority_notification">Notifications prioritaires désactivées</string>
+	<string name="high_priority_notifications_on">Notifications prioritaires activées</string>
+	<string name="fragment_view_destroyed">Ne devrait pas tenter d\'obtenir des liaisons lorsque les vues Fragment sont détruites.</string>
+	<string name="name">nom</string>
+	<string name="about">à propos</string>
+	<string name="permission_granted">Autorisation accordée !</string>
+	<string name="permission_denied">Autorisation refusée !</string>
+	<string name="recording">enregistrement</string>
+	<string name="unable_to_start_camera">Impossible de démarrer la caméra !</string>
+	<string name="edit_number">Modifier le numéro de téléphone</string>
+	<string name="save">Enregistrer</string>
+	<string name="successful">Mise à jour réussie</string>
+	<string name="sent_successfully">Envoyé avec succès</string>
+	<string name="invalid_error">Erreur 400, invalide</string>
+	<string name="not_found_error">Erreur 404, introuvable</string>
+	<string name="new_message">Nouveau message</string>
+	<string name="show_emoji">Afficher les Emoji</string>
+	<string name="picture_not_taken">Photo non prise</string>
+	<string name="join_channel_success">Chaîne jointe avec succès</string>
+	<string name="retry">Réessayer</string>
+	<string name="accts">\" Compte(s)\"</string>
+	<string name="password_match">Correspondance du mot de passe</string>
+	<string name="password_not_match">Le mot de passe ne correspond pas</string>
+	<string name="fresh_sign_in">\"changement de mot de passe réussi\n Nouvelle connexion requise\"</string>
+	<string name="please_try_again">Veuillez réessayer</string>
+	<string name="pls_wait">Veuillez patienter</string>
+	<string name="log_out_success">Vous avez été déconnecté avec succès du compte précédent</string>
+	<string name="loading">Chargement</string>
+	<string name="wrong_code_retry">Code erroné, réessayez</string>
+	<string name="correct_code">Code actuel</string>
+	<string name="sure_reset_password">Voulez-vous vraiment réinitialiser le mot de passe de ce compte ?</string>
+	<string name="confirm">Confirmation</string>
+	<string name="err_occured_try_again">\"Une erreur s\'est produite, veuillez réessayer \"</string>
+	<string name="err_msg">MESSAGE D\'ERREUR</string>
+	<string name="channel_name_not_empty">Le nom du canal ne peut pas être vide.</string>
+	<string name="out_of">sur</string>
+	<string name="selected">sélectionné</string>
+	<string name="err_loading_data">Erreur lors du chargement des données depuis le serveur</string>
+	<string name="user_no_org">L\'utilisateur n\'a pas d\'organisation</string>
+	<string name="orgz">Organisation(s)</string>
+	<string name="invite_by_email">Inviter par e-mail</string>
+	<string name="add_one_email">Vous devez ajouter au moins un e-mail</string>
+	<string name="invite_sent_succesfully">Invitation envoyée avec succès</string>
+	<string name="dismiss">Rejeter</string>
+	<string name="successfully_created">Vous avez réussi à créer</string>
+	<string name="link_copied">lien copié</string>
+	<string name="backup_google_drive">Sauvegarder sur Google Drive</string>
+	<string name="back_up_over">Sauvegarder par dessus</string>
+	<string name="choose_category">Choisir la catégorie de papier peint</string>
+	<string name="bar">bar</string>
+	<string name="click_save">cliquer pour enregistrer</string>
+	<string name="click_delete">cliquer pour supprimer</string>
+	<string name="backup_dialog">Boîte de dialogue de sauvegarde</string>
+	<string name="backup_google">Sauvegarder Google</string>
+	<string name="vibrate">vibrer</string>
+	<string name="privacy">Confidentialité</string>
+	<string name="storage_n_data">Stockage et données</string>
+	<string name="chat_setting">Paramètres de discussion</string>
+	<string name="notice_n_sounds">Notification et sons</string>
+	<string name="logout_">Déconnexion</string>
+	<string name="switch_organisation">Changer d\'organisation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 85f7c78e..f58cba99 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -256,4 +256,74 @@
 	<string name="por">portoghese</string>
 	<string name="add_workspace">Aggiungi spazio di lavoro</string>
 	<string name="create_workspace">Creare un nuovo spazio di lavoro</string>
+	<string name="current_org_id">ID organizzazione corrente</string>
+	<string name="error">Errore</string>
+	<string name="high_priority">high_priority</string>
+	<string name="Channel_tones_off">Toni canale disattivati</string>
+	<string name="channel_tones_on">Toni del canale attivati</string>
+	<string name="message_tones_off">Toni messaggi disattivati</string>
+	<string name="message_tones_on">Toni dei messaggi attivati</string>
+	<string name="vibrate_off">Vibrazione disattivata</string>
+	<string name="vibrate_on">Vibra su</string>
+	<string name="high_priority_notification">Notifiche ad alta priorità disattivate</string>
+	<string name="high_priority_notifications_on">Notifiche ad alta priorità attivate</string>
+	<string name="fragment_view_destroyed">Non dovrebbe tentare di ottenere collegamenti quando le viste dei frammenti vengono distrutte.</string>
+	<string name="name">nome</string>
+	<string name="about">about</string>
+	<string name="permission_granted">Autorizzazione concessa!</string>
+	<string name="permission_denied">Permesso negato!</string>
+	<string name="recording">registrazione</string>
+	<string name="unable_to_start_camera">Impossibile avviare la fotocamera!</string>
+	<string name="edit_number">Modifica numero di telefono</string>
+	<string name="save">Salva</string>
+	<string name="successful">Aggiornamento riuscito</string>
+	<string name="sent_successfully">Inviato con successo</string>
+	<string name="invalid_error">Errore 400, non valido</string>
+	<string name="not_found_error">Errore 404, non trovato</string>
+	<string name="new_message">Nuovo messaggio</string>
+	<string name="show_emoji">Mostra Emoji</string>
+	<string name="picture_not_taken">Foto non scattata</string>
+	<string name="join_channel_success">Aderito al canale con successo</string>
+	<string name="retry">Riprova</string>
+	<string name="accts">\" Account(s)\"</string>
+	<string name="password_match">Corrispondenza password</string>
+	<string name="password_not_match">La password non corrisponde</string>
+	<string name="fresh_sign_in">\"cambio password riuscito\n Nuovo accesso richiesto\"</string>
+	<string name="please_try_again">Riprova di nuovo</string>
+	<string name="pls_wait">Attendere prego</string>
+	<string name="log_out_success">Sei stato disconnesso con successo dall\'account precedente</string>
+	<string name="loading">Caricamento</string>
+	<string name="wrong_code_retry">Codice sbagliato riprova</string>
+	<string name="correct_code">Codice attuale</string>
+	<string name="sure_reset_password">Sei sicuro di voler reimpostare la password per questo account?</string>
+	<string name="confirm">Conferma</string>
+	<string name="err_occured_try_again">\"Si è verificato un errore riprovare \"</string>
+	<string name="err_msg">MESSAGGIO DI ERRORE</string>
+	<string name="channel_name_not_empty">Il nome del canale non può essere vuoto.</string>
+	<string name="out_of">fuori da</string>
+	<string name="selected">selezionato</string>
+	<string name="err_loading_data">Errore nel caricamento dei dati dal server</string>
+	<string name="user_no_org">L\'utente non ha organizzazione</string>
+	<string name="orgz">Organizzazione(i)</string>
+	<string name="invite_by_email">Invita tramite e-mail</string>
+	<string name="add_one_email">Devi aggiungere almeno un\'email</string>
+	<string name="invite_sent_succesfully">Invito inviato con successo</string>
+	<string name="dismiss">Ignora</string>
+	<string name="successfully_created">Hai creato con successo</string>
+	<string name="link_copied">link copiato</string>
+	<string name="backup_google_drive">Backup su Google Drive</string>
+	<string name="back_up_over">Backup su</string>
+	<string name="choose_category">Scegli la categoria dello sfondo</string>
+	<string name="bar">bar</string>
+	<string name="click_save">fai clic per salvare</string>
+	<string name="click_delete">fai clic per eliminare</string>
+	<string name="backup_dialog">Finestra di backup</string>
+	<string name="backup_google">Esegui il backup di Google</string>
+	<string name="vibrate">vibrare</string>
+	<string name="privacy">Privacy</string>
+	<string name="storage_n_data">Memoria e dati</string>
+	<string name="chat_setting">Impostazioni chat</string>
+	<string name="notice_n_sounds">Notifiche e suoni</string>
+	<string name="logout_">Disconnetti</string>
+	<string name="switch_organisation">Cambia organizzazione</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a9a00244..5b1e0ca0 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="enter_registered_email">הזן דוא"ל צ'אט רשום של Zuri</string>
 	<string name="verify_email">וודא כתובת אימייל</string>
@@ -128,7 +129,7 @@
 	<string name="dm_notification_channel_name">הודעת DM</string>
 	<string name="unread_messages">הודעות שלא נקראו</string>
 	<string name="channels_">ערוצים</string>
-	<string name="lbl_terms_and_conditions"></string>
+	<string name="lbl_terms_and_conditions"><u>תנאים והגבלות</u></string>
 	<string name="online">מקוון</string>
 	<string name="android_devs">מפתחי אנדרואיד</string>
 	<string name="channel_group_members">Lux, Hamid, Joe, +234707…</string>
@@ -155,105 +156,178 @@
 	<string name="no_account_to_switch_text">היכנס עם יותר מחשבון אחד במכשיר זה כדי להשתמש בתכונה זו</string>
 	<string name="please_ente">
         אנא הזן את הדוא"ל ששימש לרישום חשבון זה</string>
-	<string name="email_addre">כתובת דוא"ל</string>
-	<string name="back_to_sig">חזרה לכניסה </string>
-	<string name="didn_t_rece">האם\u00E2\u0080\u0099 לא קיבל קוד כלשהו?</string>
-	<string name="label">היכנס לחשבון Zuri שלך</string>
-	<string name="forgotten_password">שכחתי סיסמה</string>
-	<string name="new_password">הסיסמה החדשה שלך חייבת להיות שונה מהסיסמה שבה השתמשת בעבר</string>
-	<string name="new_pass">סיסמה חדשה</string>
-	<string name="channels_who_add">מי יכול להוסיף אותי לערוצים</string>
-	<string name="everyone">כולם</string>
-	<string name="my_contacts">אנשי הקשר שלי</string>
-	<string name="my_contacts_except">אנשי הקשר שלי למעט</string>
-	<string name="nobody">אף אחד</string>
-	<string name="live_location_manage__device_settings">מיקום חי דורש מיקום ברקע. אתה יכול לנהל זאת בהגדרות המכשיר שלך.</string>
-	<string name="immediately">מייד</string>
-	<string name="one_minute">אחרי דקה אחת</string>
-	<string name="thirty_minutes">לאחר 30 דקות</string>
-	<string name="you_aren_t_sharing_live_location">אינך משתף מיקום חי באף צ\'אט</string>
-	<string name="contacts_who_can_t_add_you">אנשי קשר שאינם יכולים להוסיף אותך לערוץ יקבלו את האפשרות להזמין אותך באופן פרטי במקום זאת.</string>
-	<string name="click_button_to_join_a_channel">לחץ על הלחצן כדי להצטרף לערוץ</string>
-	<string name="button_to_join_channel">כפתור להצטרפות לערוץ</string>
-	<string name="you_are_viewing">אתה צופה</string>
-	<string name="join_channel">הצטרף לערוץ</string>
-	<string name="mute_channel">השתק ערוץ</string>
-	<string name="leave_channel">עזוב את הערוץ</string>
-	<string name="_add_channel">הוסף ערוץ</string>
-	<string name="provide_basic_information">ספק מידע בסיסי</string>
-	<string name="enter_channel_name">הזן את שם הערוץ</string>
-	<string name="set_your_channel_privacy_here">הגדר את פרטיות הערוץ שלך כאן</string>
-	<string name="make_my_channel_public">הפוך את הערוץ שלי לציבורי</string>
-	<string name="make_my_channel_private">הפוך את הערוץ שלי לפרטי</string>
-	<string name="select_members_">בחר חברים</string>
-	<string name="choose_channel_members">בחר חברי ערוץ</string>
-	<string name="select_contact_">בחר איש קשר</string>
-	<string name="leave_channel_warning_message">האם אתה בטוח שברצונך לעזוב את הערוץ הזה? לא תקבל יותר הודעות מהערוץ הזה לאחר שתעזוב את</string>
-	<string name="leave_channel_warning_cancel_option">בטל</string>
-	<string name="leave_channel_warning_leave_option">עזוב</string>
-	<string name="unable_to_create_new_channel">לא ניתן ליצור ערוץ חדש</string>
-	<string name="invalid_information">ערוץ עם  כבר קיים.</string>
-	<string name="user_not_found">המשתמש לא נמצא</string>
-	<string name="successful_new_channel_creation">יצירת ערוץ חדש הצליח</string>
-	<string name="creating_new_channel">יוצר ערוץ חדש.......</string>
-	<string name="gif">GIF</string>
-	<string name="an_error_occured">התרחשה שגיאה</string>
-	<string name="image1">כל התמונות</string>
-	<string name="image2">כל הסרטונים</string>
-	<string name="image3">מצלמה</string>
-	<string name="image4">תמונות של אפליקציית Dev</string>
-	<string name="image5">תמונות Xender</string>
-	<string name="image6">תמונות Xender</string>
-	<string name="image7">תמונות WhatsApp</string>
-	<string name="image8">סרטוני ווטסאפ</string>
-	<string name="you_are_already_a_member_of_this_channel">אתה כבר חבר בערוץ הזה</string>
-	<string name="joined">הצטרף</string>
-	<string name="mute_channel_notifications_for">השתק הודעות עבור...</string>
-	<string name="mute_for_8_hours">8 שעות</string>
-	<string name="mute_for_1_week">שבוע אחד</string>
-	<string name="mute_for_always">תמיד</string>
-	<string name="show_notifi">הצג התראות</string>
-	<string name="cancel_mute_channel_settings">בטל</string>
-	<string name="ok_mute_channel">בסדר</string>
-	<string name="who_else_is">מי עוד עובד על הפרויקט הזה?</string>
-	<string name="to_add_team">כדי להוסיף חברים לצוות, תוכל לשלוח קישור או להזמין מאנשי הקשר שלך.</string>
-	<string name="share_a_link">שתף קישור</string>
-	<string name="add_from_contacts">הוסף מאנשי קשר</string>
-	<string name="add_by_email">הוסף בדוא"ל</string>
-	<string name="signout">יציאה</string>
-	<string name="switch_workspace">החלף סביבת עבודה</string>
-	<string name="sign_in">היכנס</string>
-	<string name="invite_user">הזמן משתמש</string>
-	<string name="successful_get_user_org">ארגוני משתמשים אוחזרו בהצלחה</string>
-	<string name="retrieving_user_org">מאחזר ארגון משתמש...</string>
-	<string name="starred_messages">הודעות מסומנות בכוכב</string>
-	<string name="empty_starrred_message_info">הקש והחזק כל הודעה \nבכל צ\'אט כדי לסמן אותה בכוכב, \nכדי שתוכל \nלמצוא אותה בקלות מאוחר יותר</string>
-	<string name="invite_link">צור קישור</string>
-	<string name="channel_invite">הזמנה לערוץ</string>
-	<string name="create_link">צור קישור</string>
-	<string name="generated_link">קישור שנוצר</string>
-	<string name="notification">הודעה חדשה</string>
-	<string name="notification_channel_description">זהו ערוץ התראות לדוגמה למטרת הדגמה.</string>
-	<string name="didn_t_receive_any_code">לא קיבלת קוד כלשהו?</string>
-	<string name="create_new_organization">צור ארגון חדש</string>
-	<string name="forgot_password_txt">שכחת סיסמה?</string>
-	<string name="continue_txt">המשך</string>
-	<string name="languages">שפות</string>
-	<string name="title">כותרת</string>
-	<string name="zuri_dms_team_tolstoy">TitleZuri DMs: Team Tolstoy - Kotlin Java Mobile</string>
-	<string name="action_video_call">שיחת וידאו</string>
-	<string name="chats">צ\'אטים</string>
-	<string name="select_language">בחר תרגום לשפה</string>
-	<string name="english_uk">אנגלית בריטניה</string>
-	<string name="english_us">אנגלית ארה"ב</string>
-	<string name="fr">צרפתית</string>
-	<string name="zh">סינית</string>
-	<string name="ar">ערבית</string>
-	<string name="den">גרמנית</string>
-	<string name="sp">ספרדית</string>
-	<string name="it">אִיטַלְקִית</string>
-	<string name="iw">עברית</string>
-	<string name="por">פורטוגזית</string>
-	<string name="add_workspace">הוסף סביבת עבודה</string>
-	<string name="create_workspace">צור סביבת עבודה חדשה</string>
+    <string name="email_addre">כתובת דוא"ל</string>
+    <string name="back_to_sig">חזרה לכניסה </string>
+    <string name="didn_t_rece">האם\u00E2\u0080\u0099 לא קיבל קוד כלשהו?</string>
+    <string name="label">היכנס לחשבון Zuri שלך</string>
+    <string name="forgotten_password">שכחתי סיסמה</string>
+    <string name="new_password">הסיסמה החדשה שלך חייבת להיות שונה מהסיסמה שבה השתמשת בעבר</string>
+    <string name="new_pass">סיסמה חדשה</string>
+    <string name="channels_who_add">מי יכול להוסיף אותי לערוצים</string>
+    <string name="everyone">כולם</string>
+    <string name="my_contacts">אנשי הקשר שלי</string>
+    <string name="my_contacts_except">אנשי הקשר שלי למעט</string>
+    <string name="nobody">אף אחד</string>
+    <string name="live_location_manage__device_settings">מיקום חי דורש מיקום ברקע. אתה יכול לנהל זאת בהגדרות המכשיר שלך.</string>
+    <string name="immediately">מייד</string>
+    <string name="one_minute">אחרי דקה אחת</string>
+    <string name="thirty_minutes">לאחר 30 דקות</string>
+    <string name="you_aren_t_sharing_live_location">אינך משתף מיקום חי באף צ\'אט</string>
+    <string name="contacts_who_can_t_add_you">אנשי קשר שאינם יכולים להוסיף אותך לערוץ יקבלו את האפשרות להזמין אותך באופן פרטי במקום זאת.</string>
+    <string name="click_button_to_join_a_channel">לחץ על הלחצן כדי להצטרף לערוץ</string>
+    <string name="button_to_join_channel">כפתור להצטרפות לערוץ</string>
+    <string name="you_are_viewing">אתה צופה</string>
+    <string name="join_channel">הצטרף לערוץ</string>
+    <string name="mute_channel">השתק ערוץ</string>
+    <string name="leave_channel">עזוב את הערוץ</string>
+    <string name="_add_channel">הוסף ערוץ</string>
+    <string name="provide_basic_information">ספק מידע בסיסי</string>
+    <string name="enter_channel_name">הזן את שם הערוץ</string>
+    <string name="set_your_channel_privacy_here">הגדר את פרטיות הערוץ שלך כאן</string>
+    <string name="make_my_channel_public">הפוך את הערוץ שלי לציבורי</string>
+    <string name="make_my_channel_private">הפוך את הערוץ שלי לפרטי</string>
+    <string name="select_members_">בחר חברים</string>
+    <string name="choose_channel_members">בחר חברי ערוץ</string>
+    <string name="select_contact_">בחר איש קשר</string>
+    <string name="leave_channel_warning_message">האם אתה בטוח שברצונך לעזוב את הערוץ הזה? לא תקבל יותר הודעות מהערוץ הזה לאחר שתעזוב את</string>
+    <string name="leave_channel_warning_cancel_option">בטל</string>
+    <string name="leave_channel_warning_leave_option">עזוב</string>
+    <string name="unable_to_create_new_channel">לא ניתן ליצור ערוץ חדש</string>
+    <string name="invalid_information">ערוץ עם <b>\"%1$s\"</b> כבר קיים.</string>
+    <string name="user_not_found">המשתמש לא נמצא</string>
+    <string name="successful_new_channel_creation">יצירת ערוץ חדש הצליח</string>
+    <string name="creating_new_channel">יוצר ערוץ חדש.......</string>
+    <string name="gif">GIF</string>
+    <string name="an_error_occured">התרחשה שגיאה</string>
+
+    <string name="image1">כל התמונות</string>
+    <string name="image2">כל הסרטונים</string>
+    <string name="image3">מצלמה</string>
+    <string name="image4">תמונות של אפליקציית Dev</string>
+    <string name="image5">תמונות Xender</string>
+    <string name="image6">תמונות Xender</string>
+    <string name="image7">תמונות WhatsApp</string>
+    <string name="image8">סרטוני ווטסאפ</string>
+    <string name="you_are_already_a_member_of_this_channel">אתה כבר חבר בערוץ הזה</string>
+    <string name="joined">הצטרף</string>
+    <string name="mute_channel_notifications_for">השתק הודעות עבור...</string>
+    <string name="mute_for_8_hours">8 שעות</string>
+    <string name="mute_for_1_week">שבוע אחד</string>
+    <string name="mute_for_always">תמיד</string>
+    <string name="show_notifi">הצג התראות</string>
+    <string name="cancel_mute_channel_settings">בטל</string>
+    <string name="ok_mute_channel">בסדר</string>
+    <string name="who_else_is">מי עוד עובד על הפרויקט הזה?</string>
+    <string name="to_add_team">כדי להוסיף חברים לצוות, תוכל לשלוח קישור או להזמין מאנשי הקשר שלך.</string>
+    <string name="share_a_link">שתף קישור</string>
+    <string name="add_from_contacts">הוסף מאנשי קשר</string>
+    <string name="add_by_email">הוסף בדוא"ל</string>
+    <string name="signout">יציאה</string>
+    <string name="switch_workspace">החלף סביבת עבודה</string>
+    <string name="sign_in">היכנס</string>
+    <string name="invite_user">הזמן משתמש</string>
+    <string name="successful_get_user_org">ארגוני משתמשים אוחזרו בהצלחה</string>
+    <string name="retrieving_user_org">מאחזר ארגון משתמש...</string>
+    <string name="starred_messages">הודעות מסומנות בכוכב</string>
+    <string name="empty_starrred_message_info">הקש והחזק כל הודעה \nבכל צ\'אט כדי לסמן אותה בכוכב, \nכדי שתוכל \nלמצוא אותה בקלות מאוחר יותר</string>
+    <string name="invite_link">צור קישור</string>
+    <string name="channel_invite">הזמנה לערוץ</string>
+    <string name="create_link">צור קישור</string>
+    <string name="generated_link">קישור שנוצר</string>
+
+    <string name="notification">הודעה חדשה</string>
+    <string name="notification_channel_description">זהו ערוץ התראות לדוגמה למטרת הדגמה.</string>
+    <string name="didn_t_receive_any_code">לא קיבלת קוד כלשהו?</string>
+    <string name="create_new_organization">צור ארגון חדש</string>
+    <string name="forgot_password_txt">שכחת סיסמה?</string>
+    <string name="continue_txt">המשך</string>
+    <string name="languages">שפות</string>
+    <string name="title">כותרת</string>
+    <string name="chats">צ\'אטים</string>
+
+    <string name="select_language">בחר תרגום לשפה</string>
+    <string name="english_uk">אנגלית בריטניה</string>
+    <string name="english_us">אנגלית ארה"ב</string>
+    <string name="fr">צרפתית</string>
+    <string name="zh">סינית</string>
+    <string name="ar">ערבית</string>
+    <string name="den">גרמנית</string>
+    <string name="sp">ספרדית</string>
+    <string name="it">אִיטַלְקִית</string>
+    <string name="iw">עברית</string>
+    <string name="por">פורטוגזית</string>
+    <string name="add_workspace">הוסף סביבת עבודה</string>
+    <string name="create_workspace">צור סביבת עבודה חדשה</string>
+    <string name="current_org_id">מזהה ארגון נוכחי</string>
+    <string name="error">שגיאה</string>
+    <string name="vibrate">רטט</string>
+    <string name="high_priority">high_priority</string>
+    <string name="Channel_tones_off">צלילי הערוץ כבויים</string>
+    <string name="channel_tones_on">צלילי הערוץ מופעלים</string>
+    <string name="message_tones_off">צלילי הודעה כבויים</string>
+    <string name="message_tones_on">צלילי הודעה מופעלים</string>
+    <string name="vibrate_off">רטט כבוי</string>
+    <string name="vibrate_on">רטט ב</string>
+    <string name="high_priority_notification">הודעות בעדיפות גבוהה מושבתות</string>
+    <string name="high_priority_notifications_on">הודעות בעדיפות גבוהה ב-</string>
+    <string name="fragment_view_destroyed">לא צריך לנסות להשיג כריכות כאשר תצוגות קטעים נהרסות.</string>
+    <string name="name">שם</string>
+    <string name="about">אודות</string>
+    <string name="permission_granted">הרשאה ניתנה!</string>
+    <string name="permission_denied">הרשאה נדחתה!</string>
+    <string name="recording">הקלטה</string>
+    <string name="unable_to_start_camera">לא ניתן להפעיל את המצלמה!</string>
+    <string name="edit_number">ערוך מספר טלפון</string>
+    <string name="save">שמור</string>
+    <string name="successful">העדכון הצליח</string>
+    <string name="sent_successfully">נשלח בהצלחה</string>
+    <string name="invalid_error">שגיאה 400, לא חוקית</string>
+    <string name="not_found_error">שגיאה 404, לא נמצאה</string>
+    <string name="new_message">הודעה חדשה</string>
+    <string name="show_emoji">הצג אימוג\'י</string>
+    <string name="picture_not_taken">תמונה לא צולמה</string>
+    <string name="join_channel_success">הצטרף לערוץ בהצלחה</string>
+    <string name="retry">נסה שוב</string>
+    <string name="accts">\" חשבונות\"</string>
+    <string name="password_match">התאמת סיסמה</string>
+    <string name="password_not_match">הסיסמה לא תואמת</string>
+    <string name="fresh_sign_in">\"שינוי הסיסמה הצליח\n נדרש כניסה טרי\"</string>
+    <string name="please_try_again">אנא נסה שוב</string>
+    <string name="pls_wait">אנא המתן</string>
+    <string name="log_out_success">ניתקת בהצלחה מחשבון קודם</string>
+    <string name="loading">טוען</string>
+    <string name="wrong_code_retry">קוד שגוי נסה שוב</string>
+    <string name="correct_code">קוד נוכחי</string>
+    <string name="sure_reset_password">האם אתה בטוח שברצונך לאפס את הסיסמה עבור חשבון זה?</string>
+    <string name="confirm">אישור</string>
+    <string name="err_occured_try_again">\"אירעה שגיאה אנא נסה שוב \"</string>
+    <string name="err_msg">הודעת שגיאה</string>
+    <string name="channel_name_not_empty">שם הערוץ לא יכול להיות ריק.</string>
+    <string name="out_of">מחוץ ל</string>
+    <string name="selected">נבחר</string>
+    <string name="err_loading_data">שגיאה בטעינת נתונים מהשרת</string>
+    <string name="user_no_org">למשתמש אין ארגון</string>
+    <string name="orgz">ארגון(ים)</string>
+    <string name="invite_by_email">הזמן בדוא"ל</string>
+    <string name="add_one_email">עליך להוסיף דוא"ל אחד לפחות</string>
+    <string name="invite_sent_succesfully">ההזמנה נשלחה בהצלחה</string>
+    <string name="dismiss">סגור</string>
+    <string name="successfully_created">יצרת בהצלחה</string>
+    <string name="link_copied">הקישור הועתק</string>
+    <string name="backup_google_drive">גבה ב-Google Drive</string>
+    <string name="back_up_over">גיבוי מעל</string>
+    <string name="choose_category">בחר קטגוריית טפט</string>
+    <string name="bar">סרגל</string>
+    <string name="click_save">לחץ כדי לשמור</string>
+    <string name="click_delete">לחץ כדי למחוק</string>
+    <string name="backup_dialog">דיאלוג גיבוי</string>
+    <string name="backup_google">גבה את Google</string>
+    <string name="zuri_dms_team_tolstoy">TitZuri DMs: Team Tolstoy - Kotlin Java Mobile</string>
+    <string name="action_video_call">שיחת וידאו</string>
+    <string name="privacy">פרטיות</string>
+    <string name="storage_n_data">אחסון ונתונים</string>
+    <string name="chat_setting">הגדרות צ\'אט</string>
+    <string name="notice_n_sounds">הודעות וצלילים</string>
+    <string name="logout_">צא</string>
+    <string name="switch_organisation">החלף ארגון</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/strings.xml b/app/src/main/res/values-land/strings.xml
index f5623370..abb4bb76 100644
--- a/app/src/main/res/values-land/strings.xml
+++ b/app/src/main/res/values-land/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="unread_messages">Unread messages</string>
+    <string name="error">Error</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index f5623370..abb4bb76 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="unread_messages">Unread messages</string>
+    <string name="error">Error</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c9086a52..d7b19f1e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -258,4 +258,75 @@
 	<string name = "por"> Português </string>
     <string name="add_workspace">Adicionar Espaço de Trabalho</string>
     <string name="create_workspace">Criar novo espaço de trabalho</string>
+
+	<string name = "error"> Erro </string>
+	<string name = "high_priority"> alta_prioridade </string>
+	<string name = "Channel_tones_off"> tons do canal desativados </string>
+	<string name = "channel_tones_on"> Tons do canal em </string>
+	<string name = "message_tones_off"> Tons de mensagem desativados </string>
+	<string name = "message_tones_on"> Tons de mensagem em </string>
+	<string name = "vibrate_off"> Vibrar </string>
+	<string name = "vibrate_on"> Vibrar </string>
+	<string name = "high_priority_notification"> Notificações de alta prioridade desativadas </string>
+	<string name = "high_priority_notifications_on"> Notificações de alta prioridade em </string>
+	<string name = "fragment_view_destroyed"> Não deve tentar obter ligações quando as visualizações de fragmento são destruídas. </string>
+	<string name = "name"> nome </string>
+	<string name = "about"> sobre </string>
+	<string name = "permission_granted"> Permissão concedida! </string>
+	<string name = "permission_denied"> Permissão negada! </string>
+	<string name = "recording"> gravação </string>
+	<string name = "unable_to_start_camera"> Impossível iniciar a câmera! </string>
+	<string name = "edit_number"> Editar número de telefone </string>
+	<string name = "save"> Salvar </string>
+	<string name = "successful"> Atualização bem-sucedida </string>
+	<string name = "sent_successfully"> Enviado com sucesso </string>
+	<string name = "invalid_error"> Erro 400, inválido </string>
+	<string name = "not_found_error"> Erro 404, não encontrado </string>
+	<string name = "new_message"> Nova mensagem </string>
+	<string name = "show_emoji"> Mostrar Emoji </string>
+	<string name = "picture_not_taken"> Foto não tirada </string>
+	<string name = "join_channel_success"> Entrou no canal com sucesso </string>
+	<string name = "retry"> Tentar novamente </string>
+	<string name = "accts"> \ "Conta (s) \" </string>
+	<string name = "password_match"> Correspondência de senha </string>
+	<string name = "password_not_match"> Senha não corresponde </string>
+	<string name = "fresh_sign_in"> \ "alteração de senha bem-sucedida \ n É necessário novo login \" </string>
+	<string name = "please_try_again"> Tente novamente </string>
+	<string name = "pls_wait"> Aguarde </string>
+	<string name = "log_out_success"> Você foi desconectado com sucesso da conta anterior </string>
+	<string name = "loading"> Carregando </string>
+	<string name = "wrong_code_retry"> Código errado, tente novamente </string>
+	<string name = "correct_code"> Código atual </string>
+	<string name = "sure_reset_password"> Tem certeza de que deseja redefinir a senha desta conta? </string>
+	<string name = "confirm"> Confirmação </string>
+	<string name = "err_occured_try_again"> \ "Ocorreu um erro, tente novamente \" </string>
+	<string name = "err_msg"> MENSAGEM DE ERRO </string>
+	<string name = "channel_name_not_empty"> O nome do canal não pode estar vazio. </string>
+	<string name = "out_of"> de </string>
+	<string name = "selected"> selecionado </string>
+	<string name = "err_loading_data"> Erro ao carregar dados do servidor </string>
+	<string name = "user_no_org"> O usuário não tem organização </string>
+	<string name = "orgz"> Organização (ões) </string>
+	<string name = "invite_by_email"> Convidar por e-mail </string>
+	<string name = "add_one_email"> Você deve adicionar pelo menos um e-mail </string>
+	<string name = "invite_sent_succesfully"> Convite enviado com sucesso </string>
+	<string name = "dismiss"> Dispensar </string>
+	<string name = "successfully_created"> Você criou com sucesso </string>
+	<string name = "link_copied"> link copiado </string>
+	<string name = "backup_google_drive"> Backup no Google Drive </string>
+	<string name = "back_up_over"> Backup acima </string>
+	<string name = "choose_category"> Escolha a categoria do papel de parede </string>
+	<string name = "bar"> bar </string>
+	<string name = "click_save"> clique para salvar </string>
+	<string name = "click_delete"> clique para excluir </string>
+	<string name = "backup_dialog"> Caixa de diálogo de backup </string>
+	<string name = "backup_google"> Backup do Google </string>
+	<string name="vibrate">vibrar</string>
+	<string name="current_org_id">ID da organização atual</string>
+	<string name = "privacy"> Privacidade </string>
+	<string name = "storage_n_data"> Armazenamento e dados </string>
+	<string name = "chat_setting"> Configurações de bate-papo </string>
+	<string name = "notice_n_sounds"> Notificação e sons </string>
+	<string name = "logout_"> Sair </string>
+	<string name="switch_organisation">Mudar de organização</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/strings.xml b/app/src/main/res/values-v23/strings.xml
index f5623370..0d50e662 100644
--- a/app/src/main/res/values-v23/strings.xml
+++ b/app/src/main/res/values-v23/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="unread_messages">Unread messages</string>
+    <string name="name">name</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 6e03152f..19636baa 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,19 +1,4 @@
 <resources>
-<string name="create_workspace">创建新工作区</string>
-<string name="add_workspace">添加工作区</string>
-<string name="por">葡萄牙语</string>
-<string name="iw">希伯来语</string>
-<string name="it">意大利语</string>
-<string name="sp">西班牙语</string>
-<string name="den">荷兰语</string>
-<string name="ar">阿拉伯</string>
-<string name="zh">中国人</string>
-<string name="fr">法语</string>
-<string name="english_us">英语 美国</string>
-<string name="english_uk">英语 英国</string>
-<string name="select_language">选择语言翻译</string>
-<string name="title">标题</string>
-<string name="languages">语言</string>
 <string name="continue_txt">继续</string>
 <string name="forgot_password_txt">忘记密码？</string>
 <string name="create_new_organization">创建新组织</string>
@@ -258,7 +243,91 @@
 <string name="verify_email">验证邮件</string>
 <string name="enter_registered_email">输入已注册的 zuri 聊天电子邮件</string>
 <string name="zuri_dms_team_tolstoy">TitZuri DM：托尔斯泰团队 - Kotlin Java Mobile</string>
-<string name="app_name">Zuri 聊天：频道和 DM</string>
- <string name="lbl_terms_and_conditions"><u>条款和条件</u></string>
- <string name="hello_blank_fragment">没有网络连接！</string>
+    <string name="lbl_terms_and_conditions"><u>条款和条件</u></string>
+    <string name="languages">语言</string>
+    <string name="title">标题</string>
+    <string name="select_language">选择语言翻译</string>
+    <string name="english_uk">英语英国</string>
+    <string name="english_us">英语美国</string>
+    <string name="fr">法语</string>
+    <string name="zh">中文</string>
+    <string name="ar">阿拉伯语</string>
+    <string name="den">德语</string>
+    <string name="sp">西班牙语</string>
+    <string name="it">意大利语</string>
+    <string name="iw">希伯来语</string>
+    <string name="por">葡萄牙语</string>
+    <string name="add_workspace">添加工作区</string>
+    <string name="create_workspace">创建新工作区</string>
+    <string name="current_org_id">当前组织 ID</string>
+    <string name="error">错误</string>
+    <string name="vibrate">振动</string>
+    <string name="high_priority">high_priority</string>
+    <string name="Channel_tones_off">频道音关闭</string>
+    <string name="channel_tones_on">开启频道音</string>
+    <string name="message_tones_off">消息音关闭</string>
+    <string name="message_tones_on">消息提示音</string>
+    <string name="vibrate_off">关闭振动</string>
+    <string name="vibrate_on">振动开启</string>
+    <string name="high_priority_notification">关闭高优先级通知</string>
+    <string name="high_priority_notifications_on">高优先级通知</string>
+    <string name="fragment_view_destroyed">当 Fragment 视图被销毁时不应尝试获取绑定。</string>
+    <string name="name">姓名</string>
+    <string name="about">关于</string>
+    <string name="permission_granted">已授予权限！</string>
+    <string name="permission_denied">权限被拒绝！</string>
+    <string name="recording">录音</string>
+    <string name="unable_to_start_camera">无法启动相机！</string>
+    <string name="edit_number">编辑电话号码</string>
+    <string name="save">保存</string>
+    <string name="successful">更新成功</string>
+    <string name="sent_successfully">发送成功</string>
+    <string name="invalid_error">错误 400，无效</string>
+    <string name="not_found_error">错误 404，未找到</string>
+    <string name="new_message">新消息</string>
+    <string name="show_emoji">显示表情符号</string>
+    <string name="picture_not_taken">图片未拍摄</string>
+    <string name="join_channel_success">加入频道成功</string>
+    <string name="retry">重试</string>
+    <string name="accts">\"帐户\"</string>
+    <string name="password_match">密码匹配</string>
+    <string name="password_not_match">密码不匹配</string>
+    <string name="fresh_sign_in">\"密码更改成功\n 需要重新登录\"</string>
+    <string name="please_try_again">请重试</string>
+    <string name="pls_wait">请稍候</string>
+    <string name="log_out_success">您已成功退出之前的帐户</string>
+    <string name="loading">正在加载</string>
+    <string name="wrong_code_retry">错误代码重试</string>
+    <string name="correct_code">当前代码</string>
+    <string name="sure_reset_password">您确定要重置此帐户的密码吗？</string>
+    <string name="confirm">确认</string>
+    <string name="err_occured_try_again">\"发生错误，请重试\"</string>
+    <string name="err_msg">错误信息</string>
+    <string name="channel_name_not_empty">频道名称不能为空。</string>
+    <string name="out_of">超出</string>
+    <string name="selected">选中</string>
+    <string name="err_loading_data">从服务器加载数据时出错</string>
+    <string name="user_no_org">用户没有组织</string>
+    <string name="orgz">组织</string>
+    <string name="invite_by_email">通过电子邮件邀请</string>
+    <string name="add_one_email">您必须至少添加一封电子邮件</string>
+    <string name="invite_sent_succesfully">邀请发送成功</string>
+    <string name="dismiss">关闭</string>
+    <string name="successfully_created">您已成功创建</string>
+    <string name="link_copied">复制的链接</string>
+    <string name="backup_google_drive">备份到 Google Drive</string>
+    <string name="back_up_over">备份结束</string>
+    <string name="choose_category">选择壁纸类别</string>
+    <string name="bar">bar</string>
+    <string name="click_save">点击保存</string>
+    <string name="click_delete">点击删除</string>
+    <string name="backup_dialog">备份对话框</string>
+    <string name="backup_google">备份谷歌</string>
+    <string name="hello_blank_fragment">没有网络连接</string>
+    <string name="privacy">隐私</string>
+    <string name="storage_n_data">存储和数据</string>
+    <string name="chat_setting">聊天设置</string>
+    <string name="notice_n_sounds">通知和声音</string>
+    <string name="logout_">注销</string>
+    <string name="switch_organisation">切换组织</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 603be953..24104a8c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -157,7 +157,6 @@
 
     <string name="unread_messages">Unread messages</string>
     <string name="channels_">Channels</string>
-    <string name="lbl_terms_and_conditions"><u>terms and conditions</u></string>
     <string name="online">online</string>
     <string name="android_devs">Android Devs</string>
     <string name="channel_group_members">Lux, Hamid, Joe, +234707…</string>
@@ -301,4 +300,84 @@
     <string name="por">Portuguese</string>
     <string name="add_workspace">Add Workspace</string>
     <string name="create_workspace">Create New Workspace</string>
+    <string name="chat_header" translatable="false">chat_header</string>
+    <string name="security_header" translatable="false">security_header</string>
+    <string name="storage_header" translatable="false">storage_header</string>
+    <string name="notification_header" translatable="false">notification_header</string>
+    <string name="logout_header" translatable="false">logout_header</string>
+    <string name="user" translatable="false">USER</string>
+    <string name="logged_out" translatable="false">LOG_OUT</string>
+    <string name="current_org_id">Current Organization ID</string>
+    <string name="error">Error</string>
+    <string name="channel_tones" translatable="false">channel_tones</string>
+    <string name="message_tone" translatable="false">message_tone</string>
+    <string name="vibrate">vibrate</string>
+    <string name="high_priority">high_priority</string>
+    <string name="Channel_tones_off">Channel tones off</string>
+    <string name="channel_tones_on">Channel tones on</string>
+    <string name="message_tones_off">Message tones off</string>
+    <string name="message_tones_on">Message tones on</string>
+    <string name="vibrate_off">Vibrate off</string>
+    <string name="vibrate_on">Vibrate on</string>
+    <string name="high_priority_notification">High priority Notifications off</string>
+    <string name="high_priority_notifications_on">High priority Notifications on</string>
+    <string name="fragment_view_destroyed">Should not attempt to get bindings when Fragment views are destroyed.</string>
+    <string name="name">name</string>
+    <string name="about">about</string>
+    <string name="permission_granted">Permission Granted!</string>
+    <string name="permission_denied">Permission Denied!</string>
+    <string name="recording">recording</string>
+    <string name="unable_to_start_camera">Unable to Start Camera!</string>
+    <string name="edit_number">Edit Phone Number</string>
+    <string name="save">Save</string>
+    <string name="successful">Update Successful</string>
+    <string name="sent_successfully">Sent Successfully</string>
+    <string name="invalid_error">Error 400, invalid</string>
+    <string name="not_found_error">Error 404, Not found</string>
+    <string name="new_message">New message</string>
+    <string name="show_emoji">Show Emoji</string>
+    <string name="picture_not_taken">Picture not taken</string>
+    <string name="join_channel_success">Joined Channel Successfully</string>
+    <string name="retry">Retry</string>
+    <string name="accts">\" Account(s)\"</string>
+    <string name="password_match">Password match</string>
+    <string name="password_not_match">Password doesn\'t match</string>
+    <string name="fresh_sign_in">\"password change successful\n Fresh sign in required\"</string>
+    <string name="please_try_again">Please retry again</string>
+    <string name="pls_wait">Please wait</string>
+    <string name="log_out_success">You have been successfully logged out of previous account</string>
+    <string name="loading">Loading</string>
+    <string name="wrong_code_retry">Wrong code try again</string>
+    <string name="correct_code">Current code</string>
+    <string name="sure_reset_password">Are you sure you want to reset the password for this account?</string>
+    <string name="confirm">Confirmation</string>
+    <string name="err_occured_try_again">\"An Error occurred please try again \"</string>
+    <string name="err_msg">ERROR MESSAGE</string>
+    <string name="channel_name_not_empty">Channel name can\'t be empty.</string>
+    <string name="out_of">out of</string>
+    <string name="selected">selected</string>
+    <string name="err_loading_data">Error in Loading data from server</string>
+    <string name="user_no_org">User has no organization</string>
+    <string name="orgz">Organization(s)</string>
+    <string name="invite_by_email">Invite By Email</string>
+    <string name="add_one_email">You must at least add one email</string>
+    <string name="invite_sent_succesfully">Invitation sent successfully</string>
+    <string name="dismiss">Dismiss</string>
+    <string name="successfully_created">You have successfully created</string>
+    <string name="link_copied">link copied</string>
+    <string name="backup_google_drive">Back up to Google Drive</string>
+    <string name="back_up_over">Back up Over</string>
+    <string name="choose_category">Choose Wallpaper Category</string>
+    <string name="bar">bar</string>
+    <string name="click_save">click to save</string>
+    <string name="click_delete">click to delete</string>
+    <string name="backup_dialog">Back up Dialog</string>
+    <string name="backup_google">Back up Google</string>
+    <string name="lbl_terms_and_conditions"><u>terms and conditions</u></string>
+    <string name="privacy">Privacy</string>
+    <string name="storage_n_data">Storage and Data</string>
+    <string name="chat_setting">Chat Settings</string>
+    <string name="notice_n_sounds">Notification and Sounds</string>
+    <string name="logout_">Log out</string>
+    <string name="switch_organisation">Switch Organisation</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index b8fc4196..f5fafc39 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -4,26 +4,26 @@
         app:fragment="com.zurichat.app.ui.settings.fragments.ChatFragment"
         app:icon="@drawable/ic_chat"
         app:key="chat_header"
-        app:title="Chat Settings"
+        app:title="@string/chat_setting"
         />
 
     <Preference
         app:fragment="com.zurichat.app.ui.settings.SettingsActivity$PrivacyAndSecurityFragment"
         app:icon="@drawable/ic_lock"
         app:key="security_header"
-        app:title="Privacy" />
+        app:title="@string/privacy" />
 
     <Preference
         app:fragment="com.zurichat.app.ui.settings.SettingsActivity$StorageAndDataFragment"
         app:icon="@drawable/ic_folder"
         app:key="storage_header"
-        app:title="Storage and Data" />
+        app:title="@string/storage_n_data" />
 
     <Preference
         app:fragment="com.zurichat.app.ui.settings.SettingsActivity$NotificationAndSounds"
         app:icon="@drawable/ic_alarm"
         app:key="notification_header"
-        app:title="Notification and Sounds" />
+        app:title="@string/notice_n_sounds" />
 
     <Preference
         app:fragment="com.zurichat.app.ui.settings.SettingsActivity$LanguagesFragment"
@@ -34,6 +34,6 @@
         app:fragment="com.zurichat.app.ui.settings.dialogs.LogoutDialogFragment"
         app:icon="@drawable/ic_logout"
         app:key="logout_header"
-        app:title="Log out"/>
+        app:title="@string/logout_"/>
 
 </PreferenceScreen>
\ No newline at end of file