Merge remote-tracking branch 'upstream/main' into r0ad-veh

This commit is contained in:
r0adra93
2022-10-06 01:51:37 -04:00
4 changed files with 101 additions and 7 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
# License
QBCore Framework
Copyright (C) 2021 Joshua Eger
Copyright (C) 2015-2022 ESX (Jérémie N'gadi), Joshua Eger
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+2 -2
View File
@@ -17,8 +17,8 @@ local Translations = {
received_paycheck = '$%{value} لقد استملت راتبك الشهري',
job_info = '%{value} | %{value2} | %{value3}',
gang_info = '%{value} | %{value2}',
on_duty = 'انت الان خارج الخدمة',
off_duty = 'انت الان في الخدمة',
on_duty = 'انت الان في الخدمة',
off_duty = 'انت الان خارج الخدمة',
checking_ban = 'نحن نتحقق اذا كنت محجوب من السيرفر. %s مرحبا',
join_server = '{Server Name} قي %s مرحبا',
checking_whitelisted = 'نتحقق ما اذا كان مسموح لك بالدخول %s مرحبا '
+97 -4
View File
@@ -8,11 +8,21 @@ local Translations = {
company_too_poor = 'Teie tööandja on võlgades',
item_not_exist = 'Asi ei eksisteeri',
too_heavy = 'Inventuur on liiga täis',
location_not_exist = 'Asukoht ei eksisteeri',
duplicate_license = 'Leiti Rockstari litsentsi duplikaat',
no_valid_license = 'Kehtivat Rockstari litsentsi ei leitud',
not_whitelisted = 'Te ei ole selle serveri jaoks Allowlisted'
not_whitelisted = 'Te ei ole selle serveri jaoks Allowlisted',
server_already_open = 'Server on juba avatud',
server_already_closed = 'Server on juba suletud',
no_permission = 'Teil pole selleks õigusi..',
no_waypoint = 'Ühtegi punkti ei ole märgitud.',
tp_error = 'Teleportimise viga.',
},
success = {
server_opened = 'Server on avatud',
server_closed = 'Server on suletud',
teleported_waypoint = 'Teleporteerusid punktile.',
},
success = {},
info = {
received_paycheck = 'Saite oma palga $%{value}',
job_info = 'Töö: %{value} | Auaste: %{value2} | Tööpostil: %{value3}',
@@ -21,8 +31,91 @@ local Translations = {
off_duty = 'Sa kirjutasid ennast töölt vabaks!',
checking_ban = 'Tere %s. Me kontrollime, kas olete keelustatud.',
join_server = 'Tere tulemast %s serverisse {Server Name}.',
checking_whitelisted = 'Tere %s. Kontrollime teie Allowlisti staatust.'
}
checking_whitelisted = 'Tere %s. Kontrollime teie Allowlisti staatust.',
exploit_banned = 'Olete saanud petmise eest mängukeelu. Lisateabe saamiseks vaadake meie Discordi: %{discord}',
exploit_dropped = 'Sind visati serverist välja petmise tõttu.',
},
command = {
tp = {
help = 'TP mängijale või koordinaatidele (ainult administraator)',
params = {
x = { name = 'id/x', help = 'ID mängija või X positsioon'},
y = { name = 'y', help = 'Y positsioon'},
z = { name = 'z', help = 'Z positsioon'},
},
},
tpm = { help = 'TP Markerile (ainult administraator)' },
togglepvp = { help = 'PVP serveris sisse- ja väljalülitamine (ainult administraator)' },
addpermission = {
help = 'Andke mängijale õigused (ainult jumal)',
params = {
id = { name = 'id', help = 'mängija ID' },
permission = { name = 'permission', help = 'Permission level' },
},
},
removepermission = {
help = 'Eemaldage mängija õigused (ainult jumal)',
params = {
id = { name = 'id', help = 'mängija ID' },
permission = { name = 'õigused', help = 'Õiguse tase' },
},
},
openserver = { help = 'Ava server kõigile (ainult administraator)' },
closeserver = {
help = 'Sulgege server ilma õigusteta inimeste jaoks (ainult administraator)',
params = {
reason = { name = 'põhjus', help = 'Sulgemise põhjus (valikuline)' },
},
},
car = {
help = 'Sõiduki loomine (ainult administraator)',
params = {
model = { name = 'mudel', help = 'Sõiduki mudeli nimi' },
},
},
dv = { help = 'Sõiduki kustutamine (ainult administraator)' },
givemoney = {
help = 'Mängija rahasumma määramine (ainult administraator)',
params = {
id = { name = 'id', help = 'Mängija ID' },
moneytype = { name = 'rahatüüp', help = 'Raha liik (sularaha, pank, krüpto)' },
amount = { name = 'kogus', help = 'Rahasumma' },
},
},
setmoney = {
help = 'Mängija rahasumma määramine (ainult administraator)',
params = {
id = { name = 'id', help = 'Mängija ID' },
moneytype = { name = 'rahatüüp', help = 'Raha liik (sularaha, pank, krüpto)' },
amount = { name = 'kogus', help = 'Rahasumma' },
},
},
job = { help = 'Kontrollige oma töödkohta' },
setjob = {
help = 'Mängijale töökoha määramine (ainult administraator)',
params = {
id = { name = 'id', help = 'Mängija ID' },
job = { name = 'töö', help = 'Töökoha nimi' },
grade = { name = 'tase', help = 'Tüükoha tase' },
},
},
gang = { help = 'Kontrollige oma grupeeringut' },
setgang = {
help = 'Määra mängija grupeeringu (ainult administraator)',
params = {
id = { name = 'id', help = 'Player ID' },
gang = { name = 'tase', help = 'Grupeeringu nimi' },
grade = { name = 'tase', help = 'Grupeeringu tase' },
},
},
ooc = { help = 'OOC vestlussõnum' },
me = {
help = 'Kuva kohalikud sõnumid',
params = {
message = { name = 'sõnum', help = 'Sõnum saatmiseks' }
},
},
},
}
if GetConvar('qb_locale', 'en') == 'et' then
+1
View File
@@ -158,6 +158,7 @@ QBShared.Items = {
['microsmg_luxuryfinish'] = {['name'] = 'microsmg_luxuryfinish', ['label'] = 'SMG Finish', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'pistol_suppressor.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'Micro SMG Luxury Finish'},
['smg_defaultclip'] = {['name'] = 'smg_defaultclip', ['label'] = 'SMG Clip', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'pistol_extendedclip.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Default Clip'},
['smg_extendedclip'] = {['name'] = 'smg_extendedclip', ['label'] = 'SMG EXT Clip', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'pistol_extendedclip.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Extended Clip'},
['smg_suppressor'] = {['name'] = 'smg_suppressor', ['label'] = 'SMG Suppressor', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'pistol_suppressor.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Suppressor'},
['smg_drum'] = {['name'] = 'smg_drum', ['label'] = 'SMG Drum', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'rifle_drummag.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Drum'},
['smg_scope'] = {['name'] = 'smg_scope', ['label'] = 'SMG Scope', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'smg_scope.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Scope Attachment'},
['smg_luxuryfinish'] = {['name'] = 'smg_luxuryfinish', ['label'] = 'SMG Finish', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'pistol_suppressor.png', ['unique'] = false, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'SMG Luxury Finish'},