diff --git a/src/backend/looped/hud/hud_color_override.cpp b/src/backend/looped/hud/hud_color_override.cpp
index b2f5137a..d5f97451 100644
--- a/src/backend/looped/hud/hud_color_override.cpp
+++ b/src/backend/looped/hud/hud_color_override.cpp
@@ -41,5 +41,5 @@ namespace big
 		}
 	};
 
-	hudcolor g_hudcolor_looped("hudcolor", "Override HUD Color", "Override HUD colors", g.self.hud.color_override);
+	hudcolor g_hudcolor_looped("hudcolor", "OVERRIDE_HUD_COLOR", "OVERRIDE_HUD_COLOR_DESC", g.self.hud.color_override);
 }
diff --git a/src/backend/looped/world/nearby/auto_disarm.cpp b/src/backend/looped/world/nearby/auto_disarm.cpp
index 24040598..88dd3f96 100644
--- a/src/backend/looped/world/nearby/auto_disarm.cpp
+++ b/src/backend/looped/world/nearby/auto_disarm.cpp
@@ -11,7 +11,7 @@ namespace big
 
 		virtual void on_enable() override
 		{
-			g_notification_service.push("Auto disarm", "Nearby hostile peds will be disarmed");
+			g_notification_service.push("VIEW_WORLD_AUTO_DISARM"_T.data(), "VIEW_WORLD_AUTO_DISARM_NOTIFY"_T.data());
 		}
 
 		virtual void on_tick() override
diff --git a/src/hooks/info/get_network_event_data.cpp b/src/hooks/info/get_network_event_data.cpp
index 1de4f8ef..435c468f 100644
--- a/src/hooks/info/get_network_event_data.cpp
+++ b/src/hooks/info/get_network_event_data.cpp
@@ -64,7 +64,7 @@ namespace big
 				g_fiber_pool->queue_job([] {
 					session::join_session(gta_util::get_network()->m_last_joined_session.m_session_info);
 				});
-				g_notification_service.push_warning("KICKED"_T.data(), "You have been desync kicked. Rejoining previous session..."); // TODO: add to translations
+				g_notification_service.push_warning("KICKED"_T.data(), "USER_DESYNC_KICKED_REJOIN"_T.data());
 			}
 			else
 			{
diff --git a/src/hooks/protections/receive_pickup.cpp b/src/hooks/protections/receive_pickup.cpp
index 000c4737..6492d6ec 100644
--- a/src/hooks/protections/receive_pickup.cpp
+++ b/src/hooks/protections/receive_pickup.cpp
@@ -6,7 +6,7 @@ namespace big
 	{
 		if (g.protections.receive_pickup)
 		{
-			g_notification_service.push_error("PROTECTIONS"_T.data(), "Blocked pickup");
+			g_notification_service.push_error("PROTECTIONS"_T.data(), "BLOCKED_PICKUP"_T.data());
 			return false;
 		}
 
diff --git a/src/services/player_database/player_database_service.cpp b/src/services/player_database/player_database_service.cpp
index 60047143..2a90e800 100644
--- a/src/services/player_database/player_database_service.cpp
+++ b/src/services/player_database/player_database_service.cpp
@@ -9,7 +9,7 @@
 
 namespace big
 {
-	bool_command g_player_db_auto_update_online_states("player_db_auto_update_states", "Auto Update Tracked Player States", "Toggling this feature will automatically update the tracked players' online states every minute. You must enable this for join redirect to work",
+	bool_command g_player_db_auto_update_online_states("player_db_auto_update_states", "AUTO_UPDATE_STATES", "AUTO_UPDATE_STATES_DESC",
 	    g.player_db.update_player_online_states);
 
 	const char* player_database_service::get_name_by_content_id(const std::string& content_id)
diff --git a/src/services/squad_spawner/squad_spawner.cpp b/src/services/squad_spawner/squad_spawner.cpp
index 9caa0984..182e22c3 100644
--- a/src/services/squad_spawner/squad_spawner.cpp
+++ b/src/services/squad_spawner/squad_spawner.cpp
@@ -153,7 +153,7 @@ namespace big
 		static auto reset_spawn_pos_to_offset = [&]() -> void {
 			Ped player_ped_handle = g_pointers->m_gta.m_ptr_to_handle(s.target->get_ped());
 			s.m_spawn_pos         = ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(player_ped_handle, 0, -7, 0);
-			g_notification_service.push_warning("Squad Spawner", "No suitable spot found, spawning at an offset");
+			g_notification_service.push_warning("GUI_TAB_SQUAD_SPAWNER"_T.data(), "SQUAD_SPAWNER_NO_SPOT_FOUND"_T.data());
 		};
 
 		static auto is_pos_valid = [&]() -> bool {
@@ -206,7 +206,7 @@ namespace big
 
 		if (!s.target->get_net_game_player() || s.m_squad_size < 1 || !STREAMING::IS_MODEL_VALID(rage::joaat(s.m_ped_model)))
 		{
-			g_notification_service.push_error("Squad spawner", "Error spawning squad");
+			g_notification_service.push_error("GUI_TAB_SQUAD_SPAWNER"_T.data(), "SQUAD_SPAWNER_ERROR_SPAWN"_T.data());
 			return false;
 		}
 
@@ -225,7 +225,7 @@ namespace big
 			if (VEHICLE::GET_VEHICLE_MODEL_NUMBER_OF_SEATS(veh_model_hash) < s.m_squad_size)
 			{
 				s.m_squad_size = VEHICLE::GET_VEHICLE_MODEL_NUMBER_OF_SEATS(veh_model_hash);
-				g_notification_service.push_warning("Squad Spawner", "The squad vehicle has insufficient seats, decreasing the squad size");
+				g_notification_service.push_warning("GUI_TAB_SQUAD_SPAWNER"_T.data(), "SQUAD_SPAWNER_INSUFFICIENT_SEATS"_T.data());
 			}
 		}
 
diff --git a/src/util/mobile.hpp b/src/util/mobile.hpp
index 36592f7f..6f557809 100644
--- a/src/util/mobile.hpp
+++ b/src/util/mobile.hpp
@@ -142,7 +142,7 @@ namespace big::mobile
 		inline void summon_vehicle_by_index(int veh_idx)
 		{
 			if (*scr_globals::freemode_global.at(985).as<int*>() != -1)
-				return g_notification_service.push_warning("Vehicle", "Mechanic is not ready to deliver a vehicle right now.");
+				return g_notification_service.push_warning("VEHICLE"_T.data(), "VEHICLE_MECHANIC_BUSY"_T.data());
 
 			if (g.clone_pv.spawn_inside && self::veh)
 				TASK::CLEAR_PED_TASKS_IMMEDIATELY(PLAYER::PLAYER_PED_ID());
diff --git a/src/util/session.hpp b/src/util/session.hpp
index 79d480f5..b3489c26 100644
--- a/src/util/session.hpp
+++ b/src/util/session.hpp
@@ -90,7 +90,7 @@ namespace big::session
 	{
 		if (SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH("maintransition"_J) != 0 || STREAMING::IS_PLAYER_SWITCH_IN_PROGRESS())
 		{
-			g_notification_service.push_error("RID Joiner", "Player switch in progress, wait a bit.");
+			g_notification_service.push_error("RID_JOINER"_T.data(), "RID_JOINER_SWITCH_IN_PROGRESS"_T.data());
 			return;
 		}
 
@@ -100,7 +100,7 @@ namespace big::session
 		if (SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH("maintransition"_J) == 0)
 		{
 			g.session.join_queued = false;
-			g_notification_service.push_error("RID Joiner", "Unable to launch maintransition");
+			g_notification_service.push_error("RID_JOINER"_T.data(), "RID_JOINER_UNABLE_MAINTRANSITION"_T.data());
 		}
 		return;
 	}
@@ -109,7 +109,7 @@ namespace big::session
 	{
 		if (SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH("maintransition"_J) != 0 || STREAMING::IS_PLAYER_SWITCH_IN_PROGRESS())
 		{
-			g_notification_service.push_error("RID Joiner", "Player switch in progress, wait a bit.");
+			g_notification_service.push_error("RID_JOINER"_T.data(), "RID_JOINER_SWITCH_IN_PROGRESS"_T.data());
 			return;
 		}
 
@@ -130,7 +130,7 @@ namespace big::session
 			}
 		}
 
-		g_notification_service.push_error("RID Joiner", "Target player is offline?");
+		g_notification_service.push_error("RID_JOINER"_T.data(), "RID_JOINER_PLAYER_OFFLINE"_T.data());
 	}
 
 	inline void join_by_username(std::string username)
@@ -144,7 +144,7 @@ namespace big::session
 				});
 				return;
 			}
