From 5bf8dc2b80d99410c18322bfe7571116e8c18332 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 19 Jun 2018 21:52:38 +0200 Subject: [PATCH] Major locale formatting improvements --- locales/br.lua | 33 ++++++++++++++++++--------------- locales/de.lua | 41 ++++++++++++++++++++++------------------- locales/en.lua | 27 +++++++++++++++------------ locales/fi.lua | 39 +++++++++++++++++++++------------------ locales/fr.lua | 33 ++++++++++++++++++--------------- locales/sv.lua | 29 ++++++++++++++++------------- server/main.lua | 32 ++++++++++++++++---------------- server/paycheck.lua | 8 ++++---- 8 files changed, 130 insertions(+), 112 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 1c4ea005..5b5231c3 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,4 +1,5 @@ Locales['br'] = { + -- Inventory ['cash'] = 'efectivo $%s', ['inventory'] = 'inventario', ['use'] = 'usar', @@ -6,36 +7,38 @@ Locales['br'] = { ['remove'] = 'remover', ['return'] = 'voltar', ['amount'] = 'quantidade', + ['giveammo'] = 'Dar muniçao', ['amountammo'] = 'quantidade de muniçao', ['noammo'] = 'voce nao tem todas essas muniçoes!', - ['threw_weapon'] = 'voce ~r~atirou~s~ ~y~1x~s~ ~b~%s~s~ com ~o~%sx~s~ balas!', + ['gave_item'] = 'voce deu ~y~%sx~s~ ~b~%s~s~ para ~y~%s~s~', + ['received_item'] = 'voce recebeu ~y~%sx~s~ ~b~%s~s~ de ~b~%s~s~', ['gave_weapon'] = 'voce deu ~y~1x~s~ ~b~%s~s~ com ~o~%sx~s~ balas para ~y~%s~s~.', - ['recived_weapon'] = 'voce recebeu ~y~1x~s~ ~b~%s~s~ com ~o~%sx~s~ balas de ~b~%s~s~.', + ['received_weapon'] = 'voce recebeu ~y~1x~s~ ~b~%s~s~ com ~o~%sx~s~ balas de ~b~%s~s~.', ['gave_ammo'] = 'voce deu ~o~%sx~s~ balas para ~y~%s~s~.', - ['recived_ammo'] = 'voce recebeu ~o~%sx~s~ balas de ~b~%s~s~.', - ['giveammo'] = 'Dar muniçao', + ['received_ammo'] = 'voce recebeu ~o~%sx~s~ balas de ~b~%s~s~.', + ['gave_money'] = 'voce deu ~g~$%s~s~ para ~y~%s~s~', + ['received_money'] = 'voce recebeu ~g~$%s~s~ de ~b~%s~s~', + ['gave_account_money'] = 'voce deu ~g~$%s~s~ (%s) para ~y~%s~s~', + ['received_account_money'] = 'voce recebeu ~g~$%s~s~ (%s) de ~b~%s~s~', ['amount_invalid'] = 'quantidade invalida', ['players_nearby'] = 'nenhum jogador por perto', - ['ex_inv_lim'] = 'acao nao e possivel, excedendo o limite de estoque para ~b~', - ['yougave'] = 'voce deu', - ['youreceived'] = 'voce recebeu', - ['to'] = '~s~ para ~b~', - ['by'] = '~s~ de ~b~', + ['ex_inv_lim'] = 'acao nao e possivel, excedendo o limite de estoque para ~y~%s~s~', ['imp_invalid_quantity'] = 'acao impossivel, quantidade invalida', ['imp_invalid_amount'] = 'acao impossivel, valor invalido', ['delete_five_min'] = '~r~excluir~s~ em 5 minutos', ['threw'] = 'voce ~r~jogou~s~', - -- Relacionado com salario - ['recived_salary'] = 'voce recebeu seu salario: ~g~$%s~s~ ', - ['recived_help'] = 'voce recebeu seu cheque de bem-estar: ~g~$%s~s~ ', + ['threw_weapon'] = 'voce ~r~atirou~s~ ~y~1x~s~ ~b~%s~s~ com ~o~%sx~s~ balas!', + -- Salary related + ['received_salary'] = 'voce recebeu seu salario: ~g~$%s~s~ ', + ['received_help'] = 'voce recebeu seu cheque de bem-estar: ~g~$%s~s~ ', ['company_nomoney'] = 'a empresa em que voce esta empregado esta muito pobre para pagar seu salario.', - ['recived_money'] = 'recebeu dinheiro', + ['received_money'] = 'recebeu dinheiro', ['bank'] = 'banco', ['black_money'] = 'dinheiro sujo', ['act_imp'] = 'acao impossivel', ['in_vehicle'] = 'voce nao pode dar nada para alguem no veiculo', ['cannot_pickup_room'] = 'voce nao tem espaço suficiente no seu inventario para pegar ~y~%s~s~!', - -- Comandos + -- Commands ['setjob'] = 'atribuir um trabalho a um usuario', ['id_param'] = 'o ID do jogador', ['setjob_param2'] = 'o trabalho que voce deseja atribuir', @@ -61,7 +64,7 @@ Locales['br'] = { ['giveitem'] = 'dar item', ['weapon'] = 'arma', ['giveweapon'] = 'dar arma', - -- Armas + -- Weapons ['weapon_knife'] = 'faca', ['weapon_nightstick'] = 'cacetete', ['weapon_hammer'] = 'martelo', diff --git a/locales/de.lua b/locales/de.lua index 566e780f..97353c84 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,35 +1,38 @@ Locales['de'] = { + -- Inventory ['cash'] = 'kontanter $%s', - ['inventory'] = 'Inventar', + ['inventory'] = 'inventar', ['use'] = 'benutzen', ['give'] = 'geben', ['remove'] = 'entfernen', ['return'] = 'zurück', ['amount'] = 'Betrag', - ['amountammo'] = 'anzahl der Munition', - ['noammo'] = 'du hast keine Munition!', - ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', + ['giveammo'] = 'munition geben', + ['amountammo'] = 'anzahl der munition', + ['noammo'] = 'du hast keine munition!', + ['gave_item'] = 'du gibst ~y~%sx~s~ ~b~%s~s~ zu ~y~%s~s~', + ['received_item'] = 'to empfängst ~y~%sx~s~ ~b~%s~s~ von ~b~%s~s~', ['gave_weapon'] = 'you gave ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_weapon'] = 'you recived ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', + ['received_weapon'] = 'you received ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', ['gave_ammo'] = 'you gave ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_ammo'] = 'you recived ~o~%sx~s~ bullets from ~b~%s~s~.', - ['giveammo'] = 'Munition geben', + ['received_ammo'] = 'you received ~o~%sx~s~ bullets from ~b~%s~s~.', + ['gave_money'] = 'du gibst ~g~$%s~s~ zu ~y~%s~s~', + ['received_money'] = 'to empfängst ~g~$%s~s~ von ~b~%s~s~', + ['gave_account_money'] = 'du gibst ~g~$%s~s~ (%s) zu ~y~%s~s~', + ['received_account_money'] = 'to empfängst ~g~$%s~s~ (%s) von ~b~%s~s~', ['amount_invalid'] = 'ungültiger Betrag', - ['players_nearby'] = 'keine Spieler in der Nähe', - ['ex_inv_lim'] = 'Aktion nicht möglich, inventarlimit überschritten für ~b~', - ['yougave'] = 'du gibst', - ['youreceived'] = 'to empfängst', - ['to'] = '~s~ zu ~b~', - ['by'] = '~s~ von ~b~', - ['imp_invalid_quantity'] = 'Aktion nicht möglich, ungültige Anzahl', - ['imp_invalid_amount'] = 'Aktion nicht möglich, ungültiger Betrag', - ['delete_five_min'] = '~r~löschen~s~ in 5 Minuten', + ['players_nearby'] = 'keine Spieler in der nähe', + ['ex_inv_lim'] = 'aktion nicht möglich, inventarlimit überschritten für ~y~%s~s~', + ['imp_invalid_quantity'] = 'aktion nicht möglich, ungültige anzahl', + ['imp_invalid_amount'] = 'aktion nicht möglich, ungültiger betrag', + ['delete_five_min'] = '~r~Löschen~s~ in 5 minuten~s~', ['threw'] = 'du ~r~wirfst weg~s~', + ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', -- Salary related - ['recived_salary'] = 'du hast dein Gehalt erhalten: ~g~$%s~s~', - ['recived_help'] = 'you recieved your welfare check: ~g~$%s~s~', + ['received_salary'] = 'du hast dein Gehalt erhalten: ~g~$%s~s~', + ['received_help'] = 'you recieved your welfare check: ~g~$%s~s~', ['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.', - ['recived_money'] = 'recived money', + ['received_money'] = 'received money', ['bank'] = 'bank', ['black_money'] = 'dirty Money', diff --git a/locales/en.lua b/locales/en.lua index 36a62551..4dee4a57 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,4 +1,5 @@ Locales['en'] = { + -- Inventory ['cash'] = 'cash $%s', ['inventory'] = 'inventory', ['use'] = 'use', @@ -6,30 +7,32 @@ Locales['en'] = { ['remove'] = 'remove', ['return'] = 'return', ['amount'] = 'amount', + ['giveammo'] = 'give ammo', ['amountammo'] = 'amount of ammo', ['noammo'] = 'you do not have enough ammo!', - ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', + ['gave_item'] = 'you gave ~y~%sx~s~ ~b~%s~s~ to ~y~%s~s~', + ['received_item'] = 'you received ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~', ['gave_weapon'] = 'you gave ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_weapon'] = 'you recived ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', + ['received_weapon'] = 'you received ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', ['gave_ammo'] = 'you gave ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_ammo'] = 'you recived ~o~%sx~s~ bullets from ~b~%s~s~.', - ['giveammo'] = 'give ammo', + ['received_ammo'] = 'you received ~o~%sx~s~ bullets from ~b~%s~s~.', + ['gave_money'] = 'you gave ~g~$%s~s~ to ~y~%s~s~', + ['received_money'] = 'you received ~g~$%s~s~ from ~b~%s~s~', + ['gave_account_money'] = 'you gave ~g~$%s~s~ (%s) to ~y~%s~s~', + ['received_account_money'] = 'you received ~g~$%s~s~ (%s) from ~b~%s~s~', ['amount_invalid'] = 'invalid amount', ['players_nearby'] = 'no players nearby', - ['ex_inv_lim'] = 'action not possible, exceeding inventory limit for ~b~', - ['yougave'] = 'you gave', - ['youreceived'] = 'you received', - ['to'] = '~s~ to ~b~', - ['by'] = '~s~ by ~b~', + ['ex_inv_lim'] = 'action not possible, exceeding inventory limit for ~y~%s~s~', ['imp_invalid_quantity'] = 'action impossible, invalid quantity', ['imp_invalid_amount'] = 'action impossible, invalid amount', ['delete_five_min'] = 'the item will be ~r~thrown~s~ in 5 minutes', ['threw'] = 'you ~r~threw~s~', + ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', -- Salary related - ['recived_salary'] = 'you received your salary: ~g~$%s~s~', - ['recived_help'] = 'you recieved your welfare check: ~g~$%s~s~', + ['received_salary'] = 'you received your salary: ~g~$%s~s~', + ['received_help'] = 'you recieved your welfare check: ~g~$%s~s~', ['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.', - ['recived_money'] = 'recived money', + ['received_money'] = 'received money', ['bank'] = 'bank', ['black_money'] = 'dirty Money', diff --git a/locales/fi.lua b/locales/fi.lua index 2c5d6cf3..9c2cece9 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,35 +1,38 @@ Locales['fi'] = { - ['cash'] = 'käteinen $%s', - ['inventory'] = 'reppu', - ['use'] = 'käytä', - ['give'] = 'anna', - ['remove'] = 'poista', - ['return'] = 'takaisin', + -- Inventory + ['cash'] = 'käteinen $%s', + ['inventory'] = 'reppu', + ['use'] = 'käytä', + ['give'] = 'anna', + ['remove'] = 'poista', + ['return'] = 'takaisin', ['amount'] = 'määrä', + ['giveammo'] = 'anna ammuksia', ['amountammo'] = 'ammusten määrä', ['noammo'] = 'sinulla ei ole ammuksia!', - ['threw_weapon'] = 'sinä ~r~heitit~s~ ~y~1x~s~ ~b~%s~s~ jossa oli ~o~%sx~s~ ammuksia!', + ['gave_item'] = 'sinä annoit ~y~%sx~s~ ~b~%s~s~ henkilölle ~y~%s~s~', + ['received_item'] = 'sinä sait ~y~%sx~s~ ~b~%s~s~ henkilöltä ~b~%s~s~', ['gave_weapon'] = 'sinä annoit ~y~1x~s~ ~b~%s~s~ jossa oli ~o~%sx~s~ ammuksia henkilölle ~y~%s~s~.', - ['recived_weapon'] = 'sinä sait ~y~1x~s~ ~b~%s~s~ jossa oli ~o~%sx~s~ ammuksia henkilöltä ~b~%s~s~.', + ['received_weapon'] = 'sinä sait ~y~1x~s~ ~b~%s~s~ jossa oli ~o~%sx~s~ ammuksia henkilöltä ~b~%s~s~.', ['gave_ammo'] = 'sinä annoit ~o~%sx~s~ ammuksia henkilölle ~y~%s~s~.', - ['recived_ammo'] = 'sinä sait ~o~%sx~s~ ammuksia henkilöltä ~b~%s~s~.', - ['giveammo'] = 'anna ammuksia', + ['received_ammo'] = 'sinä sait ~o~%sx~s~ ammuksia henkilöltä ~b~%s~s~.', + ['gave_money'] = 'sinä annoit ~g~$%s~s~ henkilölle ~y~%s~s~', + ['received_money'] = 'sinä sait ~g~$%s~s~ henkilöltä ~b~%s~s~', + ['gave_account_money'] = 'sinä annoit ~g~$%s~s~ (%s) henkilölle ~y~%s~s~', + ['received_account_money'] = 'sinä sait ~g~$%s~s~ (%s) henkilöltä ~b~%s~s~', ['amount_invalid'] = 'virheellinen määrä', ['players_nearby'] = 'ei pelaajia lähettyvillä', - ['ex_inv_lim'] = 'toiminto mahdoton, reppu alkaa olla täysi ~b~', - ['yougave'] = 'sinä annoit', - ['youreceived'] = 'sinä sait', - ['to'] = '~s~ henkilölle ~b~', - ['by'] = '~s~ henkilöltä ~b~', + ['ex_inv_lim'] = 'toiminto mahdoton, reppu alkaa olla täysi ~y~%s~s~', ['imp_invalid_quantity'] = 'toiminto mahdoton, virheellinen määrä', ['imp_invalid_amount'] = 'toiminto mahdoton, virhellinen summa', ['delete_five_min'] = 'esine ~r~poistetaan~s~ 5 minuutin päästä repusta', ['threw'] = 'sinä ~r~tiputit~s~', + ['threw_weapon'] = 'sinä ~r~heitit~s~ ~y~1x~s~ ~b~%s~s~ jossa oli ~o~%sx~s~ ammuksia!', -- Salary related - ['recived_salary'] = 'sinä vastaanotit palkkaa: ~g~$%s~s~', - ['recived_help'] = 'sinä vastaanotit valtion tukea: ~g~$%s~s~', + ['received_salary'] = 'sinä vastaanotit palkkaa: ~g~$%s~s~', + ['received_help'] = 'sinä vastaanotit valtion tukea: ~g~$%s~s~', ['company_nomoney'] = 'yritys jolle teet töitä on köyhä eikä voi maksaa palkkaasi.', - ['recived_money'] = 'sai rahaa', + ['received_money'] = 'sai rahaa', ['bank'] = 'Pankki', ['black_money'] = 'likainen Raha', diff --git a/locales/fr.lua b/locales/fr.lua index 165eafe3..9e72101c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,4 +1,5 @@ Locales['fr'] = { + -- Inventory ['cash'] = 'espèces $%s', ['inventory'] = 'inventaire', ['use'] = 'utiliser', @@ -6,30 +7,32 @@ Locales['fr'] = { ['remove'] = 'jeter', ['return'] = 'retour', ['amount'] = 'quantité', - ['amountammo'] = 'nombre de munitions', - ['noammo'] = 'Tu n\'as pas toutes ces munitions !', - ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', - ['gave_weapon'] = 'you gave ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_weapon'] = 'you recived ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', - ['gave_ammo'] = 'you gave ~o~%sx~s~ bullets to ~y~%s~s~.', - ['recived_ammo'] = 'you recived ~o~%sx~s~ bullets from ~b~%s~s~.', ['giveammo'] = 'give ammo', + ['amountammo'] = 'nombre de munitions', + ['noammo'] = 'tu n\'as pas toutes ces munitions!', + ['gave_item'] = 'vous avez donné ~y~%sx~s~ ~b~%s~s~ à ~y~%s~s~', + ['received_item'] = 'vous avez reçu ~y~%sx~s~ ~b~%s~s~ par ~b~%s~s~', + ['gave_weapon'] = 'you gave ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets to ~y~%s~s~.', + ['received_weapon'] = 'you received ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets from ~b~%s~s~.', + ['gave_ammo'] = 'you gave ~o~%sx~s~ bullets to ~y~%s~s~.', + ['received_ammo'] = 'you received ~o~%sx~s~ bullets from ~b~%s~s~.', + ['gave_money'] = 'vous avez donné ~g~$%s~s~ à ~y~%s~s~', + ['received_money'] = 'vous avez reçu ~g~$%s~s~ par ~b~%s~s~', + ['gave_account_money'] = 'vous avez donné ~g~$%s~s~ (%s) à ~y~%s~s~', + ['received_account_money'] = 'vous avez reçu ~g~$%s~s~ (%s) par ~b~%s~s~', ['amount_invalid'] = 'montant invalide', ['players_nearby'] = 'aucun joueur à proximité', - ['ex_inv_lim'] = 'action impossible, depassement de la limite d\'inventaire pour ~b~', - ['yougave'] = 'vous avez donné', - ['youreceived'] = 'vous avez reçu', - ['to'] = '~s~ à ~b~', - ['by'] = '~s~ par ~b~', + ['ex_inv_lim'] = 'action impossible, depassement de la limite d\'inventaire pour ~y~%s~s~', ['imp_invalid_quantity'] = 'action impossible, ~r~quantité invalide', ['imp_invalid_amount'] = 'action impossible, ~r~montant invalide', ['delete_five_min'] = '~r~suppression~s~ dans 5 minutes', ['threw'] = 'vous avez ~r~jeté~s~', + ['threw_weapon'] = 'you ~r~threw~s~ ~y~1x~s~ ~b~%s~s~ with ~o~%sx~s~ bullets!', -- Salary related - ['recived_salary'] = 'vous avez reçu votre salaire: ~g~$%s~s~', - ['recived_help'] = 'vous avez reçu une aide de l\'état: ~g~$%s~s~', + ['received_salary'] = 'vous avez reçu votre salaire: ~g~$%s~s~', + ['received_help'] = 'vous avez reçu une aide de l\'état: ~g~$%s~s~', ['company_nomoney'] = 'votre entreprise n\'a plus d\'argent pour vous payer!', -- fix translation - ['recived_money'] = 'recived money', + ['received_money'] = 'received money', ['bank'] = 'banque', ['black_money'] = 'argent Sale', diff --git a/locales/sv.lua b/locales/sv.lua index dc33495e..b1745f85 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,35 +1,38 @@ Locales['sv'] = { + -- Inventory ['cash'] = 'kontanter $%s', - ['inventory'] = 'Mitt förråd', + ['inventory'] = 'mitt förråd', ['use'] = 'använd', ['give'] = 'ge', ['remove'] = 'kasta', ['return'] = 'gå tillbaka', ['amount'] = 'antal', + ['giveammo'] = 'ge ammunition', ['amountammo'] = 'mängd ammunition', ['noammo'] = 'du har inte tillräckligt med ammunition!', - ['threw_weapon'] = 'du ~r~slängde~s~ ~y~1x~s~ ~b~%s~s~ med ~o~%sx~s~ skott!', + ['gave_item'] = 'du gav ~y~%sx~s~ ~b~%s~s~ till ~y~%s~s~', + ['received_item'] = 'du tog emot ~y~%sx~s~ ~b~%s~s~ från ~b~%s~s~', ['gave_weapon'] = 'du gav ~y~1x~s~ ~b~%s~s~ med ~o~%sx~s~ skott till ~y~%s~s~.', - ['recived_weapon'] = 'du tog emot ~y~1x~s~ ~b~%s~s~ med ~o~%sx~s~ skott från ~b~%s~s~.', + ['received_weapon'] = 'du tog emot ~y~1x~s~ ~b~%s~s~ med ~o~%sx~s~ skott från ~b~%s~s~.', ['gave_ammo'] = 'du gav ~o~%sx~s~ skott till ~y~%s~s~.', - ['recived_ammo'] = 'du tog emot ~o~%sx~s~ skott från ~b~%s~s~.', - ['giveammo'] = 'Ge ammunition', + ['received_ammo'] = 'du tog emot ~o~%sx~s~ skott från ~b~%s~s~.', + ['gave_money'] = 'du gav ~g~$%s~s~ till ~y~%s~s~', + ['received_money'] = 'du tog emot ~g~$%s~s~ från ~b~%s~s~', + ['gave_account_money'] = 'du gav ~g~$%s~s~ (%s) till ~y~%s~s~', + ['received_account_money'] = 'du tog emot ~g~$%s~s~ (%s) från ~b~%s~s~', ['amount_invalid'] = 'ogiltig mängd', ['players_nearby'] = 'inga spelare nära', - ['ex_inv_lim'] = 'åtgärd inte möjligt, översteg förrådets gräns ~b~', - ['yougave'] = 'du gav', - ['youreceived'] = 'du fick', - ['to'] = '~s~ till ~b~', - ['by'] = '~s~ av ~b~', + ['ex_inv_lim'] = 'åtgärd inte möjligt, översteg förråd gräns för ~y~%s~s~', ['imp_invalid_quantity'] = 'åtgärd omöjlig, ogiltig mängd', ['imp_invalid_amount'] = 'åtgärd omöjlig, ogiltig belopp', ['delete_five_min'] = 'objektet kommer att ~r~kastas~s~ om 5 minuter!', ['threw'] = 'du ~r~kastade~s~', + ['threw_weapon'] = 'du ~r~slängde~s~ ~y~1x~s~ ~b~%s~s~ med ~o~%sx~s~ skott!', -- Salary related - ['recived_salary'] = 'du har mottagit din lön på ~g~$%s~s~', - ['recived_help'] = 'du har mottagit bidrag på ~g~$%s~s~', + ['received_salary'] = 'du har mottagit din lön på ~g~$%s~s~', + ['received_help'] = 'du har mottagit bidrag på ~g~$%s~s~', ['company_nomoney'] = 'företaget du är anställt hos har inte råd att betala ut din lön.', - ['recived_money'] = 'mottagit pengar', + ['received_money'] = 'mottagit pengar', ['bank'] = 'bank', ['black_money'] = 'svarta pengar', diff --git a/server/main.lua b/server/main.lua index 73e1fefd..81c88fb6 100644 --- a/server/main.lua +++ b/server/main.lua @@ -277,14 +277,14 @@ AddEventHandler('es:playerLoaded', function(source, _player) end) -AddEventHandler('playerDropped', function() +AddEventHandler('playerDropped', function(reason) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) if xPlayer ~= nil then - TriggerEvent('esx:playerDropped', _source) + TriggerEvent('esx:playerDropped', _source, reason) ESX.SavePlayer(xPlayer, function() ESX.Players[_source] = nil @@ -324,17 +324,17 @@ AddEventHandler('esx:giveInventoryItem', function(target, type, itemName, itemCo if itemCount > 0 and sourceItem.count >= itemCount then if targetItem.limit ~= -1 and (targetItem.count + itemCount) > targetItem.limit then - TriggerClientEvent('esx:showNotification', target, _U('ex_inv_lim') .. targetXPlayer.name) + TriggerClientEvent('esx:showNotification', _source, _U('ex_inv_lim', targetXPlayer.name)) else sourceXPlayer.removeInventoryItem(itemName, itemCount) targetXPlayer.addInventoryItem (itemName, itemCount) - - TriggerClientEvent('esx:showNotification', _source, _U('yougave') .. ' ~g~x' .. itemCount .. ' ' .. ESX.Items[itemName].label .. _U('to') .. targetXPlayer.name) - TriggerClientEvent('esx:showNotification', target, _U('youreceived') .. ' ~g~x' .. itemCount .. ' ' .. ESX.Items[itemName].label .. _U('by') .. sourceXPlayer.name) + + TriggerClientEvent('esx:showNotification', _source, _U('gave_item', itemCount, ESX.Items[itemName].label, targetXPlayer.name)) + TriggerClientEvent('esx:showNotification', target, _U('received_item', itemCount, ESX.Items[itemName].label, sourceXPlayer.name)) end else - TriggerClientEvent('esx:showNotification', target, _U('imp_invalid_quantity')) + TriggerClientEvent('esx:showNotification', _source, _U('imp_invalid_quantity')) end elseif type == 'item_money' then @@ -342,13 +342,13 @@ AddEventHandler('esx:giveInventoryItem', function(target, type, itemName, itemCo if itemCount > 0 and sourceXPlayer.player.get('money') >= itemCount then sourceXPlayer.removeMoney(itemCount) - targetXPlayer.addMoney(itemCount) + targetXPlayer.addMoney (itemCount) - TriggerClientEvent('esx:showNotification', _source, _U('yougave') .. ' ~g~$' .. itemCount .. _U('to') .. targetXPlayer.name) - TriggerClientEvent('esx:showNotification', target, _U('youreceived') .. ' ~g~$' .. itemCount .. _U('by') .. sourceXPlayer.name) + TriggerClientEvent('esx:showNotification', _source, _U('gave_money', itemCount, targetXPlayer.name)) + TriggerClientEvent('esx:showNotification', target, _U('received_money', itemCount, sourceXPlayer.name)) else - TriggerClientEvent('esx:showNotification', target, _U('imp_invalid_amount')) + TriggerClientEvent('esx:showNotification', _source, _U('imp_invalid_amount')) end elseif type == 'item_account' then @@ -356,13 +356,13 @@ AddEventHandler('esx:giveInventoryItem', function(target, type, itemName, itemCo if itemCount > 0 and sourceXPlayer.getAccount(itemName).money >= itemCount then sourceXPlayer.removeAccountMoney(itemName, itemCount) - targetXPlayer.addAccountMoney(itemName, itemCount) + targetXPlayer.addAccountMoney (itemName, itemCount) - TriggerClientEvent('esx:showNotification', _source, _U('yougave') .. ' [' .. Config.AccountLabels[itemName] .. '] ~g~$' .. itemCount .. _U('to') .. targetXPlayer.name) - TriggerClientEvent('esx:showNotification', target, _U('youreceived') .. ' [' .. Config.AccountLabels[itemName] .. '] ~g~$' .. itemCount .. _U('by') .. sourceXPlayer.name) + TriggerClientEvent('esx:showNotification', _source, _U('gave_account_money', itemCount, Config.AccountLabels[itemName], targetXPlayer.name)) + TriggerClientEvent('esx:showNotification', target, _U('received_account_money', itemCount, Config.AccountLabels[itemName], sourceXPlayer.name)) else - TriggerClientEvent('esx:showNotification', target, _U('imp_invalid_amount')) + TriggerClientEvent('esx:showNotification', _source, _U('imp_invalid_amount')) end elseif type == 'item_weapon' then @@ -372,7 +372,7 @@ AddEventHandler('esx:giveInventoryItem', function(target, type, itemName, itemCo local weaponLabel = ESX.GetWeaponLabel(itemName) TriggerClientEvent('esx:showNotification', _source, _U('gave_weapon', weaponLabel, itemCount, targetXPlayer.name)) - TriggerClientEvent('esx:showNotification', target, _U('recived_weapon', weaponLabel, itemCount, sourceXPlayer.name)) + TriggerClientEvent('esx:showNotification', target, _U('received_weapon', weaponLabel, itemCount, sourceXPlayer.name)) end end) diff --git a/server/paycheck.lua b/server/paycheck.lua index f9af867a..df3cff43 100644 --- a/server/paycheck.lua +++ b/server/paycheck.lua @@ -11,7 +11,7 @@ ESX.StartPayCheck = function() if salary > 0 then if job == 'unemployed' then -- unemployed xPlayer.addAccountMoney('bank', salary) - TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('recived_money'), _U('recived_help', salary), 'CHAR_BANK_MAZE', 9) + TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9) elseif Config.EnableSocietyPayouts then -- possibly a society TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society) if society ~= nil then -- verified society @@ -20,19 +20,19 @@ ESX.StartPayCheck = function() xPlayer.addAccountMoney('bank', salary) account.removeMoney(salary) - TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('recived_money'), _U('recived_salary', salary), 'CHAR_BANK_MAZE', 9) + TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) else TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), '', _U('company_nomoney'), 'CHAR_BANK_MAZE', 1) end end) else -- not a society xPlayer.addAccountMoney('bank', salary) - TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('recived_money'), _U('recived_salary', salary), 'CHAR_BANK_MAZE', 9) + TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) end end) else -- generic job xPlayer.addAccountMoney('bank', salary) - TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('recived_money'), _U('recived_salary', salary), 'CHAR_BANK_MAZE', 9) + TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) end end