diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp
index de21171949..fe02e029a3 100644
--- a/Client/cefweb/CWebCore.cpp
+++ b/Client/cefweb/CWebCore.cpp
@@ -71,7 +71,6 @@ bool CWebCore::Initialise()
 #else
     CefString(&settings.browser_subprocess_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\CEFLauncher_d.exe")));
 #endif
-    CefString(&settings.resources_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF")));
     CefString(&settings.cache_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cache")));
     CefString(&settings.locales_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\locales")));
     CefString(&settings.log_file).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cefdebug.txt")));
diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp
index 364836e111..b9a2391f46 100644
--- a/Client/core/CCore.cpp
+++ b/Client/core/CCore.cpp
@@ -1869,6 +1869,13 @@ void CCore::RecalculateFrameRateLimit(uint uiServerFrameRateLimit, bool bLogToCo
     if ((m_uiFrameRateLimit == 0 || uiClientScriptRate < m_uiFrameRateLimit) && uiClientScriptRate > 0)
         m_uiFrameRateLimit = uiClientScriptRate;
 
+    // Removes Limiter from Frame Graph if limit is zero and skips frame limit
+    if (m_uiFrameRateLimit == 0)
+    {
+        m_bQueuedFrameRateValid = false;
+        GetGraphStats()->RemoveTimingPoint("Limiter");
+    }
+
     // Print new limits to the console
     if (bLogToConsole)
     {
diff --git a/Client/core/CGraphStats.cpp b/Client/core/CGraphStats.cpp
index 3a5a25cc2e..bf53a0f91e 100644
--- a/Client/core/CGraphStats.cpp
+++ b/Client/core/CGraphStats.cpp
@@ -39,6 +39,7 @@ class CGraphStats : public CGraphStatsInterface
     virtual void SetEnabled(bool bEnabled);
     virtual bool IsEnabled();
     virtual void AddTimingPoint(const char* szName);
+    virtual void RemoveTimingPoint(const char* szName);
 
 protected:
     bool                              m_bEnabled;
@@ -189,6 +190,21 @@ void CGraphStats::AddTimingPoint(const char* szName)
     pLine->dataHistory[pLine->iDataPos] = AvgData;
 }
 
+///////////////////////////////////////////////////////////////
+//
+// CGraphStats::RemoveTimingPoint
+//
+//
+//
+///////////////////////////////////////////////////////////////
+void CGraphStats::RemoveTimingPoint(const char* szName)
+{
+    if (!IsEnabled() || szName[0] == 0)
+        return;
+
+    MapRemove(m_LineList, szName);
+}
+
 ///////////////////////////////////////////////////////////////
 //
 // CGraphStats::Draw
diff --git a/Client/core/CGraphStats.h b/Client/core/CGraphStats.h
index 657bc3338c..bc152e9b15 100644
--- a/Client/core/CGraphStats.h
+++ b/Client/core/CGraphStats.h
@@ -23,6 +23,7 @@ class CGraphStatsInterface
     virtual void SetEnabled(bool bEnabled) = 0;
     virtual bool IsEnabled() = 0;
     virtual void AddTimingPoint(const char* szName) = 0;
+    virtual void RemoveTimingPoint(const char* szName) = 0;
 };
 
 CGraphStatsInterface* GetGraphStats();
diff --git a/Client/core/CVersionUpdater.cpp b/Client/core/CVersionUpdater.cpp
index e4fe77ec96..ec24655b26 100644
--- a/Client/core/CVersionUpdater.cpp
+++ b/Client/core/CVersionUpdater.cpp
@@ -1912,7 +1912,7 @@ void CVersionUpdater::_DialogUpdateQueryError()
     // Display message
     GetQuestionBox().Reset();
     GetQuestionBox().SetTitle(_("UPDATE CHECK"));
-    GetQuestionBox().SetMessage(_("Update not currently avalable.\n\nPlease check www.mtasa.com"));
+    GetQuestionBox().SetMessage(_("An update is currently not available.\n\nPlease check www.mtasa.com"));
     GetQuestionBox().SetButton(0, _("OK"));
     GetQuestionBox().Show();
     _PollAnyButton();
diff --git a/Client/game_sa/CEntitySA.cpp b/Client/game_sa/CEntitySA.cpp
index a55470adf6..02a9f00380 100644
--- a/Client/game_sa/CEntitySA.cpp
+++ b/Client/game_sa/CEntitySA.cpp
@@ -606,101 +606,94 @@ bool CEntitySA::GetBoneRotation(eBone boneId, float& yaw, float& pitch, float& r
 bool CEntitySA::GetBoneRotationQuat(eBone boneId, float& x, float& y, float& z, float& w)
 {
     RpClump* clump = GetRpClump();
-    if (clump)
-    {
-        // updating the bone frame orientation will also update its children
-        // This rotation is only applied when UpdateElementRpHAnim is called
-        CAnimBlendClumpDataSAInterface* clumpDataInterface = *pGame->GetClumpData(clump);
-        AnimBlendFrameData*             frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
-        if (frameData)
-        {
-            RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
-            x = boneOrientation->imag.x;
-            y = boneOrientation->imag.y;
-            z = boneOrientation->imag.z;
-            w = boneOrientation->real;
-            return true;
-        }
-    }
-    return false;
+    if (!clump)
+        return false;
+        
+    // updating the bone frame orientation will also update its children
+    // This rotation is only applied when UpdateElementRpHAnim is called
+    auto* clumpDataInterface = *pGame->GetClumpData(clump);
+    auto* frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
+    if (!frameData)
+        return false;
+
+    RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
+    x = boneOrientation->imag.x;
+    y = boneOrientation->imag.y;
+    z = boneOrientation->imag.z;
+    w = boneOrientation->real;
+    return true;
 }
 
 bool CEntitySA::SetBoneRotation(eBone boneId, float yaw, float pitch, float roll)
 {
     RpClump* clump = GetRpClump();
-    if (clump)
-    {
-        // updating the bone frame orientation will also update its children
-        // This rotation is only applied when UpdateElementRpHAnim is called
-        CAnimBlendClumpDataSAInterface* clumpDataInterface = *pGame->GetClumpData(clump);
-        AnimBlendFrameData*             frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
-        if (frameData)
-        {
-            RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
-            RwV3d   angles = {yaw, roll, pitch};
-            BoneNode_cSAInterface::EulerToQuat(&angles, boneOrientation);
-            CEntitySAInterface* theInterface = GetInterface();
-            if (theInterface)
-            {
-                theInterface->bDontUpdateHierarchy = false;
-            }
-            return true;
-        }
-    }
-    return false;
+    if (!clump)
+        return false;
+        
+    // updating the bone frame orientation will also update its children
+    // This rotation is only applied when UpdateElementRpHAnim is called
+    auto* clumpDataInterface = *pGame->GetClumpData(clump);
+    auto* frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
+    if (!frameData)
+        return false;
+        
+    RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
+    RwV3d angles = { yaw, roll, pitch };
+    BoneNode_cSAInterface::EulerToQuat(&angles, boneOrientation);
+    CEntitySAInterface* theInterface = GetInterface();
+    if (theInterface)
+        theInterface->bDontUpdateHierarchy = false;
+        
+    return true;
 }
 
 bool CEntitySA::SetBoneRotationQuat(eBone boneId, float x, float y, float z, float w)
 {
     RpClump* clump = GetRpClump();
-    if (clump)
-    {
-        // updating the bone frame orientation will also update its children
-        // This rotation is only applied when UpdateElementRpHAnim is called
-        CAnimBlendClumpDataSAInterface* clumpDataInterface = *pGame->GetClumpData(clump);
-        AnimBlendFrameData*             frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
-        if (frameData)
-        {
-            RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
-            boneOrientation->imag.x = x;
-            boneOrientation->imag.y = y;
-            boneOrientation->imag.z = z;
-            boneOrientation->real = w;
-            CEntitySAInterface* theInterface = GetInterface();
-            if (theInterface)
-            {
-                theInterface->bDontUpdateHierarchy = false;
-            }
-            return true;
-        }
-    }
-    return false;
+    if (!clump)
+        return false;
+        
+    // updating the bone frame orientation will also update its children
+    // This rotation is only applied when UpdateElementRpHAnim is called
+    auto* clumpDataInterface = *pGame->GetClumpData(clump);
+    auto* frameData = clumpDataInterface->GetFrameDataByNodeId(boneId);
+    if (!frameData)
+        return false;
+
+    RtQuat* boneOrientation = &frameData->m_pIFrame->orientation;
+    boneOrientation->imag.x = x;
+    boneOrientation->imag.y = y;
+    boneOrientation->imag.z = z;
+    boneOrientation->real = w;
+    CEntitySAInterface* theInterface = GetInterface();
+    if (theInterface)
+        theInterface->bDontUpdateHierarchy = false;
+        
+    return true;
 }
 
 bool CEntitySA::GetBonePosition(eBone boneId, CVector& position)
 {
     RwMatrix* rwBoneMatrix = GetBoneRwMatrix(boneId);
-    if (rwBoneMatrix)
-    {
-        const RwV3d& pos = rwBoneMatrix->pos;
-        position = {pos.x, pos.y, pos.z};
-        return true;
-    }
-    return false;
+    if (!rwBoneMatrix)
+        return false;
+
+    const RwV3d& pos = rwBoneMatrix->pos;
+    position = {pos.x, pos.y, pos.z};
+    return true;
 }
 
 // NOTE: The position will be reset if UpdateElementRpHAnim is called after this.
 bool CEntitySA::SetBonePosition(eBone boneId, const CVector& position)
 {
     RwMatrix* rwBoneMatrix = GetBoneRwMatrix(boneId);
-    if (rwBoneMatrix)
-    {
-        CMatrixSAInterface boneMatrix(rwBoneMatrix, false);
-        boneMatrix.SetTranslateOnly(position);
-        boneMatrix.UpdateRW();
-        return true;
-    }
-    return false;
+    if (!rwBoneMatrix)
+        return false;
+        
+    CMatrixSAInterface boneMatrix(rwBoneMatrix, false);
+    boneMatrix.SetTranslateOnly(position);
+    boneMatrix.UpdateRW();
+    return true;
 }
 
 BYTE CEntitySA::GetAreaCode()
diff --git a/Client/mods/deathmatch/logic/CClientModel.cpp b/Client/mods/deathmatch/logic/CClientModel.cpp
index 2a9eeb0c8d..795bc08579 100644
--- a/Client/mods/deathmatch/logic/CClientModel.cpp
+++ b/Client/mods/deathmatch/logic/CClientModel.cpp
@@ -84,9 +84,6 @@ bool CClientModel::Deallocate()
     if (!m_bAllocatedByUs)
         return false;
 
-    if (m_pParentResource)
-        m_pParentResource->GetResourceModelStreamer()->FullyReleaseModel(m_iModelID);
-
     SetParentResource(nullptr);
 
     CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);
diff --git a/Client/mods/deathmatch/logic/CClientModelManager.cpp b/Client/mods/deathmatch/logic/CClientModelManager.cpp
index 21d795e964..36c601b544 100644
--- a/Client/mods/deathmatch/logic/CClientModelManager.cpp
+++ b/Client/mods/deathmatch/logic/CClientModelManager.cpp
@@ -49,6 +49,9 @@ bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
     int modelId = pModel->GetModelID();
     if (m_Models[modelId] != nullptr)
     {
+        CResource* parentResource = m_Models[modelId]->GetParentResource();
+        if (parentResource)
+            parentResource->GetResourceModelStreamer()->FullyReleaseModel(modelId);
         m_Models[modelId]->RestoreEntitiesUsingThisModel();
         m_Models[modelId] = nullptr;
         m_modelCount--;
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp
index 6f6e4205e0..2c8741f4d7 100644
--- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp
+++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp
@@ -1003,22 +1003,26 @@ int CLuaPedDefs::CanPedBeKnockedOffBike(lua_State* luaVM)
 bool CLuaPedDefs::SetElementBonePosition(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId, CVector position)
 {
     CEntity* theEntity = entity->GetGameEntity();
-    return theEntity ? theEntity->SetBonePosition(static_cast<eBone>(boneId), position) : false;
+    if (!theEntity)
+        return false;
+    return theEntity->SetBonePosition(static_cast<eBone>(boneId), position);
 }
 
 bool CLuaPedDefs::SetElementBoneRotation(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId, float yaw, float pitch, float roll)
 {
     if (boneId > BONE_RIGHTFOOT)
-        throw LuaFunctionError("Invalid bone ID");
+        throw LuaFunctionError("Invalid bone ID", false);
 
     CEntity* theEntity = entity->GetGameEntity();
-    return theEntity ? theEntity->SetBoneRotation(static_cast<eBone>(boneId), yaw, pitch, roll) : false;
+    if (!theEntity)
+        return false;
+    return theEntity->SetBoneRotation(static_cast<eBone>(boneId), yaw, pitch, roll);
 }
 
 bool CLuaPedDefs::SetElementBoneQuaternion(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId, float x, float y, float z, float w)
 {
     if (boneId > BONE_RIGHTFOOT)
-        throw LuaFunctionError("Invalid bone ID");
+        throw LuaFunctionError("Invalid bone ID", false);
 
     CEntity* theEntity = entity->GetGameEntity();
     return theEntity ? theEntity->SetBoneRotationQuat(static_cast<eBone>(boneId), x, y, z, w) : false;
@@ -1028,33 +1032,36 @@ std::variant<bool, CLuaMultiReturn<float, float, float>> CLuaPedDefs::GetElement
 {
     CEntity* theEntity = entity->GetGameEntity();
     CVector  position;
-    if (theEntity && theEntity->GetBonePosition(static_cast<eBone>(boneId), position))
-        return std::make_tuple(position.fX, position.fY, position.fZ);
-    return false;
+    if (!theEntity || !theEntity->GetBonePosition(static_cast<eBone>(boneId), position))
+        return false;
+
+    return std::make_tuple(position.fX, position.fY, position.fZ);
 }
 
 std::variant<bool, CLuaMultiReturn<float, float, float>> CLuaPedDefs::GetElementBoneRotation(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId)
 {
     if (boneId > BONE_RIGHTFOOT)
-        throw LuaFunctionError("Invalid bone ID");
+        throw LuaFunctionError("Invalid bone ID", false);
 
-    float    yaw = 0.0f, pitch = 0.0f, roll = 0.0f;
+    float yaw = 0.0f, pitch = 0.0f, roll = 0.0f;
     CEntity* theEntity = entity->GetGameEntity();
-    if (theEntity && theEntity->GetBoneRotation(static_cast<eBone>(boneId), yaw, pitch, roll))
-        return std::make_tuple(yaw, pitch, roll);
-    return false;
+    if (!theEntity || !theEntity->GetBoneRotation(static_cast<eBone>(boneId), yaw, pitch, roll))
+        return false;
+
+    return std::make_tuple(yaw, pitch, roll);
 }
 
 std::variant<bool, CLuaMultiReturn<float, float, float, float>> CLuaPedDefs::GetElementBoneQuaternion(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId)
 {
     if (boneId > BONE_RIGHTFOOT)
-        throw LuaFunctionError("Invalid bone ID");
+        throw LuaFunctionError("Invalid bone ID", false);
 
-    float    x = 0.0f, y = 0.0f, z = 0.0f, w = 0.0f;
+    float x = 0.0f, y = 0.0f, z = 0.0f, w = 0.0f;
     CEntity* theEntity = entity->GetGameEntity();
-    if (theEntity && theEntity->GetBoneRotationQuat(static_cast<eBone>(boneId), x, y, z, w))
-        return std::make_tuple(x, y, z, w);
-    return false;
+    if (!theEntity || !theEntity->GetBoneRotationQuat(static_cast<eBone>(boneId), x, y, z, w))
+        return false;
+
+    return std::make_tuple(x, y, z, w);
 }
 
 bool CLuaPedDefs::SetElementBoneMatrix(lua_State* const luaVM, CClientPed* entity, std::uint32_t boneId, CMatrix boneMatrix)
diff --git a/README.md b/README.md
index d14116648a..0534cfdb0b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Multi Theft Auto: San Andreas
+## Multi Theft Auto: San Andreas 
 
 [![Build Status](https://github.com/multitheftauto/mtasa-blue/workflows/Build/badge.svg?event=push&branch=master)](https://github.com/multitheftauto/mtasa-blue/actions?query=branch%3Amaster+event%3Apush) [![Unique servers online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Fservers-shields.io.json)](https://community.multitheftauto.com/index.php?p=servers) [![Unique players online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Fplayers-shields.io.json)](https://multitheftauto.com) [![Unique players last 24 hours](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Funique-players-shields.io.json)](https://multitheftauto.com) [![Discord](https://img.shields.io/discord/278474088903606273?label=discord&logo=discord)](https://discord.com/invite/mtasa) [![Crowdin](https://badges.crowdin.net/e/f5dba7b9aa6594139af737c85d81d3aa/localized.svg)](https://multitheftauto.crowdin.com/multitheftauto)
 
diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp
index bd2a32b266..759c6288da 100644
--- a/Server/mods/deathmatch/logic/CResource.cpp
+++ b/Server/mods/deathmatch/logic/CResource.cpp
@@ -3011,7 +3011,7 @@ HttpStatusCode CResource::HandleRequestRouter(HttpRequest* request, HttpResponse
         luaRequest.PushString("path");
         luaRequest.PushString(path);
 
-        luaRequest.PushString("absolute_path");
+        luaRequest.PushString("absolutePath");
         luaRequest.PushString(request->sOriginalUri);
 
         luaRequest.PushString("hostname");
diff --git a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot
index ffe2908b97..b19c565c3c 100644
--- a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot	
+++ b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot	
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-10 16:08+0000\n"
+"POT-Creation-Date: 2024-09-27 04:28+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: Client/game_sa/CSettingsSA.cpp:767
+msgid "Can't find valid screen resolution."
+msgstr ""
+
+#. Confirm that res should be used
+#: Client/game_sa/CSettingsSA.cpp:843
+msgid "Are you sure you want to use this screen resolution?"
+msgstr ""
+
+#: Client/game_sa/CSettingsSA.cpp:845 Client/loader/Dialogs.cpp:194
+msgid "MTA: San Andreas"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:19
+msgid "Website requests"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:27
+msgid ""
+"The server requests the following websites in order to load them (later):"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:33
+msgid "NEVER ENTER SENSITIVE DATA TO PROTECT THEM FROM BEING STOLEN"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:46
+msgid "Remember decision"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:51 Client/core/CSettings.cpp:974
+msgid "Allow"
+msgstr ""
+
+#: Client/cefweb/CWebsiteRequests.cpp:57
+msgid "Deny"
+msgstr ""
+
+#. Couldn't create render target for CPostEffects
+#: Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp:1450
+msgid "Problem with graphics driver"
+msgstr ""
+
 #: Client/mods/deathmatch/CClient.cpp:36
 msgid "This version has expired."
 msgstr ""
@@ -133,6 +176,48 @@ msgstr ""
 msgid "(Development mode) prints world sound ids into the debug window"
 msgstr ""
 
+#. Throw the error and disconnect
+#: Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp:141
+#, c-format
+msgid "Download error: %s"
+msgstr ""
+
+#. Show timeout message and disconnect
+#. Display an error, reset the error status and exit
+#. Show a message that the connection timed out and abort
+#. Show failed message and abort the attempt
+#: Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp:145
+#: Client/mods/deathmatch/logic/CClientGame.cpp:641
+#: Client/mods/deathmatch/logic/CClientGame.cpp:715
+#: Client/mods/deathmatch/logic/CClientGame.cpp:739
+#: Client/mods/deathmatch/logic/CClientGame.cpp:761
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1174
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1254
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1264
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1333
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1370
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1419
+#: Client/mods/deathmatch/logic/CClientGame.cpp:1431
+#: Client/core/CSettings.cpp:2941 Client/core/CSettings.cpp:4166
+#: Client/core/CSettings.cpp:4194 Client/core/CSettings.cpp:4764
+#: Client/core/CCore.cpp:1275 Client/core/CCore.cpp:1288
+#: Client/core/CConnectManager.cpp:80 Client/core/CConnectManager.cpp:111
+#: Client/core/CConnectManager.cpp:127 Client/core/CConnectManager.cpp:263
+#: Client/core/CConnectManager.cpp:321 Client/core/CConnectManager.cpp:404
+#: Client/core/CConnectManager.cpp:411 Client/core/CConnectManager.cpp:421
+#: Client/core/CGUI.cpp:87 Client/core/ServerBrowser/CServerBrowser.cpp:1278
+#: Client/core/ServerBrowser/CServerBrowser.cpp:1300
+#: Client/core/ServerBrowser/CServerBrowser.cpp:1357
+#: Client/core/ServerBrowser/CServerBrowser.cpp:1406
+#: Client/core/DXHook/CDirect3DHook9.cpp:127
+#: Client/loader/MainFunctions.cpp:252 Client/loader/MainFunctions.cpp:267
+#: Client/loader/MainFunctions.cpp:269 Client/loader/MainFunctions.cpp:846
+#: Client/loader/CInstallManager.cpp:552 Client/loader/CInstallManager.cpp:561
+#: Shared/mods/deathmatch/logic/CLatentTransferManager.cpp:378
+#: Shared/sdk/SharedUtil.Misc.hpp:137
+msgid "Error"
+msgstr ""
+
 #: Client/mods/deathmatch/logic/CPacketHandler.cpp:506
 msgid "Disconnected: Invalid nickname"
 msgstr ""
@@ -450,42 +535,6 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
-#. Show timeout message and disconnect
-#. Display an error, reset the error status and exit
-#. Show a message that the connection timed out and abort
-#. Show failed message and abort the attempt
-#: Client/mods/deathmatch/logic/CClientGame.cpp:641
-#: Client/mods/deathmatch/logic/CClientGame.cpp:715
-#: Client/mods/deathmatch/logic/CClientGame.cpp:739
-#: Client/mods/deathmatch/logic/CClientGame.cpp:761
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1174
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1254
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1264
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1333
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1370
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1419
-#: Client/mods/deathmatch/logic/CClientGame.cpp:1431
-#: Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp:145
-#: Client/core/CSettings.cpp:2941 Client/core/CSettings.cpp:4166
-#: Client/core/CSettings.cpp:4194 Client/core/CSettings.cpp:4764
-#: Client/core/CGUI.cpp:87 Client/core/CConnectManager.cpp:80
-#: Client/core/CConnectManager.cpp:111 Client/core/CConnectManager.cpp:127
-#: Client/core/CConnectManager.cpp:263 Client/core/CConnectManager.cpp:321
-#: Client/core/CConnectManager.cpp:404 Client/core/CConnectManager.cpp:411
-#: Client/core/CConnectManager.cpp:421 Client/core/CCore.cpp:1275
-#: Client/core/CCore.cpp:1288 Client/core/ServerBrowser/CServerBrowser.cpp:1278
-#: Client/core/ServerBrowser/CServerBrowser.cpp:1300
-#: Client/core/ServerBrowser/CServerBrowser.cpp:1357
-#: Client/core/ServerBrowser/CServerBrowser.cpp:1406
-#: Client/core/DXHook/CDirect3DHook9.cpp:127
-#: Client/loader/MainFunctions.cpp:252 Client/loader/MainFunctions.cpp:267
-#: Client/loader/MainFunctions.cpp:269 Client/loader/MainFunctions.cpp:846
-#: Client/loader/CInstallManager.cpp:552 Client/loader/CInstallManager.cpp:561
-#: Shared/mods/deathmatch/logic/CLatentTransferManager.cpp:378
-#: Shared/sdk/SharedUtil.Misc.hpp:137
-msgid "Error"
-msgstr ""
-
 #: Client/mods/deathmatch/logic/CClientGame.cpp:641
 #: Client/mods/deathmatch/logic/CClientGame.cpp:739
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1300
@@ -623,32 +672,6 @@ msgstr ""
 msgid "Wasted"
 msgstr ""
 
-#. Throw the error and disconnect
-#: Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp:141
-#, c-format
-msgid "Download error: %s"
-msgstr ""
-
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:25
-msgid "Map download progress:"
-msgstr ""
-
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:28
-msgid "Download Progress:"
-msgstr ""
-
-#. Find our largest piece of text, so we can size accordingly
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:42
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:105
-#, c-format
-msgid "%s of %s"
-msgstr ""
-
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:44
-#: Client/mods/deathmatch/logic/CTransferBox.cpp:65
-msgid "Disconnect to cancel download"
-msgstr ""
-
 #: Client/mods/deathmatch/logic/CLocalServer.cpp:37
 msgid "HOST GAME"
 msgstr ""
@@ -718,83 +741,38 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: Client/core/CCommandFuncs.cpp:24
-msgid "***[ COMMAND HELP ]***\n"
-msgstr ""
-
-#: Client/core/CCommandFuncs.cpp:158
-#, c-format
-msgid "* The time is %d:%02d:%02d"
-msgstr ""
-
-#: Client/core/CCommandFuncs.cpp:242
-msgid "connect: Syntax is 'connect <host> [<port> <nick> <pass>]'"
-msgstr ""
-
-#: Client/core/CCommandFuncs.cpp:250 Client/core/CCommandFuncs.cpp:318
-msgid "connect: Bad port number"
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:25
+msgid "Map download progress:"
 msgstr ""
 
-#: Client/core/CCommandFuncs.cpp:272 Client/core/CCommandFuncs.cpp:333
-#, c-format
-msgid "connect: Connecting to %s:%u..."
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:28
+msgid "Download Progress:"
 msgstr ""
 
-#: Client/core/CCommandFuncs.cpp:276 Client/core/CCommandFuncs.cpp:337
+#. Find our largest piece of text, so we can size accordingly
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:42
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:105
 #, c-format
-msgid "connect: could not connect to %s:%u!"
-msgstr ""
-
-#: Client/core/CCommandFuncs.cpp:281
-msgid "connect: Failed to unload current mod"
-msgstr ""
-
-#: Client/core/CCommandFuncs.cpp:371
-msgid "Bound all controls from GTA"
+msgid "%s of %s"
 msgstr ""
 
-#: Client/core/CCommandFuncs.cpp:385
-msgid "Saved configuration file"
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:44
+#: Client/mods/deathmatch/logic/CTransferBox.cpp:65
+msgid "Disconnect to cancel download"
 msgstr ""
 
-#. Print it
-#: Client/core/CCommandFuncs.cpp:451
+#: Client/core/CScreenShot.cpp:104
 #, c-format
-msgid "* Your serial is: %s"
-msgstr ""
-
-#. TRANSLATORS: Replace with your language native name
-#: Client/core/CLocalization.cpp:16
-msgid "English"
-msgstr ""
-
-#: Client/core/CCredits.cpp:34
-msgid "Programming"
-msgstr ""
-
-#: Client/core/CCredits.cpp:63
-msgid "Contributors"
-msgstr ""
-
-#: Client/core/CCredits.cpp:84
-msgid "Game Design / Scripting"
-msgstr ""
-
-#: Client/core/CCredits.cpp:104
-msgid "Language Localization"
-msgstr ""
-
-#: Client/core/CCredits.cpp:110
-msgid "Patch contributors"
+msgid "Screenshot got %d bytes, but expected %d"
 msgstr ""
 
-#: Client/core/CCredits.cpp:234
-msgid "Special Thanks"
+#: Client/core/CScreenShot.cpp:110
+msgid "Screenshot failed"
 msgstr ""
 
-#: Client/core/CCredits.cpp:265
-msgid ""
-"This software and project makes use of the following libraries and software:"
+#: Client/core/CScreenShot.cpp:160
+#, c-format
+msgid "Screenshot taken: '%s'"
 msgstr ""
 
 #. Create window (with frame) if it will fit inside the screen resolution
@@ -1255,10 +1233,6 @@ msgstr ""
 msgid "Custom whitelist"
 msgstr ""
 
-#: Client/core/CSettings.cpp:974 Client/cefweb/CWebsiteRequests.cpp:51
-msgid "Allow"
-msgstr ""
-
 #. Misc section label
 #: Client/core/CSettings.cpp:997
 msgid "Misc"
@@ -1412,9 +1386,9 @@ msgstr ""
 #: Client/core/CSettings.cpp:1388 Client/core/CSettings.cpp:1412
 #: Client/core/CSettings.cpp:4488 Client/core/CSettings.cpp:4562
 #: Client/core/CSettings.cpp:4592 Client/core/CSettings.cpp:4641
-#: Client/core/CMainMenu.cpp:1199 Client/core/CVersionUpdater.cpp:1571
-#: Client/core/CVersionUpdater.cpp:1589 Client/core/CVersionUpdater.cpp:1858
-#: Client/core/CVersionUpdater.cpp:1877 Client/core/CQuestionBox.cpp:194
+#: Client/core/CQuestionBox.cpp:194 Client/core/CMainMenu.cpp:1199
+#: Client/core/CVersionUpdater.cpp:1571 Client/core/CVersionUpdater.cpp:1589
+#: Client/core/CVersionUpdater.cpp:1858 Client/core/CVersionUpdater.cpp:1877
 #: Client/core/ServerBrowser/CServerInfo.cpp:479 Client/loader/Dialogs.cpp:132
 msgid "No"
 msgstr ""
@@ -1428,9 +1402,9 @@ msgstr ""
 #: Client/core/CSettings.cpp:1389 Client/core/CSettings.cpp:1413
 #: Client/core/CSettings.cpp:4489 Client/core/CSettings.cpp:4563
 #: Client/core/CSettings.cpp:4593 Client/core/CSettings.cpp:4642
-#: Client/core/CMainMenu.cpp:1200 Client/core/CVersionUpdater.cpp:1572
-#: Client/core/CVersionUpdater.cpp:1590 Client/core/CVersionUpdater.cpp:1859
-#: Client/core/CVersionUpdater.cpp:1878 Client/core/CQuestionBox.cpp:195
+#: Client/core/CQuestionBox.cpp:195 Client/core/CMainMenu.cpp:1200
+#: Client/core/CVersionUpdater.cpp:1572 Client/core/CVersionUpdater.cpp:1590
+#: Client/core/CVersionUpdater.cpp:1859 Client/core/CVersionUpdater.cpp:1878
 #: Client/core/ServerBrowser/CServerInfo.cpp:479 Client/loader/Dialogs.cpp:131
 #: Client/gui/CGUIMessageBox_Impl.cpp:72
 msgid "Yes"
@@ -1821,77 +1795,37 @@ msgstr ""
 msgid "Mouse movement fix - May need PC restart"
 msgstr ""
 
-#. Even the default skin doesn't work, so give up
-#: Client/core/CGUI.cpp:86
-msgid ""
-"The skin you selected could not be loaded, and the default skin also could "
-"not be loaded, please reinstall MTA."
+#: Client/core/CCore.cpp:811 Client/loader/CInstallManager.cpp:1057
+#, c-format
+msgid "MTA:SA cannot continue because drive %s does not have enough space."
 msgstr ""
 
-#: Client/core/CConnectManager.cpp:79
-msgid "Connecting failed. Invalid nick provided!"
+#: Client/core/CCore.cpp:813 Shared/mods/deathmatch/logic/Utils.cpp:129
+msgid "Fatal error"
 msgstr ""
 
-#: Client/core/CConnectManager.cpp:110
-msgid "Connecting failed. Invalid host provided!"
+#: Client/core/CCore.cpp:938
+msgid "TO FIX, REMOVE THIS FILE:"
 msgstr ""
 
-#: Client/core/CConnectManager.cpp:126
+#: Client/core/CCore.cpp:970
 #, c-format
-msgid "Connecting to %s at port %u failed!"
+msgid "%s module is incorrect!"
 msgstr ""
 
-#. Display the status box
-#: Client/core/CConnectManager.cpp:147
-#, c-format
-msgid "Connecting to %s:%u ..."
+#: Client/core/CCore.cpp:1275
+msgid "Error executing URL"
 msgstr ""
 
-#. Failed loading the mod
-#: Client/core/CConnectManager.cpp:403
+#: Client/core/CCore.cpp:1287
 #, c-format
-msgid "No such mod installed (%s)"
+msgid "Error running mod specified in command line ('%s')"
 msgstr ""
 
-#: Client/core/CConnectManager.cpp:411
-msgid "Bad server response (2)"
-msgstr ""
-
-#: Client/core/CConnectManager.cpp:421
-msgid "Bad server response (1)"
-msgstr ""
-
-#: Client/core/CCore.cpp:811 Client/loader/CInstallManager.cpp:1057
-#, c-format
-msgid "MTA:SA cannot continue because drive %s does not have enough space."
-msgstr ""
-
-#: Client/core/CCore.cpp:813 Shared/mods/deathmatch/logic/Utils.cpp:129
-msgid "Fatal error"
-msgstr ""
-
-#: Client/core/CCore.cpp:938
-msgid "TO FIX, REMOVE THIS FILE:"
-msgstr ""
-
-#: Client/core/CCore.cpp:970
-#, c-format
-msgid "%s module is incorrect!"
-msgstr ""
-
-#: Client/core/CCore.cpp:1275
-msgid "Error executing URL"
-msgstr ""
-
-#: Client/core/CCore.cpp:1287
-#, c-format
-msgid "Error running mod specified in command line ('%s')"
-msgstr ""
-
-#. m_pCommands->Add ( "e", CCommandFuncs::Editor );
-#. m_pCommands->Add ( "clear", CCommandFuncs::Clear );
-#: Client/core/CCore.cpp:1389
-msgid "this help screen"
+#. m_pCommands->Add ( "e", CCommandFuncs::Editor );
+#. m_pCommands->Add ( "clear", CCommandFuncs::Clear );
+#: Client/core/CCore.cpp:1389
+msgid "this help screen"
 msgstr ""
 
 #: Client/core/CCore.cpp:1390 Client/core/CCore.cpp:1391
@@ -1978,191 +1912,37 @@ msgstr ""
 msgid "for developers: reload news"
 msgstr ""
 
-#: Client/core/CMainMenu.cpp:333
-msgid ""
-"You are using a feature-branch build! This is a test build only which cannot "
-"be used to connect to public servers!"
-msgstr ""
-
-#: Client/core/CMainMenu.cpp:352
-msgid ""
-"MTA will not receive updates on XP/Vista after July 2019.\n"
-"\n"
-"Upgrade Windows to play on the latest servers."
-msgstr ""
-
-#: Client/core/CMainMenu.cpp:1193
-msgid ""
-"This will disconnect you from the current server.\n"
-"\n"
-"Are you sure you want to disconnect?"
-msgstr ""
-
-#: Client/core/CMainMenu.cpp:1197
-msgid "DISCONNECT WARNING"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:626
-msgid "Busy"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:626
-msgid "Can't check for updates right now"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1567 Client/core/CVersionUpdater.cpp:1587
-#: Client/core/CVersionUpdater.cpp:1605
-#, c-format
-msgid "MTA:SA %s required"
+#: Client/core/CConnectManager.cpp:79
+msgid "Connecting failed. Invalid nick provided!"
 msgstr ""
 
-#: Client/core/CVersionUpdater.cpp:1568
-#, c-format
-msgid ""
-"An updated version of MTA:SA %s is required to join the selected server.\n"
-"\n"
-"Do you want to download and install MTA:SA %s ?"
+#: Client/core/CConnectManager.cpp:110
+msgid "Connecting failed. Invalid host provided!"
 msgstr ""
 
-#: Client/core/CVersionUpdater.cpp:1588
+#: Client/core/CConnectManager.cpp:126
 #, c-format
-msgid "Do you want to launch MTA:SA %s and connect to this server ?"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1606
-msgid ""
-"It is not possible to connect at this time.\n"
-"\n"
-"Please try later."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1788
-msgid "Connecting"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1789 Client/core/CVersionUpdater.cpp:1805
-msgid "Please wait..."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1804
-msgid "CHECKING"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1821 Client/core/CVersionUpdater.cpp:1914
-msgid "UPDATE CHECK"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1822
-msgid "No update needed"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1839
-msgid "DOWNLOADING"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1840
-msgid "waiting..."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1856
-msgid "MANDATORY UPDATE"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1857
-msgid ""
-"To join this server, you must update MTA.\n"
-"\n"
-" Do you want to update now ?"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1875
-msgid "OPTIONAL UPDATE"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1876
-msgid ""
-"Server says an update is recommended, but not essential.\n"
-"\n"
-" Do you want to update now ?"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1915
-msgid ""
-"Update not currently avalable.\n"
-"\n"
-"Please check www.mtasa.com"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1936 Client/core/CVersionUpdater.cpp:2118
-msgid "ERROR SAVING"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1937 Client/core/CVersionUpdater.cpp:2119
-msgid "Unable to create the file."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1945 Client/core/CVersionUpdater.cpp:1954
-#: Client/core/CVersionUpdater.cpp:2127 Client/core/CVersionUpdater.cpp:2136
-msgid "ERROR DOWNLOADING"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1946 Client/core/CVersionUpdater.cpp:2128
-msgid "The downloaded file appears to be incorrect."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1955 Client/core/CVersionUpdater.cpp:2137
-msgid "For some reason."
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1966 Client/core/CVersionUpdater.cpp:2150
-msgid "DOWNLOAD COMPLETE"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:1990
-msgid " - Unknown problem in _DialogUpdateResult"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:2088 Client/core/CVersionUpdater.cpp:2098
-msgid "Ok"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:2096
-msgid "ERROR"
-msgstr ""
-
-#: Client/core/CVersionUpdater.cpp:2097
-msgid ""
-"Some MTA:SA data files are missing.\n"
-"\n"
-"\n"
-"Please reinstall MTA:SA"
+msgid "Connecting to %s at port %u failed!"
 msgstr ""
 
-#: Client/core/CVersionUpdater.cpp:2774
+#. Display the status box
+#: Client/core/CConnectManager.cpp:147
 #, c-format
-msgid "%3d %% completed"
+msgid "Connecting to %s:%u ..."
 msgstr ""
 
-#: Client/core/CVersionUpdater.cpp:2777
+#. Failed loading the mod
+#: Client/core/CConnectManager.cpp:403
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Waiting for response  -  %-3d"
-msgstr ""
-
-#. Unknown command
-#: Client/core/CCommands.cpp:223
-msgid "Unknown command or cvar: "
+msgid "No such mod installed (%s)"
 msgstr ""
 
-#: Client/core/CQuestionBox.cpp:192 Shared/sdk/SharedUtil.Misc.hpp:688
-msgid "Do you want to see some on-line help about this problem ?"
+#: Client/core/CConnectManager.cpp:411
+msgid "Bad server response (2)"
 msgstr ""
 
-#. Create window
-#: Client/core/CConsole.cpp:417
-msgid "CONSOLE"
+#: Client/core/CConnectManager.cpp:421
+msgid "Bad server response (1)"
 msgstr ""
 
 #: Client/core/CKeyBinds.cpp:186
@@ -2337,6 +2117,13 @@ msgstr ""
 msgid "Group control backwards"
 msgstr ""
 
+#. Even the default skin doesn't work, so give up
+#: Client/core/CGUI.cpp:86
+msgid ""
+"The skin you selected could not be loaded, and the default skin also could "
+"not be loaded, please reinstall MTA."
+msgstr ""
+
 #. Create the window
 #: Client/core/CNewsBrowser.cpp:153
 msgid "NEWS"
@@ -2347,30 +2134,282 @@ msgstr ""
 msgid "Visit latest news article"
 msgstr ""
 
-#: Client/core/CScreenShot.cpp:104
-#, c-format
-msgid "Screenshot got %d bytes, but expected %d"
+#: Client/core/CCommandFuncs.cpp:24
+msgid "***[ COMMAND HELP ]***\n"
 msgstr ""
 
-#: Client/core/CScreenShot.cpp:110
-msgid "Screenshot failed"
+#: Client/core/CCommandFuncs.cpp:158
+#, c-format
+msgid "* The time is %d:%02d:%02d"
 msgstr ""
 
-#: Client/core/CScreenShot.cpp:160
-#, c-format
-msgid "Screenshot taken: '%s'"
+#: Client/core/CCommandFuncs.cpp:242
+msgid "connect: Syntax is 'connect <host> [<port> <nick> <pass>]'"
 msgstr ""
 
-#: Client/core/CJoystickManager.cpp:1578
-msgid "Accelerate Axis"
+#: Client/core/CCommandFuncs.cpp:250 Client/core/CCommandFuncs.cpp:318
+msgid "connect: Bad port number"
 msgstr ""
 
-#: Client/core/CJoystickManager.cpp:1580
-msgid "Brake Axis"
+#: Client/core/CCommandFuncs.cpp:272 Client/core/CCommandFuncs.cpp:333
+#, c-format
+msgid "connect: Connecting to %s:%u..."
 msgstr ""
 
-#: Client/core/ServerBrowser/CServerList.cpp:25
-msgid "Idle"
+#: Client/core/CCommandFuncs.cpp:276 Client/core/CCommandFuncs.cpp:337
+#, c-format
+msgid "connect: could not connect to %s:%u!"
+msgstr ""
+
+#: Client/core/CCommandFuncs.cpp:281
+msgid "connect: Failed to unload current mod"
+msgstr ""
+
+#: Client/core/CCommandFuncs.cpp:371
+msgid "Bound all controls from GTA"
+msgstr ""
+
+#: Client/core/CCommandFuncs.cpp:385
+msgid "Saved configuration file"
+msgstr ""
+
+#. Print it
+#: Client/core/CCommandFuncs.cpp:451
+#, c-format
+msgid "* Your serial is: %s"
+msgstr ""
+
+#. Unknown command
+#: Client/core/CCommands.cpp:223
+msgid "Unknown command or cvar: "
+msgstr ""
+
+#: Client/core/CQuestionBox.cpp:192 Shared/sdk/SharedUtil.Misc.hpp:688
+msgid "Do you want to see some on-line help about this problem ?"
+msgstr ""
+
+#: Client/core/CCredits.cpp:34
+msgid "Programming"
+msgstr ""
+
+#: Client/core/CCredits.cpp:63
+msgid "Contributors"
+msgstr ""
+
+#: Client/core/CCredits.cpp:84
+msgid "Game Design / Scripting"
+msgstr ""
+
+#: Client/core/CCredits.cpp:104
+msgid "Language Localization"
+msgstr ""
+
+#: Client/core/CCredits.cpp:110
+msgid "Patch contributors"
+msgstr ""
+
+#: Client/core/CCredits.cpp:234
+msgid "Special Thanks"
+msgstr ""
+
+#: Client/core/CCredits.cpp:265
+msgid ""
+"This software and project makes use of the following libraries and software:"
+msgstr ""
+
+#: Client/core/CJoystickManager.cpp:1578
+msgid "Accelerate Axis"
+msgstr ""
+
+#: Client/core/CJoystickManager.cpp:1580
+msgid "Brake Axis"
+msgstr ""
+
+#. TRANSLATORS: Replace with your language native name
+#: Client/core/CLocalization.cpp:16
+msgid "English"
+msgstr ""
+
+#: Client/core/CMainMenu.cpp:333
+msgid ""
+"You are using a feature-branch build! This is a test build only which cannot "
+"be used to connect to public servers!"
+msgstr ""
+
+#: Client/core/CMainMenu.cpp:352
+msgid ""
+"MTA will not receive updates on XP/Vista after July 2019.\n"
+"\n"
+"Upgrade Windows to play on the latest servers."
+msgstr ""
+
+#: Client/core/CMainMenu.cpp:1193
+msgid ""
+"This will disconnect you from the current server.\n"
+"\n"
+"Are you sure you want to disconnect?"
+msgstr ""
+
+#: Client/core/CMainMenu.cpp:1197
+msgid "DISCONNECT WARNING"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:626
+msgid "Busy"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:626
+msgid "Can't check for updates right now"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1567 Client/core/CVersionUpdater.cpp:1587
+#: Client/core/CVersionUpdater.cpp:1605
+#, c-format
+msgid "MTA:SA %s required"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1568
+#, c-format
+msgid ""
+"An updated version of MTA:SA %s is required to join the selected server.\n"
+"\n"
+"Do you want to download and install MTA:SA %s ?"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1588
+#, c-format
+msgid "Do you want to launch MTA:SA %s and connect to this server ?"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1606
+msgid ""
+"It is not possible to connect at this time.\n"
+"\n"
+"Please try later."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1788
+msgid "Connecting"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1789 Client/core/CVersionUpdater.cpp:1805
+msgid "Please wait..."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1804
+msgid "CHECKING"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1821 Client/core/CVersionUpdater.cpp:1914
+msgid "UPDATE CHECK"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1822
+msgid "No update needed"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1839
+msgid "DOWNLOADING"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1840
+msgid "waiting..."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1856
+msgid "MANDATORY UPDATE"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1857
+msgid ""
+"To join this server, you must update MTA.\n"
+"\n"
+" Do you want to update now ?"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1875
+msgid "OPTIONAL UPDATE"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1876
+msgid ""
+"Server says an update is recommended, but not essential.\n"
+"\n"
+" Do you want to update now ?"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1915
+msgid ""
+"An update is currently not available.\n"
+"\n"
+"Please check www.mtasa.com"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1936 Client/core/CVersionUpdater.cpp:2118
+msgid "ERROR SAVING"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1937 Client/core/CVersionUpdater.cpp:2119
+msgid "Unable to create the file."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1945 Client/core/CVersionUpdater.cpp:1954
+#: Client/core/CVersionUpdater.cpp:2127 Client/core/CVersionUpdater.cpp:2136
+msgid "ERROR DOWNLOADING"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1946 Client/core/CVersionUpdater.cpp:2128
+msgid "The downloaded file appears to be incorrect."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1955 Client/core/CVersionUpdater.cpp:2137
+msgid "For some reason."
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1966 Client/core/CVersionUpdater.cpp:2150
+msgid "DOWNLOAD COMPLETE"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:1990
+msgid " - Unknown problem in _DialogUpdateResult"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:2088 Client/core/CVersionUpdater.cpp:2098
+msgid "Ok"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:2096
+msgid "ERROR"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:2097
+msgid ""
+"Some MTA:SA data files are missing.\n"
+"\n"
+"\n"
+"Please reinstall MTA:SA"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:2774
+#, c-format
+msgid "%3d %% completed"
+msgstr ""
+
+#: Client/core/CVersionUpdater.cpp:2777
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Waiting for response  -  %-3d"
+msgstr ""
+
+#. Create window
+#: Client/core/CConsole.cpp:417
+msgid "CONSOLE"
+msgstr ""
+
+#: Client/core/ServerBrowser/CServerList.cpp:25
+msgid "Idle"
 msgstr ""
 
 #: Client/core/ServerBrowser/CServerList.cpp:150
@@ -2417,6 +2456,103 @@ msgstr ""
 msgid "Attempting to discover LAN servers"
 msgstr ""
 
+#. Create queue window
+#: Client/core/ServerBrowser/CServerInfo.cpp:32
+#: Client/core/ServerBrowser/CServerInfo.cpp:302
+msgid "SERVER IS FULL"
+msgstr ""
+
+#. Determine our label draw position for L10n
+#. Start position
+#. Server Name
+#: Client/core/ServerBrowser/CServerInfo.cpp:44
+#: Client/core/ServerBrowser/CServerInfo.cpp:53
+msgid "Name:"
+msgstr ""
+
+#. Server IP
+#: Client/core/ServerBrowser/CServerInfo.cpp:44
+#: Client/core/ServerBrowser/CServerInfo.cpp:64
+msgid "Server Address:"
+msgstr ""
+
+#. Gamemode
+#: Client/core/ServerBrowser/CServerInfo.cpp:44
+#: Client/core/ServerBrowser/CServerInfo.cpp:75
+msgid "Gamemode:"
+msgstr ""
+
+#. Map
+#: Client/core/ServerBrowser/CServerInfo.cpp:44
+#: Client/core/ServerBrowser/CServerInfo.cpp:86
+msgid "Map:"
+msgstr ""
+
+#. Players
+#: Client/core/ServerBrowser/CServerInfo.cpp:45
+#: Client/core/ServerBrowser/CServerInfo.cpp:97
+msgid "Players:"
+msgstr ""
+
+#. Passworded
+#: Client/core/ServerBrowser/CServerInfo.cpp:45
+#: Client/core/ServerBrowser/CServerInfo.cpp:108
+msgid "Passworded:"
+msgstr ""
+
+#. Latency
+#: Client/core/ServerBrowser/CServerInfo.cpp:45
+#: Client/core/ServerBrowser/CServerInfo.cpp:119
+msgid "Latency:"
+msgstr ""
+
+#. Column for player names
+#. Player List Columns
+#: Client/core/ServerBrowser/CServerInfo.cpp:138
+#: Client/core/ServerBrowser/CServerBrowser.cpp:478
+msgid "Player list"
+msgstr ""
+
+#. Close button
+#: Client/core/ServerBrowser/CServerInfo.cpp:144
+msgid "Close"
+msgstr ""
+
+#. Join Game button
+#: Client/core/ServerBrowser/CServerInfo.cpp:152
+msgid "Join Game"
+msgstr ""
+
+#. Please enter password label
+#: Client/core/ServerBrowser/CServerInfo.cpp:166
+msgid "Please enter the password to the server:"
+msgstr ""
+
+#: Client/core/ServerBrowser/CServerInfo.cpp:177
+msgid "Join the server as soon as a player slot is available."
+msgstr ""
+
+#: Client/core/ServerBrowser/CServerInfo.cpp:310
+msgid "PLEASE ENTER SERVER PASSWORD"
+msgstr ""
+
+#: Client/core/ServerBrowser/CServerInfo.cpp:319
+#: Client/core/ServerBrowser/CServerBrowser.cpp:1380
+#: Client/loader/MainFunctions.cpp:603 Client/loader/MainFunctions.cpp:610
+#: Client/loader/MainFunctions.cpp:1219
+msgid "Information"
+msgstr ""
+
+#. The server has timed out
+#: Client/core/ServerBrowser/CServerInfo.cpp:402
+msgid "Timed Out"
+msgstr ""
+
+#. Set every GUI elements text to blank
+#: Client/core/ServerBrowser/CServerInfo.cpp:431
+msgid "Querying..."
+msgstr ""
+
 #. Create the window
 #: Client/core/ServerBrowser/CServerBrowser.cpp:85
 msgid "SERVER BROWSER"
@@ -2509,13 +2645,6 @@ msgstr ""
 msgid "Gamemode"
 msgstr ""
 
-#. Player List Columns
-#. Column for player names
-#: Client/core/ServerBrowser/CServerBrowser.cpp:478
-#: Client/core/ServerBrowser/CServerInfo.cpp:138
-msgid "Player list"
-msgstr ""
-
 #. Include label
 #: Client/core/ServerBrowser/CServerBrowser.cpp:486
 msgid "Include:"
@@ -2572,334 +2701,239 @@ msgstr ""
 msgid "Please use the mtasa:// protocol!"
 msgstr ""
 
-#: Client/core/ServerBrowser/CServerBrowser.cpp:1380
-#: Client/core/ServerBrowser/CServerInfo.cpp:319
-#: Client/loader/MainFunctions.cpp:603 Client/loader/MainFunctions.cpp:610
-#: Client/loader/MainFunctions.cpp:1219
-msgid "Information"
-msgstr ""
-
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1380
 msgid "You have to select a server to connect to."
 msgstr ""
 
-#. Create queue window
-#: Client/core/ServerBrowser/CServerInfo.cpp:32
-#: Client/core/ServerBrowser/CServerInfo.cpp:302
-msgid "SERVER IS FULL"
+#: Client/core/DXHook/CDirect3DHook9.cpp:124
+msgid ""
+"Could not initialize Direct3D9.\n"
+"\n"
+"Please ensure the DirectX End-User Runtime and\n"
+"latest Windows Service Packs are installed correctly."
 msgstr ""
 
-#. Determine our label draw position for L10n
-#. Start position
-#. Server Name
-#: Client/core/ServerBrowser/CServerInfo.cpp:44
-#: Client/core/ServerBrowser/CServerInfo.cpp:53
-msgid "Name:"
+#: Client/loader/Dialogs.cpp:134
+msgid "Quit"
 msgstr ""
 
-#. Server IP
-#: Client/core/ServerBrowser/CServerInfo.cpp:44
-#: Client/core/ServerBrowser/CServerInfo.cpp:64
-msgid "Server Address:"
+#: Client/loader/Dialogs.cpp:151
+msgid "MTA: San Andreas has encountered a problem"
 msgstr ""
 
-#. Gamemode
-#: Client/core/ServerBrowser/CServerInfo.cpp:44
-#: Client/core/ServerBrowser/CServerInfo.cpp:75
-msgid "Gamemode:"
+#: Client/loader/Dialogs.cpp:152
+msgid "Crash information"
 msgstr ""
 
-#. Map
-#: Client/core/ServerBrowser/CServerInfo.cpp:44
-#: Client/core/ServerBrowser/CServerInfo.cpp:86
-msgid "Map:"
+#: Client/loader/Dialogs.cpp:153
+msgid ""
+"Tick the check box to send this crash info to MTA devs using the 'internet'"
 msgstr ""
 
-#. Players
-#: Client/core/ServerBrowser/CServerInfo.cpp:45
-#: Client/core/ServerBrowser/CServerInfo.cpp:97
-msgid "Players:"
+#: Client/loader/Dialogs.cpp:154
+msgid "Doing so will increase the chance of this crash being fixed."
 msgstr ""
 
-#. Passworded
-#: Client/core/ServerBrowser/CServerInfo.cpp:45
-#: Client/core/ServerBrowser/CServerInfo.cpp:108
-msgid "Passworded:"
+#: Client/loader/Dialogs.cpp:155
+msgid "Do you want to restart MTA: San Andreas ?"
 msgstr ""
 
-#. Latency
-#: Client/core/ServerBrowser/CServerInfo.cpp:45
-#: Client/core/ServerBrowser/CServerInfo.cpp:119
-msgid "Latency:"
+#: Client/loader/Dialogs.cpp:162
+msgid "MTA: San Andreas - Warning"
 msgstr ""
 
-#. Close button
-#: Client/core/ServerBrowser/CServerInfo.cpp:144
-msgid "Close"
+#: Client/loader/Dialogs.cpp:163
+msgid ""
+"Your Grand Theft Auto: San Andreas install directory contains these files:"
 msgstr ""
 
-#. Join Game button
-#: Client/core/ServerBrowser/CServerInfo.cpp:152
-msgid "Join Game"
+#: Client/loader/Dialogs.cpp:165
+msgid ""
+"These files are not required and may interfere with the graphical features "
+"in this version of MTA:SA.\n"
+"\n"
+"It is recommended that you remove or rename these files."
 msgstr ""
 
-#. Please enter password label
-#: Client/core/ServerBrowser/CServerInfo.cpp:166
-msgid "Please enter the password to the server:"
+#: Client/loader/Dialogs.cpp:167
+msgid "Keep these files, but also show this warning on next start"
 msgstr ""
 
-#: Client/core/ServerBrowser/CServerInfo.cpp:177
-msgid "Join the server as soon as a player slot is available."
+#: Client/loader/Dialogs.cpp:168
+msgid "Do not remind me about these files again"
 msgstr ""
 
-#: Client/core/ServerBrowser/CServerInfo.cpp:310
-msgid "PLEASE ENTER SERVER PASSWORD"
+#: Client/loader/Dialogs.cpp:169
+msgid "Rename these files from *.dll to *.dll.bak"
 msgstr ""
 
-#. The server has timed out
-#: Client/core/ServerBrowser/CServerInfo.cpp:402
-msgid "Timed Out"
+#: Client/loader/Dialogs.cpp:170
+msgid "Show me these files"
 msgstr ""
 
-#. Set every GUI elements text to blank
-#: Client/core/ServerBrowser/CServerInfo.cpp:431
-msgid "Querying..."
+#: Client/loader/Dialogs.cpp:171
+msgid "Play MTA:SA"
 msgstr ""
 
-#: Client/core/DXHook/CDirect3DHook9.cpp:124
-msgid ""
-"Could not initialize Direct3D9.\n"
-"\n"
-"Please ensure the DirectX End-User Runtime and\n"
-"latest Windows Service Packs are installed correctly."
+#: Client/loader/Dialogs.cpp:177
+msgid "MTA: San Andreas - Confusing options"
 msgstr ""
 
-#. Couldn't create render target for CPostEffects
-#: Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp:1450
-msgid "Problem with graphics driver"
+#: Client/loader/Dialogs.cpp:178
+msgid "NVidia Optimus detected!"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:248
-msgid ""
-"Trouble restarting MTA:SA\n"
-"\n"
-"If the problem persists, open Task Manager and\n"
-"stop the 'gta_sa.exe' and 'Multi Theft Auto.exe' processes\n"
-"\n"
-"\n"
-"Try to launch MTA:SA again?"
+#: Client/loader/Dialogs.cpp:179
+msgid "Try each option and see what works:"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:266
-msgid ""
-"Another instance of MTA is already running.\n"
-"\n"
-"If this problem persists, please restart your computer"
+#: Client/loader/Dialogs.cpp:180
+msgid "A - Standard NVidia"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:269
-msgid ""
-"Another instance of MTA is already running.\n"
-"\n"
-"Do you want to terminate it?"
+#: Client/loader/Dialogs.cpp:181
+msgid "B - Alternate NVidia"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:294
-msgid ""
-"Are you having problems running MTA:SA?.\n"
-"\n"
-"Do you want to revert to an earlier version?"
+#: Client/loader/Dialogs.cpp:182
+msgid "C - Standard Intel"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:324
-msgid ""
-"There seems to be a problem launching MTA:SA.\n"
-"Resetting GTA settings can sometimes fix this problem.\n"
-"\n"
-"Do you want to reset GTA settings now?"
+#: Client/loader/Dialogs.cpp:183
+msgid "D - Alternate Intel"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:339
-msgid ""
-"GTA settings have been reset.\n"
-"\n"
-"Press OK to continue."
+#: Client/loader/Dialogs.cpp:184
+msgid "If you get desperate, this might help:"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:344
-#, c-format
-msgid "File could not be deleted: '%s'"
+#: Client/loader/Dialogs.cpp:185
+msgid "If you have already selected an option that works, this might help:"
 msgstr ""
 
-#. No settings to delete, or can't find them
-#: Client/loader/MainFunctions.cpp:352
-msgid ""
-"Are you having problems running MTA:SA?.\n"
-"\n"
-"Do you want to see some online help?"
+#: Client/loader/Dialogs.cpp:186
+msgid "Force windowed mode"
 msgstr ""
 
-#. Inform user
-#: Client/loader/MainFunctions.cpp:388
-msgid ""
-"Are you having problems running MTA:SA?.\n"
-"\n"
-"Do you want to change the following setting?"
+#: Client/loader/Dialogs.cpp:187
+msgid "Don't show again"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:431
-msgid ""
-"Are you having problems running MTA:SA?.\n"
-"\n"
-"Try disabling the following products for GTA and MTA:"
+#: Client/loader/Dialogs.cpp:195
+msgid "Warning: Could not detect anti-virus product"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:465
+#: Client/loader/Dialogs.cpp:197
 msgid ""
-"WARNING\n"
+"MTA could not detect an anti-virus on your PC.\n"
 "\n"
-"MTA:SA has detected unusual activity.\n"
-"Please run a virus scan to ensure your system is secure.\n"
+"Viruses interfere with MTA and degrade your gameplay experience.\n"
 "\n"
+"Press 'Help' for more information."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:468
-#, c-format
-msgid "The detected file was:  %s\n"
+#: Client/loader/Dialogs.cpp:200
+msgid "I have already installed an anti-virus"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:602
+#: Client/loader/Dialogs.cpp:202
 msgid ""
-"An instance of GTA: San Andreas is already running. It needs to be "
-"terminated before MTA:SA can be started. Do you want to do that now?"
+"I will not install an anti-virus.\n"
+"I want my PC to lag and be part of a botnet."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:609
-msgid ""
-"Unable to terminate GTA: San Andreas. If the problem persists, please "
-"restart your computer."
+#: Client/loader/Dialogs.cpp:890 Client/loader/Utils.cpp:534
+msgid "Searching for Grand Theft Auto San Andreas"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:632
-msgid ""
-"Registry entries are missing. Please reinstall Multi Theft Auto: San Andreas."
+#: Client/loader/Dialogs.cpp:893 Client/loader/Utils.cpp:536
+msgid "Please start Grand Theft Auto San Andreas"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:638
-msgid ""
-"The path to your installation of GTA: San Andreas contains unsupported "
-"(unicode) characters. Please move your Grand Theft Auto: San Andreas "
-"installation to a compatible path that contains only standard ASCII "
-"characters and reinstall Multi Theft Auto: San Andreas."
+#: Client/loader/Dialogs.cpp:901 Client/loader/Install.cpp:852
+msgid "Installing update..."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:648
-msgid ""
-"The path to your installation of 'MTA:SA' or 'GTA: San Andreas'\n"
-"contains a ';' (semicolon).\n"
-"\n"
-" If you experience problems when running MTA:SA,\n"
-" move your installation(s) to a path that does not contain a semicolon."
+#: Client/loader/Dialogs.cpp:909 Client/loader/Install.cpp:934
+msgid "Extracting files..."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:810
-msgid ""
-"Load failed. Please ensure that the latest data files have been installed "
-"correctly."
+#: Client/loader/Dialogs.cpp:914 Client/loader/Utils.cpp:1394
+msgid "Copying files..."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:819
-#, c-format
-msgid "Load failed. Please ensure that %s is installed correctly."
+#: Client/loader/Dialogs.cpp:919 Client/loader/Utils.cpp:1454
+msgid "Copy finished early. Everything OK."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:826
-#, c-format
-msgid "Load failed. Could not find gta_sa.exe in %s."
+#: Client/loader/Dialogs.cpp:924 Client/loader/Utils.cpp:1460
+msgid "Finishing..."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:836
-#, c-format
-msgid ""
-"Load failed. %s exists in the GTA directory. Please delete before continuing."
+#: Client/loader/Dialogs.cpp:928 Client/loader/Utils.cpp:1462
+msgid "Done!"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:845
-#, c-format
-msgid "Main file has an incorrect name (%s)"
+#: Client/loader/Utils.cpp:600
+msgid "Select your Grand Theft Auto: San Andreas Installation Directory"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:856
+#: Client/loader/Utils.cpp:968 Client/loader/CInstallManager.cpp:361
+#, c-format
 msgid ""
-"Main file is unsigned. Possible virus activity.\n"
+"MTA:SA needs Administrator access for the following task:\n"
 "\n"
-"See online help if MTA does not work correctly."
+"  '%s'\n"
+"\n"
+"Please confirm in the next window."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:882
+#: Client/loader/Utils.cpp:1069
 #, c-format
-msgid ""
-"Data file %s is missing. Possible virus activity.\n"
-"\n"
-"Consider reinstalling Multi Theft Auto for your security.\n"
-"See online help if MTA does not work correctly."
+msgid "Error loading %s module! (%s)"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:893
+#: Client/loader/Utils.cpp:1502
 #, c-format
 msgid ""
-"Data file %s is modified. Possible virus activity.\n"
+"New installation of %s detected.\n"
 "\n"
-"Consider reinstalling Multi Theft Auto for your security.\n"
-"See online help if MTA does not work correctly."
+"Do you want to copy your settings from %s ?"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:907
-msgid ""
-".asi files are in the 'MTA:SA' or 'GTA: San Andreas' installation "
-"directory.\n"
-"\n"
-"Remove these .asi files if you experience problems with MTA:SA."
+#: Client/loader/Utils.cpp:1541
+#, c-format
+msgid "GTA:SA had trouble opening the file '%s'"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1009
-msgid ""
-"File version mismatch error. Reinstall MTA:SA if you experience problems.\n"
+#: Client/loader/Utils.cpp:1563
+#, c-format
+msgid "GTA:SA is missing the file '%s'."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1018
-msgid "Some files are missing. Reinstall MTA:SA if you experience problems.\n"
+#: Client/loader/Utils.cpp:1588
+msgid "GTA:SA had trouble loading a model."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1030
-msgid ""
-"MTA:SA is not compatible with Windows 'Safe Mode'.\n"
-"\n"
-"Please restart your PC.\n"
+#: Client/loader/Utils.cpp:1590
+msgid "If you recently modified gta3.img, then try reinstalling GTA:SA."
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1123
-msgid "Fix configuration issue"
+#: Client/loader/Utils.cpp:1615
+msgid "GTA:SA had trouble adding an upgrade to a vehicle."
 msgstr ""
 
-#. Try to relaunch as admin if not done so already
-#: Client/loader/MainFunctions.cpp:1157
-msgid "Fix elevation required error"
+#: Client/loader/Utils.cpp:1634
+#, c-format
+msgid "GTA:SA found errors in the file '%s'"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1164
-#, c-format
-msgid ""
-"Could not start Grand Theft Auto: San Andreas.  Please try restarting, or if "
-"the problem persists,contact MTA at www.multitheftauto.com. \n"
-"\n"
-"[%s]"
+#: Client/loader/Utils.cpp:1716
+msgid "Did your computer restart when playing MTA:SA?"
 msgstr ""
 
-#: Client/loader/MainFunctions.cpp:1219
-msgid ""
-"GTA: San Andreas may not have launched correctly. Do you want to terminate "
-"it?"
+#: Client/loader/Utils.cpp:1781
+msgid "Please terminate the following programs before continuing:"
 msgstr ""
 
 #: Client/loader/Install.cpp:265
@@ -2927,179 +2961,227 @@ msgid ""
 "or try running the update with administrator rights."
 msgstr ""
 
-#: Client/loader/Install.cpp:852 Client/loader/Dialogs.cpp:901
-msgid "Installing update..."
-msgstr ""
-
-#: Client/loader/Install.cpp:934 Client/loader/Dialogs.cpp:909
-msgid "Extracting files..."
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:134
-msgid "Quit"
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:151
-msgid "MTA: San Andreas has encountered a problem"
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:152
-msgid "Crash information"
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:153
+#: Client/loader/MainFunctions.cpp:248
 msgid ""
-"Tick the check box to send this crash info to MTA devs using the 'internet'"
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:154
-msgid "Doing so will increase the chance of this crash being fixed."
-msgstr ""
-
-#: Client/loader/Dialogs.cpp:155
-msgid "Do you want to restart MTA: San Andreas ?"
+"Trouble restarting MTA:SA\n"
+"\n"
+"If the problem persists, open Task Manager and\n"
+"stop the 'gta_sa.exe' and 'Multi Theft Auto.exe' processes\n"
+"\n"
+"\n"
+"Try to launch MTA:SA again?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:162
-msgid "MTA: San Andreas - Warning"
+#: Client/loader/MainFunctions.cpp:266
+msgid ""
+"Another instance of MTA is already running.\n"
+"\n"
+"If this problem persists, please restart your computer"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:163
+#: Client/loader/MainFunctions.cpp:269
 msgid ""
-"Your Grand Theft Auto: San Andreas install directory contains these files:"
+"Another instance of MTA is already running.\n"
+"\n"
+"Do you want to terminate it?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:165
+#: Client/loader/MainFunctions.cpp:294
 msgid ""
-"These files are not required and may interfere with the graphical features "
-"in this version of MTA:SA.\n"
+"Are you having problems running MTA:SA?.\n"
 "\n"
-"It is recommended that you remove or rename these files."
+"Do you want to revert to an earlier version?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:167
-msgid "Keep these files, but also show this warning on next start"
+#: Client/loader/MainFunctions.cpp:324
+msgid ""
+"There seems to be a problem launching MTA:SA.\n"
+"Resetting GTA settings can sometimes fix this problem.\n"
+"\n"
+"Do you want to reset GTA settings now?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:168
-msgid "Do not remind me about these files again"
+#: Client/loader/MainFunctions.cpp:339
+msgid ""
+"GTA settings have been reset.\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-
-#: Client/loader/Dialogs.cpp:169
-msgid "Rename these files from *.dll to *.dll.bak"
+
+#: Client/loader/MainFunctions.cpp:344
+#, c-format
+msgid "File could not be deleted: '%s'"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:170
-msgid "Show me these files"
+#. No settings to delete, or can't find them
+#: Client/loader/MainFunctions.cpp:352
+msgid ""
+"Are you having problems running MTA:SA?.\n"
+"\n"
+"Do you want to see some online help?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:171
-msgid "Play MTA:SA"
+#. Inform user
+#: Client/loader/MainFunctions.cpp:388
+msgid ""
+"Are you having problems running MTA:SA?.\n"
+"\n"
+"Do you want to change the following setting?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:177
-msgid "MTA: San Andreas - Confusing options"
+#: Client/loader/MainFunctions.cpp:431
+msgid ""
+"Are you having problems running MTA:SA?.\n"
+"\n"
+"Try disabling the following products for GTA and MTA:"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:178
-msgid "NVidia Optimus detected!"
+#: Client/loader/MainFunctions.cpp:465
+msgid ""
+"WARNING\n"
+"\n"
+"MTA:SA has detected unusual activity.\n"
+"Please run a virus scan to ensure your system is secure.\n"
+"\n"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:179
-msgid "Try each option and see what works:"
+#: Client/loader/MainFunctions.cpp:468
+#, c-format
+msgid "The detected file was:  %s\n"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:180
-msgid "A - Standard NVidia"
+#: Client/loader/MainFunctions.cpp:602
+msgid ""
+"An instance of GTA: San Andreas is already running. It needs to be "
+"terminated before MTA:SA can be started. Do you want to do that now?"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:181
-msgid "B - Alternate NVidia"
+#: Client/loader/MainFunctions.cpp:609
+msgid ""
+"Unable to terminate GTA: San Andreas. If the problem persists, please "
+"restart your computer."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:182
-msgid "C - Standard Intel"
+#: Client/loader/MainFunctions.cpp:632
+msgid ""
+"Registry entries are missing. Please reinstall Multi Theft Auto: San Andreas."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:183
-msgid "D - Alternate Intel"
+#: Client/loader/MainFunctions.cpp:638
+msgid ""
+"The path to your installation of GTA: San Andreas contains unsupported "
+"(unicode) characters. Please move your Grand Theft Auto: San Andreas "
+"installation to a compatible path that contains only standard ASCII "
+"characters and reinstall Multi Theft Auto: San Andreas."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:184
-msgid "If you get desperate, this might help:"
+#: Client/loader/MainFunctions.cpp:648
+msgid ""
+"The path to your installation of 'MTA:SA' or 'GTA: San Andreas'\n"
+"contains a ';' (semicolon).\n"
+"\n"
+" If you experience problems when running MTA:SA,\n"
+" move your installation(s) to a path that does not contain a semicolon."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:185
-msgid "If you have already selected an option that works, this might help:"
+#: Client/loader/MainFunctions.cpp:810
+msgid ""
+"Load failed. Please ensure that the latest data files have been installed "
+"correctly."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:186
-msgid "Force windowed mode"
+#: Client/loader/MainFunctions.cpp:819
+#, c-format
+msgid "Load failed. Please ensure that %s is installed correctly."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:187
-msgid "Don't show again"
+#: Client/loader/MainFunctions.cpp:826
+#, c-format
+msgid "Load failed. Could not find gta_sa.exe in %s."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:194 Client/game_sa/CSettingsSA.cpp:845
-msgid "MTA: San Andreas"
+#: Client/loader/MainFunctions.cpp:836
+#, c-format
+msgid ""
+"Load failed. %s exists in the GTA directory. Please delete before continuing."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:195
-msgid "Warning: Could not detect anti-virus product"
+#: Client/loader/MainFunctions.cpp:845
+#, c-format
+msgid "Main file has an incorrect name (%s)"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:197
+#: Client/loader/MainFunctions.cpp:856
 msgid ""
-"MTA could not detect an anti-virus on your PC.\n"
-"\n"
-"Viruses interfere with MTA and degrade your gameplay experience.\n"
+"Main file is unsigned. Possible virus activity.\n"
 "\n"
-"Press 'Help' for more information."
+"See online help if MTA does not work correctly."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:200
-msgid "I have already installed an anti-virus"
+#: Client/loader/MainFunctions.cpp:882
+#, c-format
+msgid ""
+"Data file %s is missing. Possible virus activity.\n"
+"\n"
+"Consider reinstalling Multi Theft Auto for your security.\n"
+"See online help if MTA does not work correctly."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:202
+#: Client/loader/MainFunctions.cpp:893
+#, c-format
 msgid ""
-"I will not install an anti-virus.\n"
-"I want my PC to lag and be part of a botnet."
+"Data file %s is modified. Possible virus activity.\n"
+"\n"
+"Consider reinstalling Multi Theft Auto for your security.\n"
+"See online help if MTA does not work correctly."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:890 Client/loader/Utils.cpp:534
-msgid "Searching for Grand Theft Auto San Andreas"
+#: Client/loader/MainFunctions.cpp:907
+msgid ""
+".asi files are in the 'MTA:SA' or 'GTA: San Andreas' installation "
+"directory.\n"
+"\n"
+"Remove these .asi files if you experience problems with MTA:SA."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:893 Client/loader/Utils.cpp:536
-msgid "Please start Grand Theft Auto San Andreas"
+#: Client/loader/MainFunctions.cpp:1009
+msgid ""
+"File version mismatch error. Reinstall MTA:SA if you experience problems.\n"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:914 Client/loader/Utils.cpp:1394
-msgid "Copying files..."
+#: Client/loader/MainFunctions.cpp:1018
+msgid "Some files are missing. Reinstall MTA:SA if you experience problems.\n"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:919 Client/loader/Utils.cpp:1454
-msgid "Copy finished early. Everything OK."
+#: Client/loader/MainFunctions.cpp:1030
+msgid ""
+"MTA:SA is not compatible with Windows 'Safe Mode'.\n"
+"\n"
+"Please restart your PC.\n"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:924 Client/loader/Utils.cpp:1460
-msgid "Finishing..."
+#: Client/loader/MainFunctions.cpp:1123
+msgid "Fix configuration issue"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:928 Client/loader/Utils.cpp:1462
-msgid "Done!"
+#. Try to relaunch as admin if not done so already
+#: Client/loader/MainFunctions.cpp:1157
+msgid "Fix elevation required error"
 msgstr ""
 
-#: Client/loader/CInstallManager.cpp:361 Client/loader/Utils.cpp:968
+#: Client/loader/MainFunctions.cpp:1164
 #, c-format
 msgid ""
-"MTA:SA needs Administrator access for the following task:\n"
-"\n"
-"  '%s'\n"
+"Could not start Grand Theft Auto: San Andreas.  Please try restarting, or if "
+"the problem persists,contact MTA at www.multitheftauto.com. \n"
 "\n"
-"Please confirm in the next window."
+"[%s]"
+msgstr ""
+
+#: Client/loader/MainFunctions.cpp:1219
+msgid ""
+"GTA: San Andreas may not have launched correctly. Do you want to terminate "
+"it?"
 msgstr ""
 
 #: Client/loader/CInstallManager.cpp:376
@@ -3199,88 +3281,6 @@ msgstr ""
 msgid "Update compatibility settings"
 msgstr ""
 
-#: Client/loader/Utils.cpp:600
-msgid "Select your Grand Theft Auto: San Andreas Installation Directory"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1069
-#, c-format
-msgid "Error loading %s module! (%s)"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1502
-#, c-format
-msgid ""
-"New installation of %s detected.\n"
-"\n"
-"Do you want to copy your settings from %s ?"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1541
-#, c-format
-msgid "GTA:SA had trouble opening the file '%s'"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1563
-#, c-format
-msgid "GTA:SA is missing the file '%s'."
-msgstr ""
-
-#: Client/loader/Utils.cpp:1588
-msgid "GTA:SA had trouble loading a model."
-msgstr ""
-
-#: Client/loader/Utils.cpp:1590
-msgid "If you recently modified gta3.img, then try reinstalling GTA:SA."
-msgstr ""
-
-#: Client/loader/Utils.cpp:1615
-msgid "GTA:SA had trouble adding an upgrade to a vehicle."
-msgstr ""
-
-#: Client/loader/Utils.cpp:1634
-#, c-format
-msgid "GTA:SA found errors in the file '%s'"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1716
-msgid "Did your computer restart when playing MTA:SA?"
-msgstr ""
-
-#: Client/loader/Utils.cpp:1781
-msgid "Please terminate the following programs before continuing:"
-msgstr ""
-
-#: Client/game_sa/CSettingsSA.cpp:767
-msgid "Can't find valid screen resolution."
-msgstr ""
-
-#. Confirm that res should be used
-#: Client/game_sa/CSettingsSA.cpp:843
-msgid "Are you sure you want to use this screen resolution?"
-msgstr ""
-
-#: Client/cefweb/CWebsiteRequests.cpp:19
-msgid "Website requests"
-msgstr ""
-
-#: Client/cefweb/CWebsiteRequests.cpp:27
-msgid ""
-"The server requests the following websites in order to load them (later):"
-msgstr ""
-
-#: Client/cefweb/CWebsiteRequests.cpp:33
-msgid "NEVER ENTER SENSITIVE DATA TO PROTECT THEM FROM BEING STOLEN"
-msgstr ""
-
-#: Client/cefweb/CWebsiteRequests.cpp:46
-msgid "Remember decision"
-msgstr ""
-
-#: Client/cefweb/CWebsiteRequests.cpp:57
-msgid "Deny"
-msgstr ""
-
 #. Populate the message and show the box
 #: Shared/mods/deathmatch/logic/Utils.cpp:127
 #, c-format
diff --git a/Shared/installer/locale/en_US.pot b/Shared/installer/locale/en_US.pot
index 3af1c40ebd..5ad1d78304 100644
--- a/Shared/installer/locale/en_US.pot
+++ b/Shared/installer/locale/en_US.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas Installer 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-26 02:25\n"
+"POT-Creation-Date: 2024-09-17 02:47\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -244,29 +244,29 @@ msgid "Editor"
 msgstr ""
 
 #. INST_SEC_DEVELOPER
-#: Shared/installer/nightly.nsi:983
+#: Shared/installer/nightly.nsi:986
 msgid "Development"
 msgstr ""
 
 #. UNINST_SUCCESS
-#: Shared/installer/nightly.nsi:1031
+#: Shared/installer/nightly.nsi:1034
 msgid "$(^Name) was successfully removed from your computer."
 msgstr ""
 
 #. UNINST_FAIL
-#: Shared/installer/nightly.nsi:1038
+#: Shared/installer/nightly.nsi:1041
 msgid "Uninstallation has failed!"
 msgstr ""
 
 #. UNINST_REQUEST
-#: Shared/installer/nightly.nsi:1046
+#: Shared/installer/nightly.nsi:1049
 msgid ""
 "Are you sure you want to completely remove $(^Name) and all of its "
 "components?"
 msgstr ""
 
 #. UNINST_REQUEST_NOTE
-#: Shared/installer/nightly.nsi:1047
+#: Shared/installer/nightly.nsi:1050
 msgid ""
 "Uninstalling before update?$\r"
 "$\n"
@@ -276,7 +276,7 @@ msgid ""
 msgstr ""
 
 #. UNINST_DATA_REQUEST
-#: Shared/installer/nightly.nsi:1060
+#: Shared/installer/nightly.nsi:1063
 msgid ""
 "Would you like to keep your data files (such as resources, screenshots and "
 "server configuration)? If you click no, any resources, configurations or "
@@ -284,27 +284,27 @@ msgid ""
 msgstr ""
 
 #. UAC_RIGHTS1
-#: Shared/installer/nightly.nsi:1243
+#: Shared/installer/nightly.nsi:1246
 msgid "This installer requires admin access, try again"
 msgstr ""
 
 #. UAC_RIGHTS_UN
-#: Shared/installer/nightly.nsi:1244
+#: Shared/installer/nightly.nsi:1247
 msgid "This uninstaller requires admin access, try again"
 msgstr ""
 
 #. UAC_RIGHTS3
-#: Shared/installer/nightly.nsi:1245
+#: Shared/installer/nightly.nsi:1248
 msgid "Logon service not running, aborting!"
 msgstr ""
 
 #. UAC_RIGHTS4
-#: Shared/installer/nightly.nsi:1246
+#: Shared/installer/nightly.nsi:1249
 msgid "Unable to elevate"
 msgstr ""
 
 #. INST_MTA_CONFLICT
-#: Shared/installer/nightly.nsi:1842
+#: Shared/installer/nightly.nsi:1845
 msgid ""
 "A different major version of MTA ($1) already exists at that path.$\n"
 "$\n"
@@ -313,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. INST_GTA_CONFLICT
-#: Shared/installer/nightly.nsi:1846
+#: Shared/installer/nightly.nsi:1849
 msgid ""
 "MTA cannot be installed into the same directory as GTA:SA.$\n"
 "$\n"
@@ -322,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. INST_GTA_ERROR1
-#: Shared/installer/nightly.nsi:1849
+#: Shared/installer/nightly.nsi:1852
 msgid ""
 "The selected directory does not exist.$\n"
 "$\n"
@@ -330,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. INST_GTA_ERROR2
-#: Shared/installer/nightly.nsi:1851
+#: Shared/installer/nightly.nsi:1854
 msgid ""
 "Could not find GTA:SA installed at $GTA_DIR $\n"
 "$\n"
@@ -338,19 +338,19 @@ msgid ""
 msgstr ""
 
 #. INST_CHOOSE_LOC_TOP
-#: Shared/installer/nightly.nsi:1969
+#: Shared/installer/nightly.nsi:1972
 msgid "Choose Install Location"
 msgstr ""
 
 #. INST_CHOOSE_LOC
-#: Shared/installer/nightly.nsi:1970
+#: Shared/installer/nightly.nsi:1973
 msgid ""
 "Choose the folder in which to install ${PRODUCT_NAME_NO_VER} "
 "${PRODUCT_VERSION}"
 msgstr ""
 
 #. INST_CHOOSE_LOC2
-#: Shared/installer/nightly.nsi:1971
+#: Shared/installer/nightly.nsi:1974
 msgid ""
 "${PRODUCT_NAME_NO_VER} ${PRODUCT_VERSION} will be installed in the following folder.$\n"
 "To install in a different folder, click Browse and select another folder.$\n"
@@ -359,63 +359,63 @@ msgid ""
 msgstr ""
 
 #. INST_CHOOSE_LOC3
-#: Shared/installer/nightly.nsi:1973
+#: Shared/installer/nightly.nsi:1976
 msgid "Destination Folder"
 msgstr ""
 
 #. INST_CHOOSE_LOC_BROWSE
-#: Shared/installer/nightly.nsi:1974
+#: Shared/installer/nightly.nsi:1977
 msgid "Browse..."
 msgstr ""
 
 #. INST_CHOOSE_LOC_DEFAULT
-#: Shared/installer/nightly.nsi:1975
+#: Shared/installer/nightly.nsi:1978
 msgid "Default"
 msgstr ""
 
 #. INST_CHOOSE_LOC_LAST_USED
-#: Shared/installer/nightly.nsi:1976
+#: Shared/installer/nightly.nsi:1979
 msgid "Last used"
 msgstr ""
 
 #. INST_CHOOSE_LOC_CUSTOM
-#: Shared/installer/nightly.nsi:1977
+#: Shared/installer/nightly.nsi:1980
 msgid "Custom"
 msgstr ""
 
 #. INST_CHOOSE_LOC4
-#: Shared/installer/nightly.nsi:2155
+#: Shared/installer/nightly.nsi:2158
 msgid ""
 "Select the folder to install ${PRODUCT_NAME_NO_VER} ${PRODUCT_VERSION} in:"
 msgstr ""
 
 #. INST_LOC_OW
-#: Shared/installer/nightly.nsi:2173
+#: Shared/installer/nightly.nsi:2176
 msgid ""
 "Warning: A different major version of MTA ($1) already exists at that path."
 msgstr ""
 
 #. INST_LOC_UPGRADE
-#: Shared/installer/nightly.nsi:2174
+#: Shared/installer/nightly.nsi:2177
 msgid "Installation type:  Upgrade"
 msgstr ""
 
 #. NETTEST_TITLE1
-#: Shared/installer/nightly.nsi:2408
+#: Shared/installer/nightly.nsi:2411
 msgid "Online update"
 msgstr ""
 
 #. NETTEST_TITLE2
-#: Shared/installer/nightly.nsi:2409
+#: Shared/installer/nightly.nsi:2412
 msgid "Checking for update information"
 msgstr ""
 
 #. NETTEST_STATUS1
-#: Shared/installer/nightly.nsi:2410
+#: Shared/installer/nightly.nsi:2413
 msgid "Checking for installer update information..."
 msgstr ""
 
 #. NETTEST_STATUS2
-#: Shared/installer/nightly.nsi:2411
+#: Shared/installer/nightly.nsi:2414
 msgid "Please ensure your firewall is not blocking"
 msgstr ""
diff --git a/Shared/installer/nightly.nsi b/Shared/installer/nightly.nsi
index 7890e37fdc..d270a0d719 100644
--- a/Shared/installer/nightly.nsi
+++ b/Shared/installer/nightly.nsi
@@ -688,9 +688,12 @@ SectionGroup /e "$(INST_SEC_CLIENT)" SECGCLIENT
 
 
 	# Added as per https://bitbucket.org/chromiumembedded/cef/commits/8424f166ccef
-        File "${FILES_ROOT}\mta\CEF\chrome_100_percent.pak"
-        File "${FILES_ROOT}\mta\CEF\chrome_200_percent.pak"
-        File "${FILES_ROOT}\mta\CEF\resources.pak"
+	# Not currently using \mta\cef\ due to https://github.com/chromiumembedded/cef/issues/3749#issuecomment-2278568964 (it's already crashing and likely won't remain supported)
+        SetOutPath "$INSTDIR\MTA"
+
+        File "${FILES_ROOT}\mta\chrome_100_percent.pak"
+        File "${FILES_ROOT}\mta\chrome_200_percent.pak"
+        File "${FILES_ROOT}\mta\resources.pak"
 
 	# Clarification for the below 4 deprecated files: https://bitbucket.org/chromiumembedded/cef/commits/8424f166ccef
         #File "${FILES_ROOT}\mta\CEF\cef.pak"
diff --git a/Shared/mods/deathmatch/logic/CDebugHookManager.cpp b/Shared/mods/deathmatch/logic/CDebugHookManager.cpp
index 48572d7364..b083746acc 100644
--- a/Shared/mods/deathmatch/logic/CDebugHookManager.cpp
+++ b/Shared/mods/deathmatch/logic/CDebugHookManager.cpp
@@ -659,7 +659,8 @@ bool CDebugHookManager::CallHook(const char* szName, const std::vector<SDebugHoo
             CLuaArgument* returnedValue = *returnValues.begin();
             if (returnedValue->GetType() == LUA_TSTRING)
             {
-                if (returnedValue->GetString() == "skip")
+                // We don't want to skip the creation of new debug hooks
+                if (returnedValue->GetString() == "skip" && strcmp(szName, "addDebugHook"))
                     bSkip = true;
             }
         }
diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
index d46699fd22..6529607d5a 100644
--- a/utils/buildactions/install_cef.lua
+++ b/utils/buildactions/install_cef.lua
@@ -6,11 +6,11 @@ premake.modules.install_cef = {}
 local CEF_PATH = "vendor/cef3/cef/"
 local CEF_TEMP_PATH = "vendor/cef3/"
 local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
-local CEF_URL_SUFFIX = "_windows32_beta_minimal.tar.bz2"
+local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
 -- Change here to update CEF version
-local CEF_VERSION = "129.0.4+g9774348+chromium-129.0.6668.29"
-local CEF_HASH = "70b021ac8921de30c31241d85be8ad5abc65adec4283aff726600319f27034b1"
+local CEF_VERSION = "128.4.12+g1d7a1f9+chromium-128.0.6613.138"
+local CEF_HASH = "bee2d201d5d259dc3a8f564dfb6fce43212437d5e62e139aa34777e1596d4a1c"
 
 function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX
diff --git a/vendor/cef3/premake5.lua b/vendor/cef3/premake5.lua
index 9b8dc65702..115d004975 100644
--- a/vendor/cef3/premake5.lua
+++ b/vendor/cef3/premake5.lua
@@ -20,7 +20,7 @@ project "CEF"
 	postbuildcommands {
 		"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
-		"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta/cef\"",
+		"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""
 	}