-			g_notification_service.push_error("RID Joiner", "Target player is offline?");
+			g_notification_service.push_error("RID_JOINER"_T.data(), "RID_JOINER_PLAYER_OFFLINE"_T.data());
 		});
 	}
 
@@ -155,9 +155,9 @@ namespace big::session
 		bool success = g_pointers->m_gta.m_invite_player_by_gamer_handle(g_pointers->m_gta.m_network_config, &player_handle, 1, 0, 0, 0);
 
 		if (!success)
-			return g_notification_service.push_error("Network", "Target player could not be invited, they might be offline?");
+			return g_notification_service.push_error("GUI_TAB_NETWORK"_T.data(), "RID_JOINER_INVITE_OFFLINE"_T.data());
 
-		g_notification_service.push_success("Network", "Target player has been invited to your session!");
+		g_notification_service.push_success("GUI_TAB_NETWORK"_T.data(), "SESSION_INVITE_SUCCESS"_T.data());
 	}
 
 	inline void show_profile_by_rockstar_id(uint64_t rid)
diff --git a/src/util/train.hpp b/src/util/train.hpp
index 2649d941..28b383e4 100644
--- a/src/util/train.hpp
+++ b/src/util/train.hpp
@@ -32,7 +32,7 @@ namespace big::train
 		}
 		else
 		{
-			g_notification_service.push_warning("HIJACK_TRAIN"_T.data(), "Cannot find any trains nearby");
+			g_notification_service.push_warning("HIJACK_TRAIN"_T.data(), "HIJACK_TRAIN_NOTFOUND_TRAIN"_T.data());
 		}
 	}
 
@@ -44,7 +44,7 @@ namespace big::train
 		}
 		else
 		{
-			g_notification_service.push_warning("HIJACK_TRAIN"_T.data(), "Cannot find any trains nearby");
+			g_notification_service.push_warning("HIJACK_TRAIN"_T.data(), "HIJACK_TRAIN_NOTFOUND_TRAIN"_T.data());
 		}
 	}