diff --git a/client/src/pages/Devices.jsx b/client/src/pages/Devices.jsx
index f7d0521..4a379b7 100644
--- a/client/src/pages/Devices.jsx
+++ b/client/src/pages/Devices.jsx
@@ -530,7 +530,7 @@ const Devices = () => {
                     onClick={() => handleViewOnMap(selectedDevice)}
                     className="flex-1 bg-primary-100 text-primary-700 py-2 px-3 rounded hover:bg-primary-200 transition-colors text-sm font-medium"
                   >
-                    View on Map
+                    {t('devices.viewOnMap')}
                   </button>
                 )}
                 
@@ -538,7 +538,7 @@ const Devices = () => {
                   onClick={() => setShowDetailsModal(false)}
                   className="flex-1 bg-gray-100 text-gray-700 py-2 px-3 rounded hover:bg-gray-200 transition-colors text-sm font-medium"
                 >
-                  Close
+                  {t('devices.close')}
                 </button>
               </div>
             </div>
diff --git a/client/src/pages/MapView.jsx b/client/src/pages/MapView.jsx
index f5ddff8..48393fa 100644
--- a/client/src/pages/MapView.jsx
+++ b/client/src/pages/MapView.jsx
@@ -610,25 +610,25 @@ const MapView = () => {
           
           {/* Map Legend - Fixed positioning and visibility */}
           <div className="absolute bottom-4 left-4 bg-white rounded-lg p-3 shadow-lg text-xs border border-gray-200 z-[1000] max-w-xs">
-            <div className="font-semibold mb-2 text-gray-800">Map Legend</div>
+            <div className="font-semibold mb-2 text-gray-800">{t('map.mapLegend')}</div>
             <div className="space-y-1.5">
               <div className="flex items-center space-x-2">
                 <div className="w-3 h-3 bg-green-500 rounded-full border border-green-600"></div>
-                <span className="text-gray-700">Device Online</span>
+                <span className="text-gray-700">{t('map.deviceOnline')}</span>
               </div>
               <div className="flex items-center space-x-2">
                 <div className="w-3 h-3 bg-red-500 rounded-full border border-red-600"></div>
-                <span className="text-gray-700">Device Detecting</span>
+                <span className="text-gray-700">{t('map.deviceDetecting')}</span>
               </div>
               <div className="flex items-center space-x-2">
                 <div className="w-3 h-3 bg-gray-500 rounded-full border border-gray-600"></div>
-                <span className="text-gray-700">Device Offline</span>
+                <span className="text-gray-700">{t('map.deviceOffline')}</span>
               </div>
               {showDroneDetections && (
                 <>
                   <div className="border-t border-gray-200 mt-2 pt-2">
-                    <div className="font-medium text-gray-800 mb-1">Drone Detection Rings:</div>
-                    <div className="text-xs text-gray-600 mb-2">Rings show estimated detection range based on RSSI</div>
+                    <div className="font-medium text-gray-800 mb-1">{t('map.droneDetectionRings')}:</div>
+                    <div className="text-xs text-gray-600 mb-2">{t('map.ringsDescription')}</div>
                   </div>
                   <div className="flex items-center space-x-2">
                     <div className="w-3 h-3 border-2 border-red-600 rounded-full bg-red-600 bg-opacity-10"></div>