diff --git a/locales/br.lua b/locales/br.lua
index 3258ea49..7b115f96 100644
--- a/locales/br.lua
+++ b/locales/br.lua
@@ -54,25 +54,47 @@ Locales['br'] = {
   ['in_vehicle'] = 'voce não pode dar nada para alguem no veículo',
 
   -- Commands
-  ['setjob'] = 'atribuir um trabalho a um usuario',
-  ['id_param'] = 'o ID do jogador',
-  ['setjob_param2'] = 'o trabalho que voce deseja atribuir',
-  ['setjob_param3'] = 'o nivel de emprego',
-  ['spawn_car'] = 'spawn um carro',
-  ['spawn_car_param'] = 'nome do carro',
-  ['delete_vehicle'] = 'excluir veículo',
-  ['invalid_account'] = 'conta inválida',
-  ['account'] = 'conta',
-  ['giveaccountmoney'] = 'dar dinheiro da conta',
-  ['invalid_item'] = 'item invalido',
-  ['item'] = 'item',
-  ['giveitem'] = 'dar item',
-  ['weapon'] = 'arma',
-  ['giveweapon'] = 'dar arma',
-  ['chat_clear'] = 'limpar o chat',
-  ['chat_clear_all'] = 'limpar o chat para todos',
+  ['command_car'] = 'spawn um carro',
+  ['command_car_car'] = 'nome do carro',
+  ['command_cardel'] = 'excluir veículo',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'limpar o chat',
+  ['command_clearall'] = 'limpar o chat para todos',
   ['command_clearinventory'] = 'remover todos os itens do inventário',
   ['command_clearloadout'] = 'remova todas as armas do carregamento',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'atribuir um trabalho a um usuario',
+  ['command_setjob_job'] = 'o trabalho que voce deseja atribuir',
+  ['command_setjob_grade'] = 'o nivel de emprego',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'dar dinheiro da conta',
+  ['command_giveaccountmoney_account'] = 'conta',
+  ['command_giveaccountmoney_amount'] = 'amount',
+  ['command_giveaccountmoney_invalid'] = 'conta inválida',
+  ['command_giveitem'] = 'dar item',
+  ['command_giveitem_item'] = 'item',
+  ['command_giveitem_count'] = 'count',
+  ['command_giveweapon'] = 'dar arma',
+  ['command_giveweapon_weapon'] = 'arma',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'item invalido',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'o ID do jogador',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/locales/cs.lua b/locales/cs.lua
index bc69b191..b99bebf0 100644
--- a/locales/cs.lua
+++ b/locales/cs.lua
@@ -53,28 +53,50 @@ Locales['cs'] = {
   ['act_imp'] = 'akce není možná', 
   ['in_vehicle'] = 'nemůže nic dát osobě ve vozidle', 
 
-  -- Commands 
-  ['setjob'] = 'přiřadit práci hráči', 
-  ['id_param'] = 'iD hráče', 
-  ['setjob_param2'] = 'název přiřazované práce', 
-  ['setjob_param3'] = 'úroveň práce', 
-  ['spawn_car'] = 'spawn auto', 
-  ['spawn_car_param'] = 'název auta', 
-  ['delete_vehicle'] = 'odstranit vozidlo', 
-  ['invalid_account'] = 'neplatný účet', 
-  ['account'] = 'účet', 
-  ['giveaccountmoney'] = 'dát peníze na účet', 
-  ['invalid_item'] = 'neplatná věc', 
-  ['item'] = 'věc', 
-  ['giveitem'] = 'dát věc', 
-  ['weapon'] = 'zbraň', 
-  ['giveweapon'] = 'dát zbraň', 
-  ['chat_clear'] = 'vyčistit chat', 
-  ['chat_clear_all'] = 'vyčistit chat pro všechny', 
-  ['command_clearinventory'] = 'vycistit vsechny predmety v invetari', 
-  ['command_clearloadout'] = 'odebrat vsechny zbrane z rukz', 
+  -- Commands
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
-  -- Locale settings 
+  -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ', 
   ['locale_currency'] = '$%s', 
 
diff --git a/locales/de.lua b/locales/de.lua
index 4ccb00a9..86247f0b 100644
--- a/locales/de.lua
+++ b/locales/de.lua
@@ -54,25 +54,47 @@ Locales['de'] = {
   ['in_vehicle'] = 'du kannst keine Items in einem Fahrzeug weitergeben',
 
   -- Commands
-  ['setjob'] = 'spieler Job zuweisen',
-  ['id_param'] = 'ID von Spieler',
-  ['setjob_param2'] = 'der zu vergebende Job',
-  ['setjob_param3'] = 'der Jobgrad',
-  ['spawn_car'] = 'fahrzeug spawnen',
-  ['spawn_car_param'] = 'fahrzeugname',
-  ['delete_vehicle'] = 'entfernt Fahrzeuge',
-  ['invalid_account'] = 'ungültige Anzahl',
-  ['account'] = 'bank',
-  ['giveaccountmoney'] = 'bankgeld geben',
-  ['invalid_item'] = 'ungültiges Item',
-  ['item'] = 'item',
-  ['giveitem'] = 'item geben',
-  ['weapon'] = 'waffe',
-  ['giveweapon'] = 'waffe geben',
-  ['chat_clear'] = 'chat leeren',
-  ['chat_clear_all'] = 'chat für jeden leeren',
-  ['command_clearinventory'] = 'alle Items aus dem Inventar entfernen',
-  ['command_clearloadout'] = 'alle Waffen aus dem Loadout entfernen',
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/locales/en.lua b/locales/en.lua
index 44c4c680..e7a6549b 100644
--- a/locales/en.lua
+++ b/locales/en.lua
@@ -54,25 +54,47 @@ Locales['en'] = {
   ['in_vehicle'] = 'you can\'t give anything to someone in a vehicle',
 
   -- Commands
-  ['setjob'] = 'assign a job to a user',
-  ['id_param'] = 'the ID of the player',
-  ['setjob_param2'] = 'the job you wish to assign',
-  ['setjob_param3'] = 'the job level',
-  ['spawn_car'] = 'spawn a car',
-  ['spawn_car_param'] = 'name of car',
-  ['delete_vehicle'] = 'deletes Vehicle',
-  ['invalid_account'] = 'invalid account',
-  ['account'] = 'account',
-  ['giveaccountmoney'] = 'give account money',
-  ['invalid_item'] = 'invalid item',
-  ['item'] = 'item',
-  ['giveitem'] = 'give item',
-  ['weapon'] = 'weapon',
-  ['giveweapon'] = 'give weapon',
-  ['chat_clear'] = 'clear the chat',
-  ['chat_clear_all'] = 'clear the chat for everyone',
-  ['command_clearinventory'] = 'clear all items from inventory',
-  ['command_clearloadout'] = 'remove all weapons from loadout',
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ',',
diff --git a/locales/fi.lua b/locales/fi.lua
index 6e113511..cd3b3d6b 100644
--- a/locales/fi.lua
+++ b/locales/fi.lua
@@ -54,25 +54,47 @@ Locales['fi'] = {
   ['in_vehicle'] = 'et voi antaa ajoneuvossa olevalle mitään',
 
   -- Commands
-  ['setjob'] = 'määritä työ käyttäjälle',
-  ['id_param'] = 'käyttäjän ID',
-  ['setjob_param2'] = 'työ jonka haluat määrittää',
-  ['setjob_param3'] = 'työn taso',
-  ['spawn_car'] = 'spawnaa ajoneuvo',
-  ['spawn_car_param'] = 'ajoneuvon nimi',
-  ['delete_vehicle'] = 'poistaa ajoneuvon',
-  ['invalid_account'] = 'virheellinen tunnus',
-  ['account'] = 'tunnus',
-  ['giveaccountmoney'] = 'anna tilille rahaa',
-  ['invalid_item'] = 'virheellinen itemi',
-  ['item'] = 'esine',
-  ['giveitem'] = 'anna itemi',
-  ['weapon'] = 'ase',
-  ['giveweapon'] = 'anna ase',
-  ['chat_clear'] = 'tyhjennä chatti',
-  ['chat_clear_all'] = 'tyhjennä chatti kaikilta',
-  ['command_clearinventory'] = 'clear all items from inventory',
-  ['command_clearloadout'] = 'remove all weapons from loadout',
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/locales/fr.lua b/locales/fr.lua
index 9e5bd015..350055bc 100644
--- a/locales/fr.lua
+++ b/locales/fr.lua
@@ -54,25 +54,47 @@ Locales['fr'] = {
   ['in_vehicle'] = 'Vous ne pouvez rien donner à quelqu\'un dans un véhicule',
 
   -- Commands
-  ['setjob'] = 'assigner job',
-  ['id_param'] = 'identification du joueur',
-  ['setjob_param2'] = 'le travail que vous souhaitez assigner',
-  ['setjob_param3'] = 'le niveau d\'emploi',
-  ['spawn_car'] = 'spawn un véhicule',
-  ['spawn_car_param'] = 'nom de la voiture',
-  ['delete_vehicle'] = 'supprimer le véhicule',
-  ['invalid_account'] = 'compte invalide',
-  ['account'] = 'compte',
-  ['giveaccountmoney'] = 'donner de l\'argent au compte',
-  ['invalid_item'] = 'item invalide',
-  ['item'] = 'article',
-  ['giveitem'] = 'donner un article',
-  ['weapon'] = 'arme',
-  ['giveweapon'] = 'donner l\'arme',
-  ['chat_clear'] = 'vider le chat',
-  ['chat_clear_all'] = 'vider le chat pour tous le monde',
-  ['command_clearinventory'] = 'effacer tout les items de l\'inventaire',
-  ['command_clearloadout'] = 'retirer toutes les armes de l\'équipement',
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/locales/pl.lua b/locales/pl.lua
index a691437a..3f727d5f 100644
--- a/locales/pl.lua
+++ b/locales/pl.lua
@@ -54,25 +54,47 @@ Locales['pl'] = {
   ['in_vehicle'] = 'nie możesz przekazywać przedmiotów w pojeździe',
 
   -- Commands
-  ['setjob'] = 'przydziel prace użytkownikowi',
-  ['id_param'] = 'ID użytkownika',
-  ['setjob_param2'] = 'praca, którą chcesz przydzielić',
-  ['setjob_param3'] = 'poziom pracy',
-  ['spawn_car'] = 'sprowadź pojazd',
-  ['spawn_car_param'] = 'nazwa samochodu',
-  ['delete_vehicle'] = 'usuń pojazd',
-  ['invalid_account'] = 'błędne konto',
-  ['account'] = 'konto',
-  ['giveaccountmoney'] = 'daj pieniądze na konto',
-  ['invalid_item'] = 'nieprawidłowy przedmiot',
-  ['item'] = 'przedmiot',
-  ['giveitem'] = 'daj przedmiot',
-  ['weapon'] = 'broń',
-  ['giveweapon'] = 'daj broń',
-  ['chat_clear'] = 'wyczyść czat',
-  ['chat_clear_all'] = 'wyczyść czat dla wszystkich',
-  ['command_clearinventory'] = 'usuń wszystkie przedmioty z ekwipunku',
-  ['command_clearloadout'] = 'usuń wszystkie bronie z wyposażenia',
+  ['command_car'] = 'spawn an vehicle',
+  ['command_car_car'] = 'vehicle spawn name or hash',
+  ['command_cardel'] = 'delete vehicle in proximity',
+  ['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
+  ['command_clear'] = 'clear chat',
+  ['command_clearall'] = 'clear chat for all players',
+  ['command_clearinventory'] = 'clear player inventory',
+  ['command_clearloadout'] = 'clear a player loadout',
+  ['command_setcoords'] = 'teleport to coordinates',
+  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_z'] = 'z axis',
+  ['command_setjob'] = 'set job for a player',
+  ['command_setjob_job'] = 'job name',
+  ['command_setjob_grade'] = 'job grade',
+  ['command_setjob_invalid'] = 'the job, grade or both are invalid',
+  ['command_setgroup'] = 'set player group',
+  ['command_setgroup_group'] = 'group name',
+  ['command_giveaccountmoney'] = 'give account money',
+  ['command_giveaccountmoney_account'] = 'valid account name',
+  ['command_giveaccountmoney_amount'] = 'amount to add',
+  ['command_giveaccountmoney_invalid'] = 'invalid account name',
+  ['command_giveitem'] = 'give an item to a player',
+  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_count'] = 'item count',
+  ['command_giveweapon'] = 'give a weapon to a player',
+  ['command_giveweapon_weapon'] = 'weapon name',
+  ['command_giveweapon_ammo'] = 'ammo count',
+  ['command_giveweapon_hasalready'] = 'player already has that weapon',
+  ['command_giveweaponcomponent'] = 'give weapon component',
+  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
+  ['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
+  ['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
+  ['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
+  ['commanderror_invaliditem'] = 'invalid item name',
+  ['commanderror_invalidweapon'] = 'invalid weapon',
+  ['commanderror_console'] = 'that command can not be run from console',
+  ['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
+  ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/locales/sv.lua b/locales/sv.lua
index 8be097c6..df1f21db 100644
--- a/locales/sv.lua
+++ b/locales/sv.lua
@@ -54,25 +54,47 @@ Locales['sv'] = {
   ['in_vehicle'] = 'du kan inte ge saker till en som sitter i ett fordon!',
 
   -- Commands
-  ['setjob'] = 'tilldela ett jobb till en spelare',
-  ['id_param'] = 'spelarens ID',
-  ['setjob_param2'] = 'det jobb du vill tilldela',
-  ['setjob_param3'] = 'job nivå',
-  ['spawn_car'] = 'spawna ett fordon',
-  ['spawn_car_param'] = 'namn på fordon',
-  ['delete_vehicle'] = 'ta bort fordon',
-  ['invalid_account'] = 'ogiltigt konto',
-  ['account'] = 'konto',
-  ['giveaccountmoney'] = 'ge spelarkonto pengar',
-  ['invalid_item'] = 'ogiltigt föremål',
-  ['item'] = 'föremål',
-  ['giveitem'] = 'ge ett föremål',
-  ['weapon'] = 'vapen',
-  ['giveweapon'] = 'ge ett vapen',
-  ['chat_clear'] = 'töm chatten',
-  ['chat_clear_all'] = 'töm chatten för alla',
+  ['command_car'] = 'spawna ett fordon',
+  ['command_car_car'] = 'namn på fordon eller hash',
+  ['command_cardel'] = 'radera fordon i närheten',
+  ['command_cardel_radius'] = 'valfri, radera alla fordon inom den angivna radien',
+  ['command_clear'] = 'töm chatten',
+  ['command_clearall'] = 'töm chatten för alla spelare',
   ['command_clearinventory'] = 'töm en spelares inventory',
   ['command_clearloadout'] = 'töm en spelares loadout',
+  ['command_setcoords'] = 'teleportera till koordinater',
+  ['command_setcoords_x'] = 'x axel',
+  ['command_setcoords_y'] = 'y axel',
+  ['command_setcoords_z'] = 'z axel',
+  ['command_setjob'] = 'välj jobb för en spelare',
+  ['command_setjob_job'] = 'jobbnamn',
+  ['command_setjob_grade'] = 'jobbnivå',
+  ['command_setjob_invalid'] = 'jobbet, nivån eller båda är ej giltiga',
+  ['command_setgroup'] = 'välj grupp åt en spelare',
+  ['command_setgroup_group'] = 'gruppnamn',
+  ['command_giveaccountmoney'] = 'ge pengar för ett konto',
+  ['command_giveaccountmoney_account'] = 'giltigt kontonamn',
+  ['command_giveaccountmoney_amount'] = 'mängd att ge',
+  ['command_giveaccountmoney_invalid'] = 'kontonamnet är ej giltigt',
+  ['command_giveitem'] = 'ge ett item till en spelare',
+  ['command_giveitem_item'] = 'itemnamn',
+  ['command_giveitem_count'] = 'mängd av itemet',
+  ['command_giveweapon'] = 'ge ett vapen till en spelare',
+  ['command_giveweapon_weapon'] = 'vapennamn',
+  ['command_giveweapon_ammo'] = 'hur mycket ammo att ge',
+  ['command_giveweapon_hasalready'] = 'spelaren har redan ett sådant vapen',
+  ['command_giveweaponcomponent'] = 'ge vapen komponent',
+  ['command_giveweaponcomponent_component'] = 'vapenkomponent',
+  ['command_giveweaponcomponent_invalid'] = 'det vapenkomponentet är ej giltigt',
+  ['command_giveweaponcomponent_hasalready'] = 'spelaren har redan det vapenkomponent',
+  ['command_giveweaponcomponent_missingweapon'] = 'spelaren har ej det vapnet',
+  ['commanderror_argumentmismatch'] = 'argumentstorlek mismatch (gav %s, ville ha %s)',
+  ['commanderror_argumentmismatch_number'] = 'argument #%s typ mismatch (gav string, ville ha number)',
+  ['commanderror_invaliditem'] = 'ej giltigt item',
+  ['commanderror_invalidweapon'] = 'ej giltigt vapen',
+  ['commanderror_console'] = 'detta kommando kan ej executas i konsol',
+  ['commanderror_invalidplayerid'] = 'det finns ingen spelare som matchar det angivna server id',
+  ['commandgeneric_playerid'] = 'spelarid',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
diff --git a/server/commands.lua b/server/commands.lua
index 23892beb..1639edd2 100644
--- a/server/commands.lua
+++ b/server/commands.lua
@@ -1,65 +1,65 @@
 ESX.RegisterCommand('setcoords', 'admin', function(xPlayer, args, showError)
 	xPlayer.setCoords({x = args.x, y = args.y, z = args.z})
-end, false, {help = 'Teleport to coordinates', validate = true, arguments = {
-	{name = 'x', help = 'X coords', type = 'number'},
-	{name = 'y', help = 'Y coords', type = 'number'},
-	{name = 'z', help = 'Z coords', type = 'number'}
+end, false, {help = _U('command_setcoords'), validate = true, arguments = {
+	{name = 'x', help = _U('command_setcoords_x'), type = 'number'},
+	{name = 'y', help = _U('command_setcoords_y'), type = 'number'},
+	{name = 'z', help = _U('command_setcoords_z'), type = 'number'}
 }})
 
 ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
 	if ESX.DoesJobExist(args.job, args.grade) then
 		args.playerId.setJob(args.job, args.grade)
 	else
-		showError('That job does not exist')
+		showError(_U('command_setjob_invalid'))
 	end
-end, true, {help = _U('setjob'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'},
-	{name = 'job', help = _U('setjob_param2'), type = 'string'},
-	{name = 'grade', help = _U('setjob_param3'), type = 'number'}
+end, true, {help = _U('command_setjob'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'job', help = _U('command_setjob_job'), type = 'string'},
+	{name = 'grade', help = _U('command_setjob_grade'), type = 'number'}
 }})
 
 ESX.RegisterCommand('car', 'admin', function(xPlayer, args, showError)
 	xPlayer.triggerEvent('esx:spawnVehicle', args.car)
-end, false, {help = _U('spawn_car'), validate = false, arguments = {
-	{name = 'car', help = _U('spawn_car_param'), type = 'any'}
+end, false, {help = _U('command_car'), validate = false, arguments = {
+	{name = 'car', help = _U('command_car_car'), type = 'any'}
 }})
 
 ESX.RegisterCommand({'cardel', 'dv'}, 'admin', function(xPlayer, args, showError)
 	xPlayer.triggerEvent('esx:deleteVehicle', args.radius)
-end, false, {help = _U('spawn_car'), validate = false, arguments = {
-	{name = 'radius', help = 'Optional, delete every vehicle within the specified radius', type = 'any'}
+end, false, {help = _U('command_cardel'), validate = false, arguments = {
+	{name = 'radius', help = _U('command_cardel_radius'), type = 'any'}
 }})
 
 ESX.RegisterCommand('giveaccountmoney', 'admin', function(xPlayer, args, showError)
 	if args.playerId.getAccount(args.account) then
 		args.playerId.addAccountMoney(args.account, args.amount)
 	else
-		showError(_U('invalid_account'))
+		showError(_U('command_giveaccountmoney_invalid'))
 	end
-end, true, {help = _U('giveaccountmoney'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'},
-	{name = 'account', help = _U('account'), type = 'string'},
-	{name = 'amount', help = _U('money_amount'), type = 'number'}
+end, true, {help = _U('command_giveaccountmoney'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'account', help = _U('command_giveaccountmoney_account'), type = 'string'},
+	{name = 'amount', help = _U('command_giveaccountmoney_amount'), type = 'number'}
 }})
 
 ESX.RegisterCommand('giveitem', 'admin', function(xPlayer, args, showError)
 	args.playerId.addInventoryItem(args.item, args.count)
-end, true, {help = _U('giveitem'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'},
-	{name = 'item', help = _U('item'), type = 'item'},
-	{name = 'count', help = _U('amount'), type = 'number'}
+end, true, {help = _U('command_giveitem'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'item', help = _U('command_giveitem_item'), type = 'item'},
+	{name = 'count', help = _U('command_giveitem_count'), type = 'number'}
 }})
 
 ESX.RegisterCommand('giveweapon', 'admin', function(xPlayer, args, showError)
 	if args.playerId.hasWeapon(args.weapon) then
-		showError('Player already has that weapon')
+		showError(_U('command_giveweapon_hasalready'))
 	else
 		xPlayer.addWeapon(args.weapon, args.ammo)
 	end
-end, true, {help = _U('giveweapon'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'},
-	{name = 'weapon', help = _U('weapon'), type = 'weapon'},
-	{name = 'ammo', help = _U('amountammo'), type = 'number'}
+end, true, {help = _U('command_giveweapon'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'weapon', help = _U('command_giveweapon_weapon'), type = 'weapon'},
+	{name = 'ammo', help = _U('command_giveweapon_ammo'), type = 'number'}
 }})
 
 ESX.RegisterCommand('giveweaponcomponent', 'admin', function(xPlayer, args, showError)
@@ -68,29 +68,29 @@ ESX.RegisterCommand('giveweaponcomponent', 'admin', function(xPlayer, args, show
 
 		if component then
 			if xPlayer.hasWeaponComponent(args.weaponName, args.componentName) then
-				showError('Player already has that weapon component')
+				showError(_U('command_giveweaponcomponent_hasalready'))
 			else
 				xPlayer.addWeaponComponent(args.weaponName, args.componentName)
 			end
 		else
-			showError('Invalid weapon component')
+			showError(_U('command_giveweaponcomponent_invalid'))
 		end
 	else
-		showError('Player does not have that weapon')
+		showError(_U('command_giveweaponcomponent_missingweapon'))
 	end
-end, true, {help = 'Give weapon component', validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'},
-	{name = 'weaponName', help = _U('weapon'), type = 'weapon'},
-	{name = 'componentName', help = 'weapon component', type = 'string'}
+end, true, {help = _U('command_giveweaponcomponent'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'weaponName', help = _U('command_giveweapon_weapon'), type = 'weapon'},
+	{name = 'componentName', help = _U('command_giveweaponcomponent_component'), type = 'string'}
 }})
 
 ESX.RegisterCommand({'clear', 'cls'}, 'user', function(xPlayer, args, showError)
 	xPlayer.triggerEvent('chat:clear')
-end, false, {help = _U('chat_clear')})
+end, false, {help = _U('command_clear')})
 
 ESX.RegisterCommand({'clearall', 'clsall'}, 'admin', function(xPlayer, args, showError)
 	TriggerClientEvent('chat:clear', -1)
-end, false, {help = _U('chat_clear_all')})
+end, false, {help = _U('command_clearall')})
 
 ESX.RegisterCommand('clearinventory', 'admin', function(xPlayer, args, showError)
 	for k,v in ipairs(args.playerId.inventory) do
@@ -99,7 +99,7 @@ ESX.RegisterCommand('clearinventory', 'admin', function(xPlayer, args, showError
 		end
 	end
 end, true, {help = _U('command_clearinventory'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'}
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
 }})
 
 ESX.RegisterCommand('clearloadout', 'admin', function(xPlayer, args, showError)
@@ -107,5 +107,12 @@ ESX.RegisterCommand('clearloadout', 'admin', function(xPlayer, args, showError)
 		args.playerId.removeWeapon(v.name)
 	end
 end, true, {help = _U('command_clearloadout'), validate = true, arguments = {
-	{name = 'playerId', help = _U('id_param'), type = 'player'}
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
+}})
+
+ESX.RegisterCommand('setgroup', 'admin', function(xPlayer, args, showError)
+	args.playerId.setGorup(args.group)
+end, true, {help = _U('command_setgroup'), validate = true, arguments = {
+	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
+	{name = 'group', help = _U('command_setgroup_group'), type = 'string'},
 }})
diff --git a/server/functions.lua b/server/functions.lua
index a0f3d5aa..caf97a02 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -50,14 +50,14 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion)
 		local command = ESX.RegisteredCommands[name]
 
 		if not command.allowConsole and playerId == 0 then
-			print('[es_extended] [^3WARNING^7] That command can not be run from console')
+			print(('[es_extended] [^3WARNING^7] %s'):format(_U('commanderror_console')))
 		else
 			local xPlayer, error = ESX.GetPlayerFromId(playerId), nil
 
 			if command.suggestion then
 				if command.suggestion.validate then
 					if #args ~= #command.suggestion.arguments then
-						error = ('Argument count mismatch (passed %s, wanted %s)'):format(#args, #command.suggestion.arguments)
+						error = _U('commanderror_argumentmismatch', #args, #command.suggestion.arguments)
 					end
 				end
 
@@ -72,7 +72,7 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion)
 								if newArg then
 									newArgs[v.name] = newArg
 								else
-									error = ('Argument #%s type mismatch (passed string, wanted number)'):format(k)
+									error = _U('commanderror_argumentmismatch_number', k)
 								end
 							elseif v.type == 'player' or v.type == 'playerId' then
 								local targetPlayer = tonumber(args[k])
@@ -89,10 +89,10 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion)
 											newArgs[v.name] = targetPlayer
 										end
 									else
-										error = 'Player not online'
+										error = _U('commanderror_invalidplayerid')
 									end
 								else
-									error = ('Argument #%s type mismatch (passed string, wanted number)'):format(k)
+									error = _U('commanderror_argumentmismatch_number', k)
 								end
 							elseif v.type == 'string' then
 								newArgs[v.name] = args[k]
@@ -100,13 +100,13 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion)
 								if ESX.Items[args[k]] then
 									newArgs[v.name] = args[k]
 								else
-									error = _U('invalid_item')
+									error = _U('commanderror_invaliditem')
 								end
 							elseif v.type == 'weapon' then
 								if ESX.GetWeapon(args[k]) then
 									newArgs[v.name] = string.upper(args[k])
 								else
-									error = 'Invalid weapon'
+									error = _U('commanderror_invalidweapon')
 								end
 							elseif v.type == 'any' then
 								newArgs[v.name] = args[k]