diff --git a/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt b/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
index 313dded..22744f9 100644
--- a/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
@@ -1,8 +1,8 @@
 package me.tangobee.weathernaut
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
-import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -22,6 +22,7 @@ import me.tangobee.weathernaut.utils.WeatherHelper
 import me.tangobee.weathernaut.viewmodels.WeatherViewModel
 import me.tangobee.weathernaut.viewmodels.WeatherViewModelFactory
 import java.net.UnknownHostException
+import java.util.Locale
 import kotlin.system.exitProcess
 
 class MainActivity : AppCompatActivity() {
@@ -59,11 +60,12 @@ class MainActivity : AppCompatActivity() {
 
         val settingsModel = SharedPreferencesHelper(this).getSettings()
         if(settingsModel?.isMusicOn != false) {
-            val startMusicIntent = Intent(this, WeatherMusicService::class.java)
+            var startMusicIntent = Intent(this, WeatherMusicService::class.java)
             startService(startMusicIntent)
         }
 
         fetchData()
+        setLanguage()
         splashScreen.setKeepOnScreenCondition { (weatherViewModel.weatherLiveData.value == null) }
 
         setContentView(binding.root)
@@ -96,7 +98,12 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-
+    private fun setLanguage(){
+        Locale.setDefault(Locale(sharedPreferencesHelper.getSettings()?.Language ?:""))
+        val config = Configuration()
+        config.locale = Locale(sharedPreferencesHelper.getSettings()?.Language ?:"")
+        resources.updateConfiguration(config, resources.displayMetrics)
+    }
     private fun createLocalDB(weatherData: WeatherData) {
         val currentSettings = sharedPreferencesHelper.getSettings()
         if (currentSettings != null) {
diff --git a/app/src/main/java/me/tangobee/weathernaut/models/SettingsModel.kt b/app/src/main/java/me/tangobee/weathernaut/models/SettingsModel.kt
index 4bba851..284115f 100644
--- a/app/src/main/java/me/tangobee/weathernaut/models/SettingsModel.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/models/SettingsModel.kt
@@ -4,5 +4,7 @@ data class SettingsModel(
     var tempUnit: String = "celsius",
     var windSpeedUnit: String = "kmh",
     var pressureUnit: String = "hpa",
-    var isMusicOn: Boolean = true
+    var isMusicOn: Boolean = true,
+    var Language: String= "",
+    var LanguageName: String=""
 )
\ No newline at end of file
diff --git a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
index 04dce3e..2b2bab4 100644
--- a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
@@ -1,9 +1,9 @@
 package me.tangobee.weathernaut.ui
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -12,6 +12,7 @@ import android.widget.ScrollView
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import me.tangobee.weathernaut.R
 import me.tangobee.weathernaut.constants.UnitsMapper
@@ -22,6 +23,8 @@ import me.tangobee.weathernaut.services.WeatherMusicService
 import me.tangobee.weathernaut.utils.SharedPreferencesHelper
 import me.tangobee.weathernaut.utils.WeatherHelper
 import me.tangobee.weathernaut.viewmodels.WeatherViewModel
+import java.util.Locale
+
 
 class SettingsFragment : Fragment() {
 
@@ -68,6 +71,7 @@ class SettingsFragment : Fragment() {
         binding.temperatureUnit.setOnClickListener {showTemperatureUnitPopup(binding.temperatureSpinner)}
         binding.windSpeedUnit.setOnClickListener {showWindSpeedUnitPopup(binding.windSpeedSpinner)}
         binding.atmosphericPressureUnit.setOnClickListener {showAtmosphericPressureUnitPopup(binding.atmosphericPressureSpinner)}
+        binding.weatherLanguageWrapper.setOnClickListener{showLanguagePopup(binding.languageSpinner)}
 
         binding.backButton.setOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
@@ -111,6 +115,7 @@ class SettingsFragment : Fragment() {
         binding.atmosphericPressureSpinner.text = UnitsMapper.getShorthandUnit(settingsModel.pressureUnit)
 
         binding.weatherMusicSwitch.setChecked(settingsModel.isMusicOn)
+        binding.languageSpinner.text=settingsModel.LanguageName
     }
 
     private fun weatherMusicToggle(musicFlag: Boolean) {
@@ -248,6 +253,52 @@ class SettingsFragment : Fragment() {
         popup.show()
     }
 
+    //language update
+    private fun showLanguagePopup(view: View) {
+        val popup = PopupMenu(requireContext(), view)
+        popup.inflate(R.menu.language_menu)
+        popup.setOnMenuItemClickListener { item: MenuItem? ->
+            when (item!!.itemId) {
+                R.id.english -> {
+                    binding.languageSpinner.text = item.title
+                    Locale.setDefault(Locale(""))
+                    val config = Configuration()
+                    config.locale = Locale("")
+                    resources.updateConfiguration(config, resources.displayMetrics)
+                    sharedPreferencesHelper.updateSettings {
+                        it.Language = ""
+                        it.LanguageName= item.title.toString()
+                        it
+                    }
+
+                    val currentSettings = sharedPreferencesHelper.getSettings()
+                    updateWeatherData(currentSettings)
+                }
+                R.id.hindi -> {
+                    binding.languageSpinner.text = item.title
+                    Locale.setDefault(Locale("hi"))
+                    val config = Configuration()
+                    config.locale = Locale("hi")
+                    resources.updateConfiguration(config, resources.displayMetrics)
+
+                    sharedPreferencesHelper.updateSettings {
+                        it.Language = "hi"
+                        it.LanguageName=item.title.toString()
+                        it
+                    }
+
+                    val currentSettings = sharedPreferencesHelper.getSettings()
+                    updateWeatherData(currentSettings)
+                }
+
+            }
+
+            true
+        }
+
+        popup.show()
+    }
+
     private fun updateWeatherData(currentSettings: SettingsModel?) {
         if(currentSettings != null) {
             val weatherHelper = WeatherHelper(currentSettings, weatherData)
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index b5c3900..a7b0e68 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".ui.SettingsFragment"
     android:background="@color/white"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:context=".ui.SettingsFragment">
 
     <ImageButton
         android:id="@+id/backButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/icon_back"
         android:backgroundTint="@android:color/transparent"
         android:contentDescription="@string/back_button"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:src="@drawable/icon_back"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/settings"
-        android:textSize="@dimen/_16ssp"
-        android:textColor="@color/textColor"
         android:fontFamily="@font/inter_medium"
         android:gravity="center"
+        android:text="@string/settings"
+        android:textColor="@color/textColor"
+        android:textSize="@dimen/_16ssp"
+        app:layout_constraintBottom_toBottomOf="@id/backButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/backButton"
-        app:layout_constraintBottom_toBottomOf="@id/backButton" />
+        app:layout_constraintTop_toTopOf="@id/backButton" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/backButton"
-        android:scrollbarSize="0dp">
+        android:scrollbarSize="0dp"
+        app:layout_constraintTop_toBottomOf="@id/backButton">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -46,53 +46,53 @@
                 android:id="@+id/unitLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/units"
                     android:fontFamily="@font/inter"
+                    android:text="@string/units"
+                    android:textAllCaps="true"
                     android:textColor="#9C9EAA"
-                    android:textSize="@dimen/_10ssp"
-                    android:textAllCaps="true"/>
+                    android:textSize="@dimen/_10ssp" />
 
                 <LinearLayout
                     android:id="@+id/temperatureUnit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/_5sdp"
                     android:clickable="true"
                     android:focusable="true"
                     android:foreground="?attr/selectableItemBackground"
-                    android:layout_marginTop="@dimen/_5sdp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
                     android:paddingVertical="@dimen/_15sdp"
-                    android:weightSum="2"
-                    android:gravity="center">
+                    android:weightSum="2">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/temperature_units"
+                        android:layout_weight="1"
                         android:fontFamily="@font/inter_medium"
+                        android:text="@string/temperature_units"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/_13ssp"
-                        android:layout_weight="1"/>
+                        android:textSize="@dimen/_13ssp" />
 
                     <TextView
                         android:id="@+id/temperatureSpinner"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:drawableEndCompat="@drawable/icon_dropdown"
-                        app:drawableTint="@color/placeholderColor"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
                         android:drawablePadding="@dimen/_5sdp"
+                        android:fontFamily="@font/inter"
+                        android:gravity="center|end"
                         android:text="@string/celsius"
                         android:textColor="@color/placeholderColor"
-                        android:fontFamily="@font/inter"
-                        android:layout_weight="1"
-                        android:layout_gravity="center"
-                        android:gravity="center|end" />
+                        app:drawableEndCompat="@drawable/icon_dropdown"
+                        app:drawableTint="@color/placeholderColor" />
 
                 </LinearLayout>
 
@@ -101,36 +101,36 @@
                     android:id="@+id/windSpeedUnit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:clickable="true"
                     android:focusable="true"
                     android:foreground="?attr/selectableItemBackground"
+                    android:gravity="center"
+                    android:orientation="horizontal"
                     android:paddingVertical="@dimen/_15sdp"
-                    android:weightSum="2"
-                    android:gravity="center">
+                    android:weightSum="2">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/wind_speed_units"
+                        android:layout_weight="1"
                         android:fontFamily="@font/inter_medium"
+                        android:text="@string/wind_speed_units"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/_13ssp"
-                        android:layout_weight="1"/>
+                        android:textSize="@dimen/_13ssp" />
 
                     <TextView
                         android:id="@+id/windSpeedSpinner"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:drawableEndCompat="@drawable/icon_dropdown"
-                        app:drawableTint="@color/placeholderColor"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
                         android:drawablePadding="@dimen/_5sdp"
+                        android:fontFamily="@font/inter"
+                        android:gravity="center|end"
                         android:text="@string/meters_per_second"
                         android:textColor="@color/placeholderColor"
-                        android:fontFamily="@font/inter"
-                        android:layout_weight="1"
-                        android:layout_gravity="center"
-                        android:gravity="center|end" />
+                        app:drawableEndCompat="@drawable/icon_dropdown"
+                        app:drawableTint="@color/placeholderColor" />
                 </LinearLayout>
 
 
@@ -138,36 +138,36 @@
                     android:id="@+id/atmosphericPressureUnit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:clickable="true"
                     android:focusable="true"
                     android:foreground="?attr/selectableItemBackground"
+                    android:gravity="center"
+                    android:orientation="horizontal"
                     android:paddingVertical="@dimen/_15sdp"
-                    android:weightSum="2"
-                    android:gravity="center">
+                    android:weightSum="2">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/atmospheric_pressure_units"
+                        android:layout_weight="1"
                         android:fontFamily="@font/inter_medium"
+                        android:text="@string/atmospheric_pressure_units"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/_13ssp"
-                        android:layout_weight="1"/>
+                        android:textSize="@dimen/_13ssp" />
 
                     <TextView
                         android:id="@+id/atmosphericPressureSpinner"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:drawableEndCompat="@drawable/icon_dropdown"
-                        app:drawableTint="@color/placeholderColor"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
                         android:drawablePadding="@dimen/_5sdp"
+                        android:fontFamily="@font/inter"
+                        android:gravity="center|end"
                         android:text="@string/hpa"
                         android:textColor="@color/placeholderColor"
-                        android:fontFamily="@font/inter"
-                        android:layout_weight="1"
-                        android:layout_gravity="center"
-                        android:gravity="center|end" />
+                        app:drawableEndCompat="@drawable/icon_dropdown"
+                        app:drawableTint="@color/placeholderColor" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -176,8 +176,8 @@
                 android:id="@+id/separator"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/_1sdp"
-                android:background="#EAEAEA"
                 android:layout_marginTop="@dimen/_25sdp"
+                android:background="#EAEAEA"
                 app:layout_constraintTop_toBottomOf="@+id/unitLayout" />
 
             <LinearLayout
@@ -185,48 +185,49 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/_25sdp"
-                app:layout_constraintTop_toBottomOf="@id/separator"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                app:layout_constraintTop_toBottomOf="@id/separator">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/other_settings"
                     android:fontFamily="@font/inter"
+                    android:text="@string/other_settings"
+                    android:textAllCaps="true"
                     android:textColor="#9C9EAA"
-                    android:textSize="@dimen/_10ssp"
-                    android:textAllCaps="true" />
+                    android:textSize="@dimen/_10ssp" />
 
                 <LinearLayout
                     android:id="@+id/weatherMusicWrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/_5sdp"
                     android:clickable="true"
                     android:focusable="true"
                     android:foreground="?attr/selectableItemBackground"
-                    android:layout_marginTop="@dimen/_5sdp"
+                    android:orientation="horizontal"
                     android:paddingVertical="@dimen/_15sdp"
                     android:weightSum="1">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_weight="1">
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/weather_music"
                             android:fontFamily="@font/inter_medium"
+                            android:text="@string/weather_music"
                             android:textColor="@color/black"
                             android:textSize="@dimen/_13ssp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/weather_music_desc"
                             android:fontFamily="@font/inter"
+                            android:text="@string/weather_music_desc"
                             android:textColor="#7A7A7B"
                             android:textSize="@dimen/_9ssp" />
                     </LinearLayout>
@@ -235,12 +236,62 @@
                         android:id="@+id/weatherMusicSwitch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
                         android:checked="true"
-                        app:switcher_off_color="#EAEAEA"
-                        app:switcher_on_color="@android:color/holo_green_light"
                         app:elevation="0dp"
+                        app:switcher_off_color="#EAEAEA"
+                        app:switcher_on_color="@android:color/holo_green_light" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/weatherLanguageWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_5sdp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:foreground="?attr/selectableItemBackground"
+                    android:orientation="horizontal"
+                    android:paddingVertical="@dimen/_15sdp"
+                    android:weightSum="1">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/inter_medium"
+                            android:text="@string/language"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/_13ssp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/inter"
+                            android:text="@string/weather_language_desc"
+                            android:textColor="#7A7A7B"
+                            android:textSize="@dimen/_9ssp" />
+                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/languageSpinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
                         android:layout_weight="1"
-                        android:layout_gravity="center" />
+                        android:drawablePadding="@dimen/_5sdp"
+                        android:fontFamily="@font/inter"
+                        android:gravity="center|end"
+                        android:text="@string/english"
+                        android:textColor="@color/placeholderColor"
+                        app:drawableEndCompat="@android:drawable/arrow_down_float"
+                        app:drawableTint="@color/placeholderColor" />
+
                 </LinearLayout>
 
             </LinearLayout>
@@ -250,8 +301,8 @@
                 android:id="@+id/separator1"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/_1sdp"
-                android:background="#EAEAEA"
                 android:layout_marginTop="@dimen/_25sdp"
+                android:background="#EAEAEA"
                 app:layout_constraintTop_toBottomOf="@+id/otherLayout" />
 
 
@@ -260,75 +311,75 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/_25sdp"
-                app:layout_constraintTop_toBottomOf="@id/separator1"
-                android:orientation="vertical" >
+                android:orientation="vertical"
+                app:layout_constraintTop_toBottomOf="@id/separator1">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/about_weathernaut"
                     android:fontFamily="@font/inter"
+                    android:text="@string/about_weathernaut"
+                    android:textAllCaps="true"
                     android:textColor="#9C9EAA"
-                    android:textSize="@dimen/_10ssp"
-                    android:textAllCaps="true"/>
+                    android:textSize="@dimen/_10ssp" />
 
                 <TextView
                     android:id="@+id/feedback"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableEndCompat="@drawable/icon_right_arrow"
-                    android:text="@string/feedback"
-                    android:fontFamily="@font/inter_medium"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/_13ssp"
+                    android:layout_marginTop="@dimen/_5sdp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:fontFamily="@font/inter_medium"
                     android:foreground="?attr/selectableItemBackground"
-                    android:layout_marginTop="@dimen/_5sdp"
-                    android:paddingVertical="@dimen/_15sdp" />
+                    android:paddingVertical="@dimen/_15sdp"
+                    android:text="@string/feedback"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_13ssp"
+                    app:drawableEndCompat="@drawable/icon_right_arrow" />
 
                 <TextView
                     android:id="@+id/privacyPolicy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableEndCompat="@drawable/icon_right_arrow"
-                    android:text="@string/privacy_policy"
-                    android:fontFamily="@font/inter_medium"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/_13ssp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:fontFamily="@font/inter_medium"
                     android:foreground="?attr/selectableItemBackground"
-                    android:paddingVertical="@dimen/_15sdp"/>
+                    android:paddingVertical="@dimen/_15sdp"
+                    android:text="@string/privacy_policy"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_13ssp"
+                    app:drawableEndCompat="@drawable/icon_right_arrow" />
 
                 <TextView
                     android:id="@+id/donation"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableEndCompat="@drawable/icon_right_arrow"
-                    android:text="@string/donate_us"
-                    android:fontFamily="@font/inter_medium"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/_13ssp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:fontFamily="@font/inter_medium"
                     android:foreground="?attr/selectableItemBackground"
-                    android:paddingVertical="@dimen/_15sdp"/>
+                    android:paddingVertical="@dimen/_15sdp"
+                    android:text="@string/donate_us"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_13ssp"
+                    app:drawableEndCompat="@drawable/icon_right_arrow" />
 
                 <TextView
                     android:id="@+id/credits"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableEndCompat="@drawable/icon_right_arrow"
-                    android:text="@string/credits"
-                    android:fontFamily="@font/inter_medium"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/_13ssp"
+                    android:layout_marginBottom="30dp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:fontFamily="@font/inter_medium"
                     android:foreground="?attr/selectableItemBackground"
                     android:paddingVertical="@dimen/_15sdp"
-                    android:layout_marginBottom="30dp"/>
+                    android:text="@string/credits"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_13ssp"
+                    app:drawableEndCompat="@drawable/icon_right_arrow" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/menu/language_menu.xml b/app/src/main/res/menu/language_menu.xml
new file mode 100644
index 0000000..b53d9fa
--- /dev/null
+++ b/app/src/main/res/menu/language_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/english"
+        android:title="@string/english"/>
+
+    <item
+        android:id="@+id/hindi"
+        android:title="@string/hindi"/>
+
+</menu>
\ 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
new file mode 100644
index 0000000..17c6c29
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Weathernaut</string>
+    <string name="weather_language_desc">कोई भी भाषा चुनें</string>
+    <string name="api_fetching_error">कुछ गड़बड़ हो गई! चिंता न करें, यह आप नहीं, हम हैं। बाद में प्रयास करें।</string>
+    <string name="no_internet">कोई इंटरनेट कनेक्शन नहीं</string>
+    <string name="search_cities_button">शहर खोजें बटन</string>
+    <string name="app_settings_button">ऐप सेटिंग बटन</string>
+    <string name="atmospheric_pressure_icon">वायुमंडलीय दबाव चिह्न</string>
+    <string name="back_button">पिछला बटन</string>
+    <string name="next_7_days">अगले 7 दिन</string>
+    <string name="tomorrow">कल</string>
+    <string name="weather_icon">मौसम चिह्न</string>
+    <string name="messages_header">संदेशों</string>
+    <string name="sync_header">साथ-साथ करना</string>
+    <string name="signature_title">आपका हस्ताक्षर</string>
+    <string name="sync_title">ईमेल को समय-समय पर सिंक करें</string>
+    <string name="attachment_title">आने वाले अनुलग्नकों को डाउनलोड करें</string>
+    <string name="pressure">दबाव</string>
+    <string name="wind_speed">हवा की गति</string>
+    <string name="humidity">नमी</string>
+    <string name="today">आज</string>
+    <string name="sunset_icon">सूर्यास्त आइकन</string>
+    <string name="sunrise_icon">सूर्योदय आइकन</string>
+    <string name="settings">सेटिंग्स</string>
+    <string name="units">इकाइयों</string>
+    <string name="temperature_units">तापमान इकाइयाँ</string>
+    <string name="wind_speed_units">पवन गति इकाइयाँ</string>
+    <string name="atmospheric_pressure_units">वायुमंडलीय दबाव इकाइयाँ</string>
+    <string name="weather_music_desc">मौसम के अनुसार संगीत.</string>
+    <string name="about_weathernaut">वेदरनॉट के बारे में</string>
+    <string name="feedback">प्रतिक्रिया</string>
+    <string name="privacy_policy">गोपनीयता नीति</string>
+    <string name="credits">क्रेडिट</string>
+    <string name="other_settings">अन्य सेटिंग्स</string>
+    <string name="weather_music">मौसम संगीत</string>
+    <string name="donate_us">हमें दान करें</string>
+    <string name="cancel">रद्द करना</string>
+    <string name="search_your_city">अपना शहर खोजें</string>
+    <string name="country">देश</string>
+    <string name="city">शहर</string>
+    <string name="no_locations_found">कोई स्थान नहीं मिला</string>
+    <string name="loading">लोड हो रहा है…</string>
+    <string name="something_went_wrong">कुछ गलत हो गया!</string>
+    <string name="language">भाषा</string>
+    <string name="english">English</string>
+    <string name="hindi">Hindi</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 8c45fef..6fbb8a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">Weathernaut</string>
 
-    <string name="api_fetching_error">Something went wrong!\nDon\'t worry its not you, its us. Try later.</string>
     <string name="no_internet">No Internet Connection</string>
     <string name="search_cities_button">Search Cities Button</string>
     <string name="app_settings_button">App Settings Button</string>
@@ -16,15 +15,15 @@
 
     <!-- Messages Preferences -->
     <string name="signature_title">Your signature</string>
-    <string name="reply_title">Default reply action</string>
+    <string name="reply_title" translatable="false">Default reply action</string>
 
     <!-- Sync Preferences -->
     <string name="sync_title">Sync email periodically</string>
     <string name="attachment_title">Download incoming attachments</string>
-    <string name="attachment_summary_on">Automatically download attachments for incoming emails
+    <string name="attachment_summary_on" translatable="false">Automatically download attachments for incoming emails
     </string>
-    <string name="attachment_summary_off">Only download attachments when manually requested</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="attachment_summary_off" translatable="false">Only download attachments when manually requested</string>
+    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
     <string name="pressure">Pressure</string>
     <string name="wind_speed">Wind Speed</string>
     <string name="humidity">Humidity</string>
@@ -34,15 +33,15 @@
     <string name="settings">Settings</string>
     <string name="units">Units</string>
     <string name="temperature_units">Temperature units</string>
-    <string name="celsius">°C</string>
-    <string name="fahrenheit">°F</string>
+    <string name="celsius" translatable="false">°C</string>
+    <string name="fahrenheit" translatable="false">°F</string>
     <string name="wind_speed_units">Wind speed units</string>
-    <string name="hpa">hPa</string>
-    <string name="atm">atm</string>
+    <string name="hpa" translatable="false">hPa</string>
+    <string name="atm" translatable="false">atm</string>
     <string name="atmospheric_pressure_units">Atmospheric pressure units</string>
-    <string name="meters_per_second">m/s</string>
-    <string name="kilometers_per_hour">km/h</string>
-    <string name="miles_per_hour">mph</string>
+    <string name="meters_per_second" translatable="false">m/s</string>
+    <string name="kilometers_per_hour" translatable="false">km/h</string>
+    <string name="miles_per_hour" translatable="false">mph</string>
     <string name="weather_music_desc">Music according to the weather.</string>
     <string name="about_weathernaut">About Weathernaut</string>
     <string name="feedback">Feedback</string>
@@ -53,10 +52,21 @@
     <string name="donate_us">Donate Us</string>
     <string name="cancel">Cancel</string>
     <string name="search_your_city">Search Your City</string>
-    <string name="add_remove_button">Add remove button</string>
+    <string name="add_remove_button" translatable="false">Add remove button</string>
     <string name="country">Country</string>
     <string name="city">City</string>
     <string name="no_locations_found">No locations found</string>
     <string name="loading">Loading…</string>
     <string name="something_went_wrong">Something went wrong!</string>
+    <string name="language">Language</string>
+    <string name="weather_language_desc">Select any language</string>
+    <string name="api_fetching_error">Something went wrong! Don\'t worry its not you, its us. Try later.</string>
+    <string name="english">English</string>
+    <string name="hindi">Hindi</string>
+
+    <!--    languages -->
+    <string-array name="Languages">
+        <item>English</item>
+        <item>Hindi</item>
+    </string-array>
 </resources>
\ No newline at end of file