diff --git a/app/src/main/java/com/example/updateapp/UpdateApplication.java b/app/src/main/java/com/example/updateapp/UpdateApplication.java
index 71de640..4d22ba3 100644
--- a/app/src/main/java/com/example/updateapp/UpdateApplication.java
+++ b/app/src/main/java/com/example/updateapp/UpdateApplication.java
@@ -11,4 +11,14 @@ public class UpdateApplication extends Application {
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(LocaleHelper.onAttach(base, "en"));
     }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LocaleHelper.setLocale(
+                this,
+                LocaleHelper.getLanguage(this),
+                LocaleHelper.getCountry(this)
+        );
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/updateapp/adapters/LanguageAdapter.java b/app/src/main/java/com/example/updateapp/adapters/LanguageAdapter.java
index f58709e..0d5a5fb 100644
--- a/app/src/main/java/com/example/updateapp/adapters/LanguageAdapter.java
+++ b/app/src/main/java/com/example/updateapp/adapters/LanguageAdapter.java
@@ -8,6 +8,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.example.updateapp.R;
@@ -17,9 +18,9 @@
 
 public class LanguageAdapter extends RecyclerView.Adapter<LanguageAdapter.LanguageViewHolder> {
 
-    private Context context;
-    private List<LanguageModel> languageList;
-    private OnLanguageSelectedListener listener;
+    private final Context context;
+    private final List<LanguageModel> languageList;
+    private final OnLanguageSelectedListener listener;
 
     public interface OnLanguageSelectedListener {
         void onLanguageSelected(LanguageModel language, int position);
@@ -41,18 +42,21 @@ public LanguageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int view
     @Override
     public void onBindViewHolder(@NonNull LanguageViewHolder holder, int position) {
         LanguageModel language = languageList.get(position);
-        
         holder.txtLanguageName.setText(language.getLanguageName());
-        
-        if (language.isSelected()) {
-            holder.imgSelected.setVisibility(View.VISIBLE);
-        } else {
-            holder.imgSelected.setVisibility(View.GONE);
-        }
+
+        boolean selected = language.isSelected();
+        holder.itemView.setBackgroundResource(
+                selected ? R.drawable.bg_language_item_selected : R.drawable.bg_language_item
+        );
+        holder.imgSelected.setVisibility(selected ? View.VISIBLE : View.INVISIBLE);
+        holder.txtLanguageName.setTextColor(
+                ContextCompat.getColor(context, selected ? R.color.themeColor : R.color.black)
+        );
+        holder.itemView.setSelected(selected);
 
         holder.itemView.setOnClickListener(v -> {
             if (listener != null) {
-                listener.onLanguageSelected(language, position);
+                listener.onLanguageSelected(language, holder.getBindingAdapterPosition());
             }
         });
     }
@@ -79,4 +83,4 @@ public LanguageViewHolder(@NonNull View itemView) {
             imgSelected = itemView.findViewById(R.id.img_selected);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/updateapp/adapters/OnboardingAdapter.java b/app/src/main/java/com/example/updateapp/adapters/OnboardingAdapter.java
index 065c59d..06bf04d 100644
--- a/app/src/main/java/com/example/updateapp/adapters/OnboardingAdapter.java
+++ b/app/src/main/java/com/example/updateapp/adapters/OnboardingAdapter.java
@@ -8,38 +8,36 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewpager.widget.PagerAdapter;
 
 import com.example.updateapp.R;
 
 public class OnboardingAdapter extends PagerAdapter {
 
-    Context context;
-    LayoutInflater layoutInflater;
+    private final Context context;
 
-    public OnboardingAdapter(Context context) {
-        this.context = context;
-    }
-
-    String titles[] = {
-          "Welcome to FinTrack",
-          "Track • Analyze • Improve",
-          "Build Better Money Habits"
+    private final int[] titles = {
+            R.string.onboarding_title_1,
+            R.string.onboarding_title_2,
+            R.string.onboarding_title_3
     };
 
-    String subtitles[] ={
-          "Your all-in-one AI companion for smarter spending,\nbetter savings, and complete financial clarity." ,
-          "Understand your expenses with clean visuals, smart insights, and real-time spending patterns\nthat keep you in control.",
-          "Set budgets, stay organized, and make confident \nfinancial decisions with powerful AI-Chatbot tools."
+    private final int[] subtitles = {
+            R.string.onboarding_subtitle_1,
+            R.string.onboarding_subtitle_2,
+            R.string.onboarding_subtitle_3
     };
 
-    int images[] = {
+    private final int[] images = {
             R.drawable.bg_1,
             R.drawable.bg_2,
             R.drawable.bg_3
     };
 
+    public OnboardingAdapter(Context context) {
+        this.context = context;
+    }
+
     @Override
     public int getCount() {
         return titles.length;
@@ -47,31 +45,28 @@ public int getCount() {
 
     @Override
     public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-        return view == (ConstraintLayout) object;
+        return view == object;
     }
 
     @NonNull
     @Override
     public Object instantiateItem(@NonNull ViewGroup container, int position) {
-        layoutInflater = (LayoutInflater) context.getSystemService(context.LAYOUT_INFLATER_SERVICE);
-        View v = layoutInflater.inflate(R.layout.slide, container, false);
+        View v = LayoutInflater.from(context).inflate(R.layout.slide, container, false);
 
         ImageView image = v.findViewById(R.id.slideImg);
         TextView title = v.findViewById(R.id.sliderTitle);
         TextView subtitle = v.findViewById(R.id.sliderSubTitle);
 
         image.setImageResource(images[position]);
-        title.setText(titles[position]);
-        subtitle.setText(subtitles[position]);
+        title.setText(context.getString(titles[position]));
+        subtitle.setText(context.getString(subtitles[position]));
 
         container.addView(v);
-
         return v;
-
     }
 
     @Override
     public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-        container.removeView((ConstraintLayout) object);
+        container.removeView((View) object);
     }
 }
diff --git a/app/src/main/java/com/example/updateapp/models/LanguageModel.java b/app/src/main/java/com/example/updateapp/models/LanguageModel.java
index 9133124..56ac767 100644
--- a/app/src/main/java/com/example/updateapp/models/LanguageModel.java
+++ b/app/src/main/java/com/example/updateapp/models/LanguageModel.java
@@ -44,4 +44,4 @@ public boolean isSelected() {
     public void setSelected(boolean selected) {
         isSelected = selected;
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java b/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java
index fab2da9..173a76b 100644
--- a/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java
+++ b/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java
@@ -5,99 +5,113 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+import android.os.LocaleList;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.os.LocaleListCompat;
 
 import java.util.Locale;
 
-public class LocaleHelper {
-    private static final String SELECTED_LANGUAGE = "Locale.Helper.Selected.Language";
-    private static final String SELECTED_COUNTRY = "Locale.Helper.Selected.Country";
+/**
+ * Single source of truth for the in-app language.
+ * English is stored and applied as {@code en} with no country, so Android falls
+ * back to {@code values/} instead of hunting for {@code values-en-rUS}.
+ */
+public final class LocaleHelper {
+
     private static final String PREFS_NAME = "app_prefs";
+    private static final String KEY_LANGUAGE = "Locale.Helper.Selected.Language";
+    private static final String KEY_COUNTRY = "Locale.Helper.Selected.Country";
+    public static final String DEFAULT_LANGUAGE = "en";
+
+    private LocaleHelper() {}
 
     public static Context onAttach(Context context) {
-        String lang = getPersistedData(context, "en");
-        String country = getPersistedCountry(context, "");
-        return setLocale(context, lang, country);
+        return onAttach(context, DEFAULT_LANGUAGE);
     }
 
     public static Context onAttach(Context context, String defaultLanguage) {
-        String lang = getPersistedData(context, defaultLanguage);
-        String country = getPersistedCountry(context, "");
-        return setLocale(context, lang, country);
+        String lang = getLanguage(context, defaultLanguage);
+        String country = getCountry(context);
+        return updateResources(context, lang, country);
     }
 
     public static String getLanguage(Context context) {
-        return getPersistedData(context, "en");
+        return getLanguage(context, DEFAULT_LANGUAGE);
     }
 
-    public static Context setLocale(Context context, String language, String country) {
-        persist(context, language, country);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            return updateResources(context, language, country);
+    public static String getLanguage(Context context, String defaultLanguage) {
+        SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        String lang = preferences.getString(KEY_LANGUAGE, defaultLanguage);
+        if (lang == null || lang.isEmpty()) {
+            return defaultLanguage;
         }
-
-        return updateResourcesLegacy(context, language, country);
+        return lang;
     }
 
-    private static String getPersistedData(Context context, String defaultLanguage) {
+    public static String getCountry(Context context) {
         SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        return preferences.getString(SELECTED_LANGUAGE, defaultLanguage);
+        String country = preferences.getString(KEY_COUNTRY, "");
+        return country == null ? "" : country;
     }
 
-    private static String getPersistedCountry(Context context, String defaultCountry) {
-        SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        return preferences.getString(SELECTED_COUNTRY, defaultCountry);
+    public static boolean isEnglish(String language) {
+        return language == null || language.isEmpty() || language.equalsIgnoreCase(DEFAULT_LANGUAGE);
     }
 
-    private static void persist(Context context, String language, String country) {
-        SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putString(SELECTED_LANGUAGE, language);
-        editor.putString(SELECTED_COUNTRY, country);
-        editor.apply();
+    public static Context setLocale(Context context, String language, String country) {
+        String lang = isEnglish(language) ? DEFAULT_LANGUAGE : language;
+        String region = isEnglish(lang) ? "" : (country == null ? "" : country);
+        persist(context, lang, region);
+        applyAppLocales(lang, region);
+        Context app = context.getApplicationContext();
+        if (app != null && app != context) {
+            updateResources(app, lang, region);
+        }
+        return updateResources(context, lang, region);
     }
 
-    private static Context updateResources(Context context, String language, String country) {
-        Locale locale;
+    public static Locale toLocale(String language, String country) {
+        if (isEnglish(language)) {
+            return Locale.ENGLISH;
+        }
         if (country != null && !country.isEmpty()) {
-            locale = new Locale(language, country);
-        } else {
-            locale = new Locale(language);
+            return new Locale(language, country);
         }
-        Locale.setDefault(locale);
+        return new Locale(language);
+    }
 
-        Configuration configuration = context.getResources().getConfiguration();
-        configuration.setLocale(locale);
-        configuration.setLayoutDirection(locale);
+    private static void persist(Context context, String language, String country) {
+        SharedPreferences.Editor editor =
+                context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit();
+        editor.putString(KEY_LANGUAGE, language);
+        editor.putString(KEY_COUNTRY, country == null ? "" : country);
+        editor.apply();
+    }
 
-        return context.createConfigurationContext(configuration);
+    private static void applyAppLocales(String language, String country) {
+        String tag = isEnglish(language)
+                ? "en"
+                : (country != null && !country.isEmpty() ? language + "-" + country : language);
+        AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(tag));
     }
 
-    private static Context updateResourcesLegacy(Context context, String language, String country) {
-        Locale locale;
-        if (country != null && !country.isEmpty()) {
-            locale = new Locale(language, country);
-        } else {
-            locale = new Locale(language);
-        }
+    private static Context updateResources(Context context, String language, String country) {
+        Locale locale = toLocale(language, country);
         Locale.setDefault(locale);
 
         Resources resources = context.getResources();
-        Configuration configuration = resources.getConfiguration();
-        configuration.locale = locale;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        Configuration configuration = new Configuration(resources.getConfiguration());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            configuration.setLocale(locale);
+            configuration.setLocales(new LocaleList(locale));
             configuration.setLayoutDirection(locale);
+            return context.createConfigurationContext(configuration);
         }
 
+        configuration.locale = locale;
+        configuration.setLayoutDirection(locale);
         resources.updateConfiguration(configuration, resources.getDisplayMetrics());
         return context;
     }
-
-    public static void clearLanguagePreference(Context context) {
-        SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(SELECTED_LANGUAGE);
-        editor.remove(SELECTED_COUNTRY);
-        editor.apply();
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/updateapp/views/activites/LanguageActivity.java b/app/src/main/java/com/example/updateapp/views/activites/LanguageActivity.java
index 67fe6a6..ac7a654 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/LanguageActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/LanguageActivity.java
@@ -1,7 +1,9 @@
 package com.example.updateapp.views.activites;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -14,6 +16,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.example.updateapp.Helpers.SaveState;
 import com.example.updateapp.MainActivity;
 import com.example.updateapp.R;
 import com.example.updateapp.adapters.LanguageAdapter;
@@ -28,9 +31,17 @@ public class LanguageActivity extends AppCompatActivity implements LanguageAdapt
     private RecyclerView recyclerView;
     private LanguageAdapter languageAdapter;
     private List<LanguageModel> languageList;
-    private ImageView imgDone, imgBack;
+    private ImageView imgDone;
+    private ImageView imgBack;
     private TextView txtTitle;
+    private TextView txtSubtitle;
     private int selectedPosition = 0;
+    private boolean isFirstLaunch;
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(LocaleHelper.onAttach(newBase));
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -43,6 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
             return insets;
         });
 
+        isFirstLaunch = getIntent().getBooleanExtra("isFirstLaunch", false);
+
         initViews();
         setupLanguageList();
         setupRecyclerView();
@@ -50,23 +63,25 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initViews() {
-        recyclerView = findViewById(R.id.rev_langauge);
+        recyclerView = findViewById(R.id.rev_language);
         imgDone = findViewById(R.id.img_done);
         imgBack = findViewById(R.id.img_back);
         txtTitle = findViewById(R.id.txt_title);
-        
-        // Set title from string resource
-        txtTitle.setText(getString(R.string.language));
-        
-        // Show back button
-        imgBack.setVisibility(android.view.View.VISIBLE);
+        txtSubtitle = findViewById(R.id.txt_subtitle);
+
+        txtTitle.setText(getString(R.string.select_language));
+        if (txtSubtitle != null) {
+            txtSubtitle.setText(getString(R.string.choose_language));
+        }
+
+        imgDone.setContentDescription(getString(R.string.done));
+        imgBack.setContentDescription(getString(R.string.back));
+        imgBack.setVisibility(isFirstLaunch ? View.GONE : View.VISIBLE);
     }
 
     private void setupLanguageList() {
         languageList = new ArrayList<>();
-        
-        // Add all 10 supported languages
-        languageList.add(new LanguageModel(getString(R.string.lang_english), "en", "US"));
+        languageList.add(new LanguageModel(getString(R.string.lang_english), "en", ""));
         languageList.add(new LanguageModel(getString(R.string.lang_chinese), "zh", "CN"));
         languageList.add(new LanguageModel(getString(R.string.lang_hindi), "hi", "IN"));
         languageList.add(new LanguageModel(getString(R.string.lang_spanish), "es", "ES"));
@@ -77,18 +92,16 @@ private void setupLanguageList() {
         languageList.add(new LanguageModel(getString(R.string.lang_russian), "ru", "RU"));
         languageList.add(new LanguageModel(getString(R.string.lang_urdu), "ur", "PK"));
 
-        // Set current language as selected
         String currentLanguage = LocaleHelper.getLanguage(this);
+        selectedPosition = 0;
         for (int i = 0; i < languageList.size(); i++) {
-            if (languageList.get(i).getLanguageCode().equals(currentLanguage)) {
-                languageList.get(i).setSelected(true);
+            boolean match = languageList.get(i).getLanguageCode().equalsIgnoreCase(currentLanguage);
+            languageList.get(i).setSelected(match);
+            if (match) {
                 selectedPosition = i;
-                break;
             }
         }
-        
-        // If no match found, default to English (position 0)
-        if (selectedPosition == 0 && !currentLanguage.equals("en")) {
+        if (!languageList.get(selectedPosition).isSelected()) {
             languageList.get(0).setSelected(true);
             selectedPosition = 0;
         }
@@ -98,12 +111,12 @@ private void setupRecyclerView() {
         languageAdapter = new LanguageAdapter(this, languageList, this);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(languageAdapter);
+        recyclerView.setHasFixedSize(true);
     }
 
     private void setupClickListeners() {
         imgDone.setOnClickListener(v -> applyLanguageChange());
-        
-        imgBack.setOnClickListener(v -> onBackPressed());
+        imgBack.setOnClickListener(v -> getOnBackPressedDispatcher().onBackPressed());
     }
 
     @Override
@@ -113,33 +126,25 @@ public void onLanguageSelected(LanguageModel language, int position) {
     }
 
     private void applyLanguageChange() {
-        if (selectedPosition >= 0 && selectedPosition < languageList.size()) {
-            LanguageModel selectedLanguage = languageList.get(selectedPosition);
-            
-            // Apply the language change immediately
-            LocaleHelper.setLocale(this, selectedLanguage.getLanguageCode(), selectedLanguage.getCountryCode());
-            
-            // Show success message
-            Toast.makeText(this, getString(R.string.language_changed), Toast.LENGTH_SHORT).show();
-            
-            // Restart the main activity to apply changes completely
-            restartApp();
-        }
+        LanguageModel selectedLanguage = languageList.get(selectedPosition);
+        LocaleHelper.setLocale(
+                this,
+                selectedLanguage.getLanguageCode(),
+                selectedLanguage.getCountryCode()
+        );
+
+        new SaveState(this, "LANGUAGE_SELECTED").setState(1);
+        Toast.makeText(this, getString(R.string.language_changed), Toast.LENGTH_SHORT).show();
+        restartApp();
     }
 
     private void restartApp() {
-        // Create intent to restart the main activity
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        Intent intent = isFirstLaunch
+                ? new Intent(this, OnboardingActivity.class)
+                : new Intent(this, MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(intent);
         finish();
-        
-        // Apply transition animation
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
     }
-
-    @Override
-    protected void attachBaseContext(android.content.Context newBase) {
-        super.attachBaseContext(LocaleHelper.onAttach(newBase));
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java b/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
index 8700ad9..e289845 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
@@ -222,7 +222,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                         this,
                         getString(R.string.google_signin_error, e.getStatusCode(), e.getMessage()),
                         Toast.LENGTH_LONG
-                ).show();
+                )                .show();
             }
         }
     }
diff --git a/app/src/main/java/com/example/updateapp/views/activites/OTPActivity.java b/app/src/main/java/com/example/updateapp/views/activites/OTPActivity.java
index 918ed05..6d96226 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/OTPActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/OTPActivity.java
@@ -224,7 +224,7 @@ private void saveUserToFirestoreAndContinue(String uid, String name, String emai
                 })
                 .addOnFailureListener(e -> {
                     if (dialog.isShowing()) dialog.dismiss();
-                    Toast.makeText(OTPActivity.this, "Failed to save user data: " + e.getMessage(), Toast.LENGTH_LONG).show();
+                    Toast.makeText(OTPActivity.this, getString(R.string.failed_save_user, e.getMessage()), Toast.LENGTH_LONG).show();
                 });
     }
 
diff --git a/app/src/main/java/com/example/updateapp/views/activites/SplashScreenActivity.java b/app/src/main/java/com/example/updateapp/views/activites/SplashScreenActivity.java
index b2534dd..565a348 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/SplashScreenActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/SplashScreenActivity.java
@@ -5,12 +5,9 @@
 import android.os.Bundle;
 import android.view.WindowManager;
 
-import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 
+import com.example.updateapp.Helpers.SaveState;
 import com.example.updateapp.R;
 import com.example.updateapp.utils.LocaleHelper;
 
@@ -19,6 +16,11 @@
 
 public class SplashScreenActivity extends AppCompatActivity {
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(LocaleHelper.onAttach(newBase));
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,25 +30,24 @@ protected void onCreate(Bundle savedInstanceState) {
         );
         setContentView(R.layout.activity_splash_screen);
 
+        SaveState languageState = new SaveState(this, "LANGUAGE_SELECTED");
+        boolean languageSelected = languageState.getState() == 1;
 
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Intent intent = new Intent();
-                        intent.setClass(SplashScreenActivity.this, OnboardingActivity.class);
-                        startActivity(intent);
-                        finish();
+                runOnUiThread(() -> {
+                    Intent intent;
+                    if (!languageSelected) {
+                        intent = new Intent(SplashScreenActivity.this, LanguageActivity.class);
+                        intent.putExtra("isFirstLaunch", true);
+                    } else {
+                        intent = new Intent(SplashScreenActivity.this, OnboardingActivity.class);
                     }
+                    startActivity(intent);
+                    finish();
                 });
             }
-        },500);
-    }
-
-    @Override
-    protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(LocaleHelper.onAttach(newBase));
+        }, 500);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/updateapp/views/fragments/ChatbotFragment.java b/app/src/main/java/com/example/updateapp/views/fragments/ChatbotFragment.java
index 6ba8cb1..9218e8a 100644
--- a/app/src/main/java/com/example/updateapp/views/fragments/ChatbotFragment.java
+++ b/app/src/main/java/com/example/updateapp/views/fragments/ChatbotFragment.java
@@ -16,6 +16,7 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.example.updateapp.R;
 import com.example.updateapp.adapters.MessageAdapter;
 import com.example.updateapp.databinding.FragmentChatbotBinding;
 import com.example.updateapp.models.MessageModel;
@@ -60,21 +61,21 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         binding.mic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(getContext(), "coming soon", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), getString(R.string.coming_soon), Toast.LENGTH_SHORT).show();
             }
         });
 
         binding.btnHistory.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(getContext(), "coming soon", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), getString(R.string.coming_soon), Toast.LENGTH_SHORT).show();
             }
         });
 
         binding.file.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(getContext(), "coming soon", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), getString(R.string.coming_soon), Toast.LENGTH_SHORT).show();
             }
         });
 
