From d1e64919ff63cbbc855a0856a766f3385f24a74f Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 22:56:50 +0100 Subject: [PATCH 1/4] feat(esx_property): update native names --- [esx_addons]/esx_property/client/cctv.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 3ef2f663..24a6dbe1 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -47,41 +47,41 @@ function CCTV(PropertyID) if Config.CCTV.PictureWebook ~= "" then PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(1) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true)) InstructionButtonMessage(TranslateCap("take_picture")) PopScaleformMovieFunctionVoid() end PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(2) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true)) InstructionButtonMessage(TranslateCap("rot_left_right")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(3) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true)) InstructionButtonMessage(TranslateCap("rot_up_down")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(4) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true)) InstructionButtonMessage(TranslateCap("zoom")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(5) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true)) InstructionButtonMessage(TranslateCap("night_vision")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(0) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true)) InstructionButtonMessage(TranslateCap("exit")) PopScaleformMovieFunctionVoid() From 5ad4c1b2c0f2452a5c8eb381bef0858e463bf6b2 Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:03:45 +0100 Subject: [PATCH 2/4] fix(esx_property): move 'es' locales to correct location --- [esx_addons]/esx_property/{ => locales}/es.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename [esx_addons]/esx_property/{ => locales}/es.lua (100%) diff --git a/[esx_addons]/esx_property/es.lua b/[esx_addons]/esx_property/locales/es.lua similarity index 100% rename from [esx_addons]/esx_property/es.lua rename to [esx_addons]/esx_property/locales/es.lua From 58360836e7efe30bed62b2291b39c3caabc198ca Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:13:09 +0100 Subject: [PATCH 3/4] feat(esx_property): remove unused variables --- [esx_addons]/esx_property/client/cctv.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 24a6dbe1..80a9bf3d 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -18,7 +18,6 @@ function CCTV(PropertyID) DoScreenFadeOut(500) Wait(500) - local PlyCoordsBefore = GetEntityCoords(PlayerPedId()) local Property = Properties[PropertyID] local CamTakePic = true if Property.cctv.enabled then @@ -99,7 +98,6 @@ function CCTV(PropertyID) end ESX.CloseContext() local cctvcam = nil - local angleZ = 0.0 ClearFocus() local playerPed = PlayerPedId() cctvcam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", From d822a902730d00403412a13cca4b65d2b36a2ec3 Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:27:40 +0100 Subject: [PATCH 4/4] fix(esx_multicharacter): update 'hu' locales # add missing locales # add new locales PR #777 --- [esx]/esx_multicharacter/locales/hu.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/[esx]/esx_multicharacter/locales/hu.lua b/[esx]/esx_multicharacter/locales/hu.lua index a5266064..f6d45163 100644 --- a/[esx]/esx_multicharacter/locales/hu.lua +++ b/[esx]/esx_multicharacter/locales/hu.lua @@ -1,15 +1,22 @@ Locales["hu"] = { ["male"] = "Férfi", ["female"] = "Nő", - ["delete_label"] = "Törlés %s %s?", ["select_char"] = "Karakter kiválasztása", - ["select_char_description"] = "Select a character to play as.", + ["select_char_description"] = "Karakter kiválasztása a játékhoz.", ["create_char"] = "Új karakter létrehozása", ["char_play"] = "Karakter kiválasztása", + ["char_play_description"] = "Visszatérés a városba.", ["char_disabled"] = "Karakter le van tiltva", + ["char_disabled_description"] = "Ez a karakter nem használható.", ["char_delete"] = "Karakter törlése", - ["cancel"] = "Mégsem", - ["confirm"] = "Megerősítés", + ["char_delete_description"] = "Karakter végleges törlése.", + ["char_delete_confirmation"] = "Törlés megerősítés", + ["char_delete_confirmation_description"] = "Biztosan törölni szeretnéd a kiválasztott karaktert?", + ["char_delete_yes_description"] = "Igen, törölni szeretném", + ["char_delete_no_description"] = "Nem, vissza a karakter opciókhoz", + ["character"] = "Karakter: %s", + ["return"] = "Vissza", + ["return_description"] = "Vissza a karakter választáshoz.", ["command_setslots"] = "Játékos karakter slotok számának beállítása", ["command_remslots"] = "Játékos karakter slotok számának eltávolítása", ["command_enablechar"] = "Játékos karakterének engedélyezése",