diff --git a/app/src/main/java/com/example/updateapp/UpdateApplication.java b/app/src/main/java/com/example/updateapp/UpdateApplication.java
index 71de640..42bab78 100644
--- a/app/src/main/java/com/example/updateapp/UpdateApplication.java
+++ b/app/src/main/java/com/example/updateapp/UpdateApplication.java
@@ -11,4 +11,10 @@ public class UpdateApplication extends Application {
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(LocaleHelper.onAttach(base, "en"));
     }
-}
\ No newline at end of file
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LocaleHelper.applyPersistedLocales(this);
+    }
+}
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..9f2417b 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,24 @@ 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.imgSelected.setContentDescription(
+                selected ? context.getString(R.string.selected_language) : null
+        );
+        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 +86,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..522c7aa 100644
--- a/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java
+++ b/app/src/main/java/com/example/updateapp/utils/LocaleHelper.java
@@ -4,7 +4,9 @@
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Build;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.os.LocaleListCompat;
 
 import java.util.Locale;
 
@@ -14,29 +16,44 @@ public class LocaleHelper {
     private static final String PREFS_NAME = "app_prefs";
 
     public static Context onAttach(Context context) {
-        String lang = getPersistedData(context, "en");
-        String country = getPersistedCountry(context, "");
-        return setLocale(context, lang, country);
+        return onAttach(context, "en");
     }
 
     public static Context onAttach(Context context, String defaultLanguage) {
         String lang = getPersistedData(context, defaultLanguage);
         String country = getPersistedCountry(context, "");
-        return setLocale(context, lang, country);
+        return wrap(context, lang, country);
     }
 
     public static String getLanguage(Context context) {
         return getPersistedData(context, "en");
     }
 
-    public static Context setLocale(Context context, String language, String country) {
-        persist(context, language, country);
+    public static String getCountry(Context context) {
+        return getPersistedCountry(context, "");
+    }
+
+    public static void applyPersistedLocales(Context context) {
+        applyAppLocales(getLanguage(context), getCountry(context));
+    }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            return updateResources(context, language, country);
+    public static Context setLocale(Context context, String language, String country) {
+        if (language == null || language.isEmpty()) {
+            language = "en";
         }
+        if (country == null || "en".equals(language)) {
+            country = "";
+        }
+        persist(context, language, country);
+        applyAppLocales(language, country);
+        return wrap(context, language, country);
+    }
 
-        return updateResourcesLegacy(context, language, country);
+    private static void applyAppLocales(String language, String country) {
+        String tag = (country == null || country.isEmpty())
+                ? language
+                : language + "-" + country;
+        AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(tag));
     }
 
     private static String getPersistedData(Context context, String defaultLanguage) {
@@ -53,11 +70,11 @@ 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.putString(SELECTED_COUNTRY, country == null ? "" : country);
         editor.apply();
     }
 
-    private static Context updateResources(Context context, String language, String country) {
+    private static Context wrap(Context context, String language, String country) {
         Locale locale;
         if (country != null && !country.isEmpty()) {
             locale = new Locale(language, country);
@@ -66,38 +83,10 @@ private static Context updateResources(Context context, String language, String
         }
         Locale.setDefault(locale);
 
-        Configuration configuration = context.getResources().getConfiguration();
+        Resources resources = context.getResources();
+        Configuration configuration = new Configuration(resources.getConfiguration());
         configuration.setLocale(locale);
         configuration.setLayoutDirection(locale);
-
         return context.createConfigurationContext(configuration);
     }
-
-    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);
-        }
-        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.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..cc6d30d 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
@@ -66,7 +66,7 @@ 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 +77,17 @@ 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);
+        boolean found = false;
         for (int i = 0; i < languageList.size(); i++) {
             if (languageList.get(i).getLanguageCode().equals(currentLanguage)) {
                 languageList.get(i).setSelected(true);
                 selectedPosition = i;
+                found = true;
                 break;
             }
         }