@@ -99,14 +100,14 @@ public void onResponse(String response) {
                     public void onError(Throwable throwable) {
                         if (getActivity() != null) {
                             getActivity().runOnUiThread(() -> {
-                                addToChat("Error: " + throwable.getMessage(), MessageModel.SENT_BY_BOT);
+                                addToChat(getString(R.string.error_message, throwable.getMessage()), MessageModel.SENT_BY_BOT);
                             });
                         }
                     }
                 });
             }
             else {
-                Toast.makeText(getContext(), "write something", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), getString(R.string.write_something), Toast.LENGTH_SHORT).show();
             }
         });
 
diff --git a/app/src/main/res/drawable/bg_language_item.xml b/app/src/main/res/drawable/bg_language_item.xml
new file mode 100644
index 0000000..620a5e1
--- /dev/null
+++ b/app/src/main/res/drawable/bg_language_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_language_item_selected.xml b/app/src/main/res/drawable/bg_language_item_selected.xml
new file mode 100644
index 0000000..1aaea5b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_language_item_selected.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/themeLightColor" />
+    <corners android:radius="12dp" />
+    <stroke
+        android:width="1.5dp"
+        android:color="@color/themeColor" />
+</shape>
diff --git a/app/src/main/res/layout/activity_forget.xml b/app/src/main/res/layout/activity_forget.xml
index 0a9947b..cb35f94 100644
--- a/app/src/main/res/layout/activity_forget.xml
+++ b/app/src/main/res/layout/activity_forget.xml
@@ -68,7 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:text="login"
+                android:text="@string/log_in"
                 android:textColor="#FF5722"
                 android:textStyle="bold"
                 app:layout_constraintStart_toEndOf="@+id/textView6"
