Merge pull request #62 from Tindergarten/master

Armory Fix
This commit is contained in:
Samuel
2018-04-14 12:44:47 +02:00
committed by GitHub
7 changed files with 8 additions and 6 deletions
+2
View File
@@ -7,6 +7,7 @@ version '1.0.5'
server_scripts {
'@es_extended/locale.lua',
'locales/br.lua',
'locales/de.lua',
'locales/en.lua',
'locales/fr.lua',
'locales/es.lua',
@@ -18,6 +19,7 @@ server_scripts {
client_scripts {
'@es_extended/locale.lua',
'locales/br.lua',
'locales/de.lua',
'locales/en.lua',
'locales/fr.lua',
'locales/es.lua',
+1 -1
View File
@@ -1341,7 +1341,7 @@ AddEventHandler('esx_policejob:hasEnteredEntityZone', function(entity)
if PlayerData.job ~= nil and PlayerData.job.name == 'police' and not IsPedInAnyVehicle(playerPed, false) then
CurrentAction = 'remove_entity'
CurrentActionMsg = _U('remove_object')
CurrentActionMsg = _U('remove_prop')
CurrentActionData = {entity = entity}
end
+1 -1
View File
@@ -70,7 +70,7 @@ Locales['br'] = {
['amount_of_deposit'] = 'Quantidade de depósito',
['open_bossmenu'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu',
-- Misc
['remove_object'] = 'Pressione ~INPUT_CONTEXT~ para remover o objeto',
['remove_prop'] = 'Pressione ~INPUT_CONTEXT~ para remover o objeto',
['map_blip'] = 'Departamento de Polícia',
-- Notifications
['from'] = '~s~ de ~b~',
+1 -1
View File
@@ -70,7 +70,7 @@ Locales['de'] = {
['amount_of_deposit'] = 'Betrag zum einzahlen',
['open_bossmenu'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen',
-- Misc
['remove_object'] = 'Drücke ~INPUT_CONTEXT~ um das Objekt zu entfernen',
['remove_prop'] = 'Drücke ~INPUT_CONTEXT~ um das Objekt zu entfernen',
['map_blip'] = 'Polizeistation',
-- Notifications
['from'] = '~s~ von ~b~',
+1 -1
View File
@@ -92,7 +92,7 @@ Locales['en'] = {
['inventory'] = 'inventory',
['police_stock'] = 'Police Stock',
-- Misc
['remove_object'] = 'press ~INPUT_CONTEXT~ to delete the object',
['remove_prop'] = 'press ~INPUT_CONTEXT~ to delete the object',
['map_blip'] = 'police Station',
-- Notifications
['from'] = '~s~ from ~b~',
+1 -1
View File
@@ -83,7 +83,7 @@ Locales['es'] = {
['inventory'] = 'inventario',
['police_stock'] = 'Almacen Policial',
-- Misc
['remove_object'] = 'Presionar ~INPUT_CONTEXT~ para eliminar el objeto',
['remove_prop'] = 'Presionar ~INPUT_CONTEXT~ para eliminar el objeto',
['map_blip'] = 'Comisaría de policía',
-- Notifications
['from'] = '~s~ de ~b~',
+1 -1
View File
@@ -92,7 +92,7 @@ Locales['fr'] = {
['inventory'] = 'inventaire',
['police_stock'] = 'Police Stock',
-- Misc
['remove_object'] = 'appuyez sur ~INPUT_CONTEXT~ pour enlever l\'objet',
['remove_prop'] = 'appuyez sur ~INPUT_CONTEXT~ pour enlever l\'objet',
['map_blip'] = 'Commissariat',
-- Notifications
['from'] = '~s~ à ~b~',