-        
-        // If no match found, default to English (position 0)
-        if (selectedPosition == 0 && !currentLanguage.equals("en")) {
+        if (!found) {
             languageList.get(0).setSelected(true);
             selectedPosition = 0;
         }
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..e2db30b 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
@@ -183,15 +183,15 @@ private void verifyCredential(PhoneAuthCredential credential) {
                                     dialog.dismiss();
 
                                     Exception e = linkTask.getException();
-                                    String msg = e != null ? e.getMessage() : "Unknown linking error";
+                                    String msg = e != null ? e.getMessage() : getString(R.string.unknown_linking_error);
 
                                     if (e instanceof FirebaseAuthUserCollisionException) {
                                         Toast.makeText(OTPActivity.this,
-                                                "This email is already registered with a different account. Please login with that email or use another email.",
+                                                getString(R.string.email_already_registered_different),
                                                 Toast.LENGTH_LONG).show();
                                     } else {
                                         Toast.makeText(OTPActivity.this,
-                                                "Failed to link email: " + msg,
+                                                getString(R.string.failed_to_link_email, msg),
                                                 Toast.LENGTH_LONG).show();
                                     }
                                 }
@@ -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_to_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..f4ef31e 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
@@ -60,21 +60,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(com.example.updateapp.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(com.example.updateapp.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(com.example.updateapp.R.string.coming_soon), Toast.LENGTH_SHORT).show();
             }
         });
 