diff --git a/app/src/main/res/layout/activity_language.xml b/app/src/main/res/layout/activity_language.xml
index 7d11fac..ba62c06 100644
--- a/app/src/main/res/layout/activity_language.xml
+++ b/app/src/main/res/layout/activity_language.xml
@@ -1,172 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ffffff"
+    android:background="@color/lang_bg_color">
 
-    >
-
-
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/rel_top"
         android:layout_width="match_parent"
-        android:layout_height="35dp">
+        android:layout_height="wrap_content"
+        android:background="@android:color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="4dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="8dp">
 
         <ImageView
             android:id="@+id/img_back"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_margin="5dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:contentDescription="@string/back"
             android:foreground="@drawable/ripple_effect"
-            android:gravity="center"
-            android:maxLines="1"
-            android:padding="5dp"
-            android:visibility="gone"
-            android:src="@drawable/ic_back_arrow" />
+            android:padding="8dp"
+            android:src="@drawable/ic_back_arrow"
+            android:visibility="gone" />
 
-
-
-        <TextView
-            android:id="@+id/txt_title"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center|start"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@+id/img_back"
-            android:layout_toStartOf="@+id/img_done"
-            android:text="@string/language"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="21sp"
-            >
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp">
 
-        </TextView>
+            <TextView
+                android:id="@+id/txt_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/select_language"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/txt_subtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/choose_language"
+                android:textColor="@color/textColor"
+                android:textSize="13sp" />
+        </LinearLayout>
 
         <ImageView
             android:id="@+id/img_done"
