diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index c4a93090..94df2e75 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -40,7 +40,14 @@
       "prompt": "Active Prompt",
       "deleteAllLabel": "Delete all Conversation",
       "deleteAllBtn": "Delete all",
-      "addNew": "Add New"
+      "addNew": "Add New",
+      "convHistory":"Conversational history",
+      "none":"None",
+      "low":"Low",
+      "medium":"Medium",
+      "high":"High",
+      "unlimited":"Unlimited",
+      "default":"default"
     },
     "documents": {
       "label": "Documents",
diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json
index 04e1bdfa..9ab6f8c4 100644
--- a/frontend/src/locale/es.json
+++ b/frontend/src/locale/es.json
@@ -40,7 +40,14 @@
       "prompt": "Prompt Activo",
       "deleteAllLabel": "Eliminar toda la Conversación",
       "deleteAllBtn": "Eliminar todo",
-      "addNew": "Agregar Nuevo"
+      "addNew": "Agregar Nuevo",
+      "convHistory":"Historia conversacional",
+      "none":"ninguno",
+      "low":"Bajo",
+      "medium":"Medio",
+      "high":"Alto",
+      "unlimited":"Ilimitado",
+      "default":"predeterminada"
     },
     "documents": {
       "label": "Documentos",
diff --git a/frontend/src/settings/General.tsx b/frontend/src/settings/General.tsx
index a7c5d01a..377f8c37 100644
--- a/frontend/src/settings/General.tsx
+++ b/frontend/src/settings/General.tsx
@@ -35,12 +35,12 @@ const General: React.FC = () => {
   ];
   const chunks = ['0', '2', '4', '6', '8', '10'];
   const token_limits = new Map([
-    [0, 'None'],
-    [100, 'Low'],
-    [1000, 'Medium'],
-    [2000, 'Default'],
-    [4000, 'High'],
-    [1e9, 'Unlimited'],
+    [0, t('settings.general.none')],
+    [100, t('settings.general.low')],
+    [1000, t('settings.general.medium')],
+    [2000, t('settings.general.default')],
+    [4000, t('settings.general.high')],
+    [1e9, t('settings.general.unlimited')],
   ]);
   const [prompts, setPrompts] = React.useState<
     { name: string; id: string; type: string }[]
@@ -126,7 +126,7 @@ const General: React.FC = () => {
       </div>
       <div className="mb-5">
         <p className="mb-2 font-bold text-jet dark:text-bright-gray">
-          Conversational history
+          {t('settings.general.convHistory')}
         </p>
         <Dropdown
           options={Array.from(token_limits, ([value, desc]) => ({