@@ -99,14 +99,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(com.example.updateapp.R.string.error_message, throwable.getMessage()), MessageModel.SENT_BY_BOT);
                             });
                         }
                     }
                 });
             }
             else {
-                Toast.makeText(getContext(), "write something", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), getString(com.example.updateapp.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..72f8eca 100644
--- a/app/src/main/res/layout/activity_language.xml
+++ b/app/src/main/res/layout/activity_language.xml
@@ -57,6 +57,7 @@
             android:padding="4dp"
             android:layout_marginEnd="15dp"
             android:src="@drawable/ic_done_24"
+            android:contentDescription="@string/done"
             android:foreground="@drawable/ripple_effect_rect"
             android:background="@drawable/bg_lang_done">
 
@@ -115,7 +116,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"
                 android:visibility="gone" />
@@ -154,7 +155,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:text="Advertisement Space"
+                    android:text="@string/advertisement_space"
                     android:textColor="@color/black"
                     android:textSize="14sp"
                     android:visibility="gone" />
diff --git a/app/src/main/res/layout/activity_new_update.xml b/app/src/main/res/layout/activity_new_update.xml
index 42b6bd7..76ebadc 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_whats_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..c2b357d 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"
@@ -90,7 +90,7 @@
             android:layout_height="wrap_content"
             android:minHeight="35dp"
             android:maxHeight="100dp"
-            android:hint="Message ..."
+            android:hint="@string/message_hint"
             android:padding="10dp"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
index e35f1a3..0e4d02d 100644
--- a/app/src/main/res/layout/item_language.xml
+++ b/app/src/main/res/layout/item_language.xml
@@ -17,7 +17,7 @@
         android:layout_centerVertical="true"
         android:layout_toStartOf="@+id/img_selected"
         android:layout_marginEnd="16dp"
-        android:text="English"
+        android:text="@string/lang_english"
         android:textColor="@color/black"
         android:textSize="16sp"
         android:fontFamily="sans-serif-medium" />
@@ -28,6 +28,7 @@
         android:layout_height="24dp"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:contentDescription="@string/selected_language"
         android:src="@drawable/ic_done_24"
         android:tint="#4CAF50"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 6855283..bf8830a 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/send_message_back"
                 android:padding="10dp"
-                android:text="How can I assist you today?" />
+                android:text="@string/how_can_i_assist" />
         </LinearLayout>
 
         <ImageView
@@ -71,7 +71,7 @@
                 android:background="@drawable/send_message_back"
                 android:backgroundTint="#EFF6F5"
                 android:padding="10dp"
-                android:text="How can I assist you today?" />
+                android:text="@string/how_can_i_assist" />
         </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..bea769d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -106,4 +106,25 @@
     <string name="back_to">العودة إلى</string>
     <string name="forget_password_button">نسيت كلمة المرور</string>
     <string name="check_email">يرجى التحقق من بريدك الإلكتروني</string>
+
+    <string name="chatbot">الدردشة</string>
+    <string name="message_hint">رسالة ...</string>
+    <string name="write_something">اكتب شيئاً</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">افهم مصروفاتك برسوم واضحة ورؤى ذكية.</string>
+    <string name="onboarding_subtitle_3">حدد الميزانيات ونظّم قراراتك مع روبوت الدردشة.</string>
+    <string name="advertisement_space">مساحة إعلانية</string>
+    <string name="check_whats_new">اطلع على الجديد</string>
+    <string name="how_can_i_assist">كيف يمكنني مساعدتك اليوم؟</string>
+    <string name="email_already_registered_different">هذا البريد مسجّل بحساب آخر. سجّل الدخول به أو استخدم بريداً آخر.</string>
+    <string name="failed_to_link_email">تعذر ربط البريد: %1$s</string>
+    <string name="failed_to_save_user">تعذر حفظ بيانات المستخدم: %1$s</string>
+    <string name="unknown_linking_error">خطأ ربط غير معروف</string>
+    <string name="selected_language">اللغة المحددة</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index bd9a7c5..68f90ae 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -106,4 +106,25 @@
     <string name="back_to">ফিরে যান</string>
     <string name="forget_password_button">পাসওয়ার্ড ভুলে গেছেন</string>
     <string name="check_email">অনুগ্রহ করে আপনার ইমেইল চেক করুন</string>
+
+    <string name="chatbot">চ্যাটবট</string>
+    <string name="message_hint">বার্তা ...</string>
+    <string name="write_something">কিছু লিখুন</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">পরিষ্কার ভিজ্যুয়াল ও স্মার্ট ইনসাইট দিয়ে খরচ বুঝুন।</string>
+    <string name="onboarding_subtitle_3">বাজেট ঠিক করুন এবং এআই চ্যাটবট দিয়ে সিদ্ধান্ত নিন।</string>
+    <string name="advertisement_space">বিজ্ঞাপনের স্থান</string>
+    <string name="check_whats_new">নতুন কী দেখুন</string>
+    <string name="how_can_i_assist">আজ আমি কীভাবে সাহায্য করতে পারি?</string>
+    <string name="email_already_registered_different">এই ইমেইল অন্য অ্যাকাউন্টে নিবন্ধিত। সেই ইমেইল দিয়ে লগইন করুন বা অন্য ইমেইল ব্যবহার করুন।</string>
+    <string name="failed_to_link_email">ইমেইল লিঙ্ক করা যায়নি: %1$s</string>
+    <string name="failed_to_save_user">ব্যবহারকারীর তথ্য সংরক্ষণ যায়নি: %1$s</string>
+    <string name="unknown_linking_error">অজানা লিঙ্ক ত্রুটি</string>
+    <string name="selected_language">নির্বাচিত ভাষা</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d402f79..6582af9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -106,4 +106,25 @@
     <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>
+
+    <string name="chatbot">Chatbot</string>
+    <string name="message_hint">Mensaje ...</string>
+    <string name="write_something">Escribe algo</string>
+    <string name="splash_title">App de gastos\ncon IA</string>
+    <string name="splash_subtitle">Controla, gestiona y analiza tus finanzas\ncon información impulsada por IA</string>
+    <string name="onboarding_title_1">Bienvenido a FinTrack</string>
+    <string name="onboarding_title_2">Controla • 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 ver tus finanzas con claridad.</string>
+    <string name="onboarding_subtitle_2">Entiende tus gastos con gráficos claros,\ninsights y patrones en tiempo real.</string>
+    <string name="onboarding_subtitle_3">Define presupuestos, organízate y decide\ncon el chatbot de IA.</string>
+    <string name="advertisement_space">Espacio publicitario</string>
+    <string name="check_whats_new">Ver novedades</string>
+    <string name="how_can_i_assist">¿Cómo puedo ayudarte hoy?</string>
+    <string name="email_already_registered_different">Este correo ya está registrado en otra cuenta. Inicia sesión con ese correo o usa otro.</string>
+    <string name="failed_to_link_email">No se pudo vincular el correo: %1$s</string>
+    <string name="failed_to_save_user">No se pudieron guardar los datos: %1$s</string>
+    <string name="unknown_linking_error">Error de vinculación desconocido</string>
+    <string name="selected_language">Idioma seleccionado</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 76ceeb4..bd05f49 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -106,4 +106,25 @@
     <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>
+
+    <string name="chatbot">Chatbot</string>
+    <string name="message_hint">Message ...</string>
+    <string name="write_something">Écrivez quelque chose</string>
+    <string name="splash_title">Application de dépenses\npropulsée par l\'IA</string>
+    <string name="splash_subtitle">Suivez, gérez et analysez vos finances\navec des insights 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 malin\net voir vos finances clairement.</string>
+    <string name="onboarding_subtitle_2">Comprenez vos dépenses avec des visuels clairs\net des insights en temps réel.</string>
+    <string name="onboarding_subtitle_3">Fixez des budgets et décidez sereinement\navec le chatbot IA.</string>
+    <string name="advertisement_space">Espace publicitaire</string>
+    <string name="check_whats_new">Voir les nouveautés</string>
+    <string name="how_can_i_assist">Comment puis-je vous aider aujourd\'hui ?</string>
+    <string name="email_already_registered_different">Cet e-mail est déjà lié à un autre compte. Connectez-vous avec cet e-mail ou utilisez-en un autre.</string>
+    <string name="failed_to_link_email">Impossible de lier l\'e-mail : %1$s</string>
+    <string name="failed_to_save_user">Impossible d\'enregistrer les données : %1$s</string>
+    <string name="unknown_linking_error">Erreur de liaison inconnue</string>
+    <string name="selected_language">Langue sélectionnée</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 780dcaf..a7217e5 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -106,4 +106,25 @@
     <string name="back_to">वापस जाएं</string>
     <string name="forget_password_button">पासवर्ड भूल गए</string>
     <string name="check_email">कृपया अपना ईमेल जांचें</string>
+
+    <string name="chatbot">चैटबॉट</string>
+    <string name="message_hint">संदेश ...</string>
+    <string name="write_something">कुछ लिखें</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>
+    <string name="advertisement_space">विज्ञापन स्थान</string>
+    <string name="check_whats_new">नया क्या है देखें</string>
+    <string name="how_can_i_assist">आज मैं आपकी कैसे मदद कर सकता हूँ?</string>
+    <string name="email_already_registered_different">यह ईमेल किसी दूसरे खाते से जुड़ा है। कृपया उसी ईमेल से लॉगिन करें या दूसरा ईमेल उपयोग करें।</string>
+    <string name="failed_to_link_email">ईमेल लिंक नहीं हो सका: %1$s</string>
+    <string name="failed_to_save_user">उपयोगकर्ता डेटा सहेजा नहीं जा सका: %1$s</string>
+    <string name="unknown_linking_error">अज्ञात लिंक त्रुटि</string>
+    <string name="selected_language">चयनित भाषा</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 bc906cc..135a9d7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -106,4 +106,25 @@
     <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>
+
+    <string name="chatbot">Chatbot</string>
+    <string name="message_hint">Mensagem ...</string>
+    <string name="write_something">Escreva algo</string>
+    <string name="splash_title">App de despesas\ncom IA</string>
+    <string name="splash_subtitle">Acompanhe, gerencie e analise suas finanças\ncom insights de IA</string>
+    <string name="onboarding_title_1">Bem-vindo ao FinTrack</string>
+    <string name="onboarding_title_2">Acompanhe • Analise • Melhore</string>
+    <string name="onboarding_title_3">Melhores hábitos com dinheiro</string>
+    <string name="onboarding_subtitle_1">Seu companheiro de IA para gastar melhor\ne ver as finanças com clareza.</string>
+    <string name="onboarding_subtitle_2">Entenda seus gastos com visuais claros\ne insights em tempo real.</string>
+    <string name="onboarding_subtitle_3">Defina orçamentos e decida com confiança\ncom o chatbot de IA.</string>
+    <string name="advertisement_space">Espaço publicitário</string>
+    <string name="check_whats_new">Veja as novidades</string>
+    <string name="how_can_i_assist">Como posso ajudar hoje?</string>
+    <string name="email_already_registered_different">Este e-mail já está em outra conta. Entre com esse e-mail ou use outro.</string>
+    <string name="failed_to_link_email">Falha ao vincular o e-mail: %1$s</string>
+    <string name="failed_to_save_user">Falha ao salvar os dados: %1$s</string>
+    <string name="unknown_linking_error">Erro de vinculação desconhecido</string>
+    <string name="selected_language">Idioma selecionado</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 61cd9fd..d6e4ee6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -106,4 +106,25 @@
     <string name="back_to">Вернуться к</string>
     <string name="forget_password_button">ЗАБЫЛИ ПАРОЛЬ</string>
     <string name="check_email">Пожалуйста, Проверьте Ваш Email</string>
+
+    <string name="chatbot">Чат-бот</string>
+    <string name="message_hint">Сообщение ...</string>
+    <string name="write_something">Напишите что-нибудь</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>
+    <string name="advertisement_space">Рекламное место</string>
+    <string name="check_whats_new">Что нового</string>
+    <string name="how_can_i_assist">Чем я могу помочь сегодня?</string>
+    <string name="email_already_registered_different">Эта почта уже привязана к другому аккаунту. Войдите с ней или используйте другую.</string>
+    <string name="failed_to_link_email">Не удалось привязать почту: %1$s</string>
+    <string name="failed_to_save_user">Не удалось сохранить данные: %1$s</string>
+    <string name="unknown_linking_error">Неизвестная ошибка привязки</string>
+    <string name="selected_language">Выбранный язык</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 8417a1e..38a0358 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -106,4 +106,25 @@
     <string name="back_to">واپس جائیں</string>
     <string name="forget_password_button">پاس ورڈ بھول گئے</string>
     <string name="check_email">براہ کرم اپنا ای میل چیک کریں</string>
+
+    <string name="chatbot">چیٹ بوٹ</string>
+    <string name="message_hint">پیغام ...</string>
+    <string name="write_something">کچھ لکھیں</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">صاف بصری اور سمارٹ بصیرت سے اپنے اخراجات سمجھیں۔</string>
+    <string name="onboarding_subtitle_3">بجٹ طے کریں اور اے آئی چیٹ بوٹ سے فیصلے کریں۔</string>
+    <string name="advertisement_space">اشتہاری جگہ</string>
+    <string name="check_whats_new">نیا کیا ہے دیکھیں</string>
+    <string name="how_can_i_assist">آج میں آپ کی کیسے مدد کر سکتا ہوں؟</string>
+    <string name="email_already_registered_different">یہ ای میل دوسرے اکاؤنٹ سے منسلک ہے۔ اسی ای میل سے لاگ ان کریں یا دوسری استعمال کریں۔</string>
+    <string name="failed_to_link_email">ای میل منسلک نہیں ہو سکی: %1$s</string>
+    <string name="failed_to_save_user">یوزر ڈیٹا محفوظ نہیں ہو سکا: %1$s</string>
+    <string name="unknown_linking_error">نامعلوم لنک خرابی</string>
+    <string name="selected_language">منتخب زبان</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 a9234f9..967b167 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -106,4 +106,25 @@
     <string name="otp_verification_failed">验证码验证失败</string>
     <string name="otp_error">验证码错误: %1$s</string>
     <string name="auth_error_user_not_found">身份验证错误：登录后未找到用户</string>
+
+    <string name="chatbot">聊天机器人</string>
+    <string name="message_hint">消息 ...</string>
+    <string name="write_something">请输入内容</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 助手。</string>
+    <string name="onboarding_subtitle_2">用清晰图表、智能洞察和实时支出模式掌控财务。</string>
+    <string name="onboarding_subtitle_3">设定预算、保持条理，并用 AI 聊天工具自信决策。</string>
+    <string name="advertisement_space">广告位</string>
+    <string name="check_whats_new">查看新内容</string>
+    <string name="how_can_i_assist">今天我能为你做什么？</string>
+    <string name="email_already_registered_different">该邮箱已注册到其他账户。请用该邮箱登录或换一个邮箱。</string>
+    <string name="failed_to_link_email">无法关联邮箱：%1$s</string>
+    <string name="failed_to_save_user">无法保存用户数据：%1$s</string>
+    <string name="unknown_linking_error">未知关联错误</string>
+    <string name="selected_language">已选语言</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 472e9d5..63b7d66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,4 +105,23 @@
     <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="chatbot">Chatbot</string>
+    <string name="message_hint">Message ...</string>
+    <string name="write_something">Write something</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>
+    <string name="advertisement_space">Advertisement Space</string>
+    <string name="check_whats_new">Check what\'s new</string>
+    <string name="how_can_i_assist">How can I assist you today?</string>
+    <string name="email_already_registered_different">This email is already registered with a different account. Please login with that email or use another email.</string>
+    <string name="failed_to_link_email">Failed to link email: %1$s</string>
+    <string name="failed_to_save_user">Failed to save user data: %1$s</string>
+    <string name="unknown_linking_error">Unknown linking error</string>
+    <string name="selected_language">Selected language</string>
 </resources>
\ No newline at end of file