-            android:layout_width="50dp"
-            android:layout_height="25dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:padding="4dp"
-            android:layout_marginEnd="15dp"
-            android:src="@drawable/ic_done_24"
+            android:layout_width="48dp"
+            android:layout_height="32dp"
+            android:background="@drawable/bg_lang_done"
+            android:contentDescription="@string/done"
             android:foreground="@drawable/ripple_effect_rect"
-            android:background="@drawable/bg_lang_done">
-
-        </ImageView>
-
-
-    </RelativeLayout>
+            android:padding="4dp"
+            android:src="@drawable/ic_done_24" />
+    </LinearLayout>
 
-    <FrameLayout
-        android:layout_above="@+id/constrain_adview"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rev_language"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#F3F4F8"
-        android:layout_below="@+id/rel_top">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rev_langauge"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingTop="10dp"
-            android:paddingBottom="40dp">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <View
-            android:id="@+id/layout_ad_layer"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:visibility="gone"
-            android:layout_gravity="bottom"
-            android:background="@drawable/bg_black_tansparent" />
-
-    </FrameLayout>
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constrain_adview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#E1E7ED"
-        android:layout_alignParentBottom="true"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <RelativeLayout
-            android:id="@+id/rel_small_native_banner"
-            android:layout_width="match_parent"
-            android:layout_height="130dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/txt_ads_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:text="Advertisement Space"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                android:visibility="gone" />
-
-            <FrameLayout
-                android:id="@+id/frm_small_n_banner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/rel_native_big"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <FrameLayout
-                android:id="@+id/frame_text_space"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <Space
-                    android:id="@+id/space_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="60dp"
-                    android:layout_marginBottom="60dp" />
-
-                <TextView
-                    android:id="@+id/txt_big_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="Advertisement Space"
-                    android:textColor="@color/black"
-                    android:textSize="14sp"
-                    android:visibility="gone" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/fram_big_native"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</RelativeLayout>
\ No newline at end of file
+        android:layout_below="@id/rel_top"
+        android:clipToPadding="false"
+        android:paddingStart="12dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="24dp"
+        tools:listitem="@layout/item_language" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_new_update.xml b/app/src/main/res/layout/activity_new_update.xml
index 42b6bd7..a652dfd 100644
--- a/app/src/main/res/layout/activity_new_update.xml
+++ b/app/src/main/res/layout/activity_new_update.xml
@@ -31,7 +31,7 @@
             android:gravity="center_vertical"
             android:paddingTop="5dp"
             android:textStyle="bold"
