Synchronize changes from 1.6 master branch [ci skip]

24708f8 Colshape IDs fix (#4115)
c10a283 Update crowdin-translators.json

Author: github-actions[bot]

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -447,7 +447,7 @@ void CClientMarker::CreateOfType(int iType)
             CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
             pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_NORMAL);
             m_pMarker = pCheckpoint;
-            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -458,7 +458,7 @@ void CClientMarker::CreateOfType(int iType)
             CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
             pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_RING);
             m_pMarker = pCheckpoint;
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -469,7 +469,7 @@ void CClientMarker::CreateOfType(int iType)
             CClient3DMarker* p3DMarker = new CClient3DMarker(this);
             p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
             m_pMarker = p3DMarker;
-            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -480,7 +480,7 @@ void CClientMarker::CreateOfType(int iType)
             CClient3DMarker* p3DMarker = new CClient3DMarker(this);
             p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_ARROW);
             m_pMarker = p3DMarker;
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -489,7 +489,7 @@ void CClientMarker::CreateOfType(int iType)
         case MARKER_CORONA:
         {
             m_pMarker = new CClientCorona(this);
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;

utils/localization/generate-translators/crowdin-translators.json

@@ -2,7 +2,9 @@
   "ar": [
     "#Bero",
     "#BrosS",
+    "#xMD. (1Lorenzo)",
     "3BaDy",
+    "A W (ajxb)",
     "Ahmed \"Ahmedly\" Ly",
     "ALBANDER",
     "Alnassre",
@@ -13,7 +15,9 @@
     "Conolel",
     "DABL",
     "devmedoo",
+    "Elizeu Monteiro (elizeuszernek)",
     "ERROR10110",
+    "frazy games (Ahmedos)",
     "Hamdy",
     "Hani \"TD[M]ER\" Rouatbi",
     "Haxardous",