-            android:text="Check what a new"
+            android:text="@string/check_new"
             android:textColor="@color/black"
             android:textSize="17sp">
 
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:gravity="center"
-                android:text="Advertisement Space"
+                android:text="@string/advertisement_space"
                 android:textColor="@color/black"
                 android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml
index a6f35b6..f9f90f6 100644
--- a/app/src/main/res/layout/activity_splash_screen.xml
+++ b/app/src/main/res/layout/activity_splash_screen.xml
@@ -88,7 +88,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:text="AI-Powered Expense\nManager App"
+        android:text="@string/splash_title"
         android:textStyle="bold"
         android:textColor="@color/black"
         android:textSize="32dp"
@@ -100,7 +100,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:text="Track, manage, and analyze your finances\neffortlessly with AI-driven insights"
+        android:text="@string/splash_subtitle"
         android:textSize="16sp"
         app:layout_constraintStart_toStartOf="@+id/textView3"
         app:layout_constraintTop_toBottomOf="@+id/textView3" />
diff --git a/app/src/main/res/layout/fragment_chatbot.xml b/app/src/main/res/layout/fragment_chatbot.xml
index 2d04a79..8cf8478 100644
--- a/app/src/main/res/layout/fragment_chatbot.xml
+++ b/app/src/main/res/layout/fragment_chatbot.xml
@@ -36,7 +36,7 @@
                 android:layout_marginEnd="100dp"
                 android:layout_toStartOf="@+id/mic"
                 android:layout_toEndOf="@+id/btnHistory"
-                android:text="Chatbot"
+                android:text="@string/chatbot"
                 android:layout_centerVertical="true"
                 android:singleLine="true"
                 android:textSize="20sp"
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
index e35f1a3..8a1aeb9 100644
--- a/app/src/main/res/layout/item_language.xml
+++ b/app/src/main/res/layout/item_language.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
+    android:layout_marginBottom="8dp"
+    android:background="@drawable/bg_language_item"
     android:foreground="?android:attr/selectableItemBackground"
-    android:paddingStart="20dp"
-    android:paddingTop="16dp"
-    android:paddingEnd="20dp"
-    android:paddingBottom="16dp">
+    android:paddingStart="16dp"
+    android:paddingTop="14dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="14dp">
 
     <TextView
         android:id="@+id/txt_language_name"
@@ -15,29 +17,21 @@
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_toStartOf="@+id/img_selected"
         android:layout_marginEnd="16dp"
-        android:text="English"
+        android:layout_toStartOf="@+id/img_selected"
+        android:fontFamily="sans-serif-medium"
         android:textColor="@color/black"
         android:textSize="16sp"
-        android:fontFamily="sans-serif-medium" />
+        tools:text="@string/lang_english" />
 
     <ImageView
         android:id="@+id/img_selected"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:contentDescription="@string/done"
         android:src="@drawable/ic_done_24"
-        android:tint="#4CAF50"
-        android:visibility="gone" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="-20dp"
-        android:layout_marginEnd="-20dp"
-        android:background="#F0F0F0" />
-
-</RelativeLayout>
\ No newline at end of file
+        android:tint="@color/themeColor"
+        android:visibility="invisible" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 6855283..3a72eb7 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -29,7 +29,8 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/send_message_back"
                 android:padding="10dp"
-                android:text="How can I assist you today?" />
+                android:text=""
+                tools:text="@string/chat_placeholder" />
         </LinearLayout>
 
         <ImageView
@@ -71,7 +72,8 @@
                 android:background="@drawable/send_message_back"
                 android:backgroundTint="#EFF6F5"
                 android:padding="10dp"
-                android:text="How can I assist you today?" />
+                android:text=""
+                tools:text="@string/chat_placeholder" />
         </LinearLayout>
 
         <ImageView
diff --git a/app/src/main/res/layout/slide.xml b/app/src/main/res/layout/slide.xml
index f2ead01..312805f 100644
--- a/app/src/main/res/layout/slide.xml
+++ b/app/src/main/res/layout/slide.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="Welcome to FinTrack"
+        android:text="@string/onboarding_title_1"
         android:textColor="@color/black"
         android:textSize="20sp"
         android:textStyle="bold"
@@ -35,7 +35,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:gravity="center"
-        android:text="Your all-in-one AI companion for smarter spending,\nbetter savings, and complete financial clarity."
+        android:text="@string/onboarding_subtitle_1"
         android:textColor="@color/dWhite"
         android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
index f1b9d1d..fa42888 100644
--- a/app/src/main/res/menu/bottom_menu.xml
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -3,10 +3,10 @@
     <item
         android:id="@+id/chatbot"
         android:icon="@drawable/ic_setting_unselected"
-        android:title="Chatbot"/>
+        android:title="@string/chatbot"/>
 
     <item
         android:id="@+id/accounts"
         android:icon="@drawable/ic_contacts_unselected"
-        android:title="Profile"/>
+        android:title="@string/profile"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b77608a..e519f96 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">اللغة</string>
     <string name="select_language">اختر اللغة</string>
+    <string name="choose_language">اختر اللغة التي تريد استخدامها</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">العودة إلى</string>
     <string name="forget_password_button">نسيت كلمة المرور</string>
     <string name="check_email">يرجى التحقق من بريدك الإلكتروني</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">اكتب شيئاً</string>
+    <string name="failed_save_user">فشل حفظ المستخدم: %1$s</string>
+    <string name="chatbot">روبوت الدردشة</string>
+    <string name="advertisement_space">مساحة إعلانية</string>
+    <string name="chat_placeholder">كيف يمكنني مساعدتك اليوم؟</string>
+    <string name="splash_title">تطبيق إدارة المصروفات\nبالذكاء الاصطناعي</string>
+    <string name="splash_subtitle">تتبع أموالك وأدرها وحلّلها\nبسهولة مع رؤى مدعومة بالذكاء الاصطناعي</string>
+    <string name="onboarding_title_1">مرحباً بك في FinTrack</string>
+    <string name="onboarding_title_2">تتبع • حلّل • حسّن</string>
+    <string name="onboarding_title_3">ابنِ عادات مالية أفضل</string>
+    <string name="onboarding_subtitle_1">رفيقك الذكي لإنفاق أذكى،\nوتوفير أفضل، ووضوح مالي كامل.</string>
+    <string name="onboarding_subtitle_2">افهم مصروفاتك عبر رسوم واضحة ورؤى ذكية وأنماط إنفاق فورية\nتبقيك مسيطراً.</string>
+    <string name="onboarding_subtitle_3">حدد الميزانيات، وابقَ منظماً، واتخذ قرارات مالية\nواثقة باستخدام روبوت الدردشة الذكي.</string>
+</resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index bd9a7c5..d75072e 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">ভাষা</string>
     <string name="select_language">ভাষা নির্বাচন করুন</string>
+    <string name="choose_language">আপনি যে ভাষা ব্যবহার করতে চান তা বেছে নিন</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">ফিরে যান</string>
     <string name="forget_password_button">পাসওয়ার্ড ভুলে গেছেন</string>
     <string name="check_email">অনুগ্রহ করে আপনার ইমেইল চেক করুন</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">কিছু লিখুন</string>
+    <string name="failed_save_user">ব্যবহারকারী সংরক্ষণ করতে ব্যর্থ: %1$s</string>
+    <string name="chatbot">চ্যাটবট</string>
+    <string name="advertisement_space">বিজ্ঞাপনের স্থান</string>
+    <string name="chat_placeholder">আজ আমি আপনাকে কীভাবে সাহায্য করতে পারি?</string>
+    <string name="splash_title">AI-চালিত খরচ\nব্যবস্থাপক অ্যাপ</string>
+    <string name="splash_subtitle">AI অন্তর্দৃষ্টি দিয়ে আপনার অর্থ সহজে\nট্র্যাক, পরিচালনা ও বিশ্লেষণ করুন</string>
+    <string name="onboarding_title_1">FinTrack-এ স্বাগতম</string>
+    <string name="onboarding_title_2">ট্র্যাক • বিশ্লেষণ • উন্নতি</string>
+    <string name="onboarding_title_3">ভালো অর্থ অভ্যাস গড়ুন</string>
+    <string name="onboarding_subtitle_1">স্মার্ট খরচ, ভালো সঞ্চয় এবং পূর্ণ আর্থিক স্বচ্ছতার জন্য আপনার অল-ইন-ওয়ান AI সঙ্গী।</string>
+    <string name="onboarding_subtitle_2">পরিষ্কার ভিজ্যুয়াল, স্মার্ট অন্তর্দৃষ্টি এবং রিয়েল-টাইম খরচের ধরন দিয়ে\nআপনার ব্যয় বুঝুন যা আপনাকে নিয়ন্ত্রণে রাখে।</string>
+    <string name="onboarding_subtitle_3">বাজেট সেট করুন, সংগঠিত থাকুন, এবং শক্তিশালী AI-চ্যাটবট দিয়ে\nআত্মবিশ্বাসের সাথে আর্থিক সিদ্ধান্ত নিন।</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d402f79..0a1b00b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">Idioma</string>
     <string name="select_language">Seleccionar idioma</string>
+    <string name="choose_language">Elige el idioma que quieres usar</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">Volver a</string>
     <string name="forget_password_button">OLVIDÉ MI CONTRASEÑA</string>
     <string name="check_email">Por Favor Revisa Tu Email</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">Escribe algo</string>
+    <string name="failed_save_user">No se pudo guardar el usuario: %1$s</string>
+    <string name="chatbot">Chatbot</string>
+    <string name="advertisement_space">Espacio publicitario</string>
+    <string name="chat_placeholder">¿Cómo puedo ayudarte hoy?</string>
+    <string name="splash_title">Gestor de gastos\ncon IA</string>
+    <string name="splash_subtitle">Controla, gestiona y analiza tus finanzas\nsin esfuerzo con información impulsada por IA</string>
+    <string name="onboarding_title_1">Bienvenido a FinTrack</string>
+    <string name="onboarding_title_2">Registra • Analiza • Mejora</string>
+    <string name="onboarding_title_3">Mejores hábitos con el dinero</string>
+    <string name="onboarding_subtitle_1">Tu compañero de IA para gastar mejor,\nahorrar más y tener claridad financiera.</string>
+    <string name="onboarding_subtitle_2">Entiende tus gastos con visuales claros, ideas inteligentes y patrones en tiempo real\nque te mantienen al control.</string>
+    <string name="onboarding_subtitle_3">Define presupuestos, organízate y toma decisiones financieras\ncon confianza usando el chatbot de IA.</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 76ceeb4..a3a0dd7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">Langue</string>
     <string name="select_language">Sélectionner la langue</string>
+    <string name="choose_language">Choisissez la langue que vous souhaitez utiliser</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">Retour à</string>
     <string name="forget_password_button">MOT DE PASSE OUBLIÉ</string>
     <string name="check_email">Veuillez Vérifier Votre Email</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">Écrivez quelque chose</string>
+    <string name="failed_save_user">Échec de l\'enregistrement de l\'utilisateur : %1$s</string>
+    <string name="chatbot">Chatbot</string>
+    <string name="advertisement_space">Espace publicitaire</string>
+    <string name="chat_placeholder">Comment puis-je vous aider aujourd\'hui ?</string>
+    <string name="splash_title">Gestionnaire de dépenses\nalimenté par l\'IA</string>
+    <string name="splash_subtitle">Suivez, gérez et analysez vos finances\nsans effort grâce à l\'IA</string>
+    <string name="onboarding_title_1">Bienvenue sur FinTrack</string>
+    <string name="onboarding_title_2">Suivre • Analyser • Améliorer</string>
+    <string name="onboarding_title_3">De meilleures habitudes d\'argent</string>
+    <string name="onboarding_subtitle_1">Votre compagnon IA pour dépenser plus intelligemment,\nmieux épargner et y voir clair.</string>
+    <string name="onboarding_subtitle_2">Comprenez vos dépenses avec des visuels clairs, des insights et des tendances en temps réel\npour rester maître de vos finances.</string>
+    <string name="onboarding_subtitle_3">Fixez des budgets, restez organisé et prenez des décisions financières\nen toute confiance avec le chatbot IA.</string>
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 780dcaf..36217e6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">भाषा</string>
     <string name="select_language">भाषा चुनें</string>
+    <string name="choose_language">वह भाषा चुनें जिसका आप उपयोग करना चाहते हैं</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">वापस जाएं</string>
     <string name="forget_password_button">पासवर्ड भूल गए</string>
     <string name="check_email">कृपया अपना ईमेल जांचें</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">कुछ लिखें</string>
+    <string name="failed_save_user">उपयोगकर्ता सहेजने में विफल: %1$s</string>
+    <string name="chatbot">चैटबॉट</string>
+    <string name="advertisement_space">विज्ञापन स्थान</string>
+    <string name="chat_placeholder">आज मैं आपकी कैसे मदद कर सकता हूँ?</string>
+    <string name="splash_title">AI-संचालित खर्च\nप्रबंधक ऐप</string>
+    <string name="splash_subtitle">AI अंतर्दृष्टि के साथ अपने वित्त को\nआसानी से ट्रैक, प्रबंधित और विश्लेषित करें</string>
+    <string name="onboarding_title_1">FinTrack में आपका स्वागत है</string>
+    <string name="onboarding_title_2">ट्रैक • विश्लेषण • सुधार</string>
+    <string name="onboarding_title_3">बेहतर पैसे की आदतें बनाएं</string>
+    <string name="onboarding_subtitle_1">समझदारी से खर्च, बेहतर बचत और पूरी वित्तीय स्पष्टता के लिए आपका ऑल-इन-वन AI साथी।</string>
+    <string name="onboarding_subtitle_2">साफ विज़ुअल, स्मार्ट अंतर्दृष्टि और रियल-टाइम खर्च पैटर्न से अपने खर्च को समझें\nजो आपको नियंत्रण में रखते हैं।</string>
+    <string name="onboarding_subtitle_3">बजट सेट करें, व्यवस्थित रहें, और शक्तिशाली AI-चैटबॉट टूल से\nआत्मविश्वास के साथ वित्तीय निर्णय लें।</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bc906cc..407e199 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">Idioma</string>
     <string name="select_language">Selecionar idioma</string>
+    <string name="choose_language">Escolha o idioma que deseja usar</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">Voltar para</string>
     <string name="forget_password_button">ESQUECI A SENHA</string>
     <string name="check_email">Por Favor Verifique Seu Email</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">Escreva algo</string>
+    <string name="failed_save_user">Falha ao salvar o usuário: %1$s</string>
+    <string name="chatbot">Chatbot</string>
+    <string name="advertisement_space">Espaço publicitário</string>
+    <string name="chat_placeholder">Como posso ajudar hoje?</string>
+    <string name="splash_title">Gestor de despesas\ncom IA</string>
+    <string name="splash_subtitle">Acompanhe, gerencie e analise suas finanças\nsem esforço com insights de IA</string>
+    <string name="onboarding_title_1">Bem-vindo ao FinTrack</string>
+    <string name="onboarding_title_2">Registrar • Analisar • Melhorar</string>
+    <string name="onboarding_title_3">Melhores hábitos com dinheiro</string>
+    <string name="onboarding_subtitle_1">Seu companheiro de IA para gastar melhor,\npoupar mais e ter clareza financeira.</string>
+    <string name="onboarding_subtitle_2">Entenda seus gastos com visuais claros, insights e padrões em tempo real\nque mantêm você no controle.</string>
+    <string name="onboarding_subtitle_3">Defina orçamentos, organize-se e tome decisões financeiras\ncom confiança usando o chatbot de IA.</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 61cd9fd..d596d67 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">Язык</string>
     <string name="select_language">Выберите язык</string>
+    <string name="choose_language">Выберите язык, который хотите использовать</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">Вернуться к</string>
     <string name="forget_password_button">ЗАБЫЛИ ПАРОЛЬ</string>
     <string name="check_email">Пожалуйста, Проверьте Ваш Email</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">Напишите что-нибудь</string>
+    <string name="failed_save_user">Не удалось сохранить пользователя: %1$s</string>
+    <string name="chatbot">Чат-бот</string>
+    <string name="advertisement_space">Рекламное место</string>
+    <string name="chat_placeholder">Чем могу помочь сегодня?</string>
+    <string name="splash_title">Приложение для учёта\nрасходов с ИИ</string>
+    <string name="splash_subtitle">Отслеживайте, управляйте и анализируйте финансы\nбез усилий с помощью ИИ</string>
+    <string name="onboarding_title_1">Добро пожаловать в FinTrack</string>
+    <string name="onboarding_title_2">Учёт • Анализ • Рост</string>
+    <string name="onboarding_title_3">Лучшие денежные привычки</string>
+    <string name="onboarding_subtitle_1">Ваш ИИ-помощник для разумных трат,\nлучшей экономии и полной финансовой ясности.</string>
+    <string name="onboarding_subtitle_2">Понимайте расходы с помощью наглядных графиков, умных подсказок и данных в реальном времени,\nчтобы всё держать под контролем.</string>
+    <string name="onboarding_subtitle_3">Задавайте бюджеты, будьте организованны и принимайте уверенные финансовые решения\nс помощью ИИ-чата.</string>
+</resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 8417a1e..3ca6948 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">زبان</string>
     <string name="select_language">زبان منتخب کریں</string>
+    <string name="choose_language">وہ زبان منتخب کریں جسے آپ استعمال کرنا چاہتے ہیں</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="back_to">واپس جائیں</string>
     <string name="forget_password_button">پاس ورڈ بھول گئے</string>
     <string name="check_email">براہ کرم اپنا ای میل چیک کریں</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">کچھ لکھیں</string>
+    <string name="failed_save_user">صارف محفوظ کرنے میں ناکامی: %1$s</string>
+    <string name="chatbot">چیٹ بوٹ</string>
+    <string name="advertisement_space">اشتہاری جگہ</string>
+    <string name="chat_placeholder">آج میں آپ کی کیسے مدد کر سکتا ہوں؟</string>
+    <string name="splash_title">AI سے چلنے والا خرچ\nمینیجر ایپ</string>
+    <string name="splash_subtitle">AI بصیرت کے ساتھ اپنے مالیات کو\nآسانی سے ٹریک، منظم اور تجزیہ کریں</string>
+    <string name="onboarding_title_1">FinTrack میں خوش آمدید</string>
+    <string name="onboarding_title_2">ٹریک • تجزیہ • بہتری</string>
+    <string name="onboarding_title_3">بہتر پیسے کی عادتیں بنائیں</string>
+    <string name="onboarding_subtitle_1">ہوشیار خرچ، بہتر بچت اور مکمل مالی وضاحت کے لیے آپ کا آل ان ون AI ساتھی۔</string>
+    <string name="onboarding_subtitle_2">صاف بصری، اسمارٹ بصیرت اور حقیقی وقت کے خرچ کے انداز سے اپنے اخراجات سمجھیں\nجو آپ کو کنٹرول میں رکھتے ہیں۔</string>
+    <string name="onboarding_subtitle_3">بجٹ مقرر کریں، منظم رہیں، اور طاقتور AI-چیٹ بوٹ سے\nاعتماد کے ساتھ مالی فیصلے کریں۔</string>
+</resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a9234f9..86bcd04 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -7,6 +7,7 @@
     <!-- Language Selection -->
     <string name="language">语言</string>
     <string name="select_language">选择语言</string>
+    <string name="choose_language">选择您要使用的语言</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -106,4 +107,17 @@
     <string name="otp_verification_failed">验证码验证失败</string>
     <string name="otp_error">验证码错误: %1$s</string>
     <string name="auth_error_user_not_found">身份验证错误：登录后未找到用户</string>
-</resources>
\ No newline at end of file
+    <string name="write_something">请输入内容</string>
+    <string name="failed_save_user">保存用户失败：%1$s</string>
+    <string name="chatbot">聊天机器人</string>
+    <string name="advertisement_space">广告位</string>
+    <string name="chat_placeholder">今天我能帮您什么？</string>
+    <string name="splash_title">AI 驱动的\n支出管理应用</string>
+    <string name="splash_subtitle">借助 AI 洞察，轻松跟踪、管理和分析您的财务</string>
+    <string name="onboarding_title_1">欢迎使用 FinTrack</string>
+    <string name="onboarding_title_2">记录 • 分析 • 改进</string>
+    <string name="onboarding_title_3">养成更好的理财习惯</string>
+    <string name="onboarding_subtitle_1">您的一站式 AI 助手，帮您更聪明地消费、\n更好地储蓄，并看清财务全貌。</string>
+    <string name="onboarding_subtitle_2">通过清晰图表、智能洞察和实时消费趋势\n了解支出，让一切尽在掌握。</string>
+    <string name="onboarding_subtitle_3">设定预算、保持条理，并借助强大的 AI 聊天工具\n自信地做出财务决策。</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 472e9d5..0940832 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <!-- Language Selection -->
     <string name="language">Language</string>
     <string name="select_language">Select Language</string>
+    <string name="choose_language">Choose the language you want to use</string>
     
     <!-- Language Names -->
     <string name="lang_english">English</string>
@@ -105,4 +106,17 @@
     <string name="back_to">Back to</string>
     <string name="forget_password_button">FORGET PASSWORD</string>
     <string name="check_email">Please Check Your Email</string>
+    <string name="write_something">Write something</string>
+    <string name="failed_save_user">Failed to save user: %1$s</string>
+    <string name="chatbot">Chatbot</string>
+    <string name="advertisement_space">Advertisement Space</string>
+    <string name="chat_placeholder">How can I assist you today?</string>
+    <string name="splash_title">AI-Powered Expense\nManager App</string>
+    <string name="splash_subtitle">Track, manage, and analyze your finances\neffortlessly with AI-driven insights</string>
+    <string name="onboarding_title_1">Welcome to FinTrack</string>
+    <string name="onboarding_title_2">Track • Analyze • Improve</string>
+    <string name="onboarding_title_3">Build Better Money Habits</string>
+    <string name="onboarding_subtitle_1">Your all-in-one AI companion for smarter spending,\nbetter savings, and complete financial clarity.</string>
+    <string name="onboarding_subtitle_2">Understand your expenses with clean visuals, smart insights, and real-time spending patterns\nthat keep you in control.</string>
+    <string name="onboarding_subtitle_3">Set budgets, stay organized, and make confident \nfinancial decisions with powerful AI-Chatbot tools.</string>
 </resources>
\ No newline at end of file