Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

project/assets/database/locales/server/en.json

@@ -16,7 +16,7 @@
 	"bot-missing_cartridge_slot": "Unable to add cartridges to weapon as modPool does not contain cartridges for a CylinderMagazine %s, skipping",
 	"bot-missing_container_with_tpl": "Could not find container template with tpl: %s",
 	"bot-missing_equipment_settings": "Bot {{botRole}} is missing its equipment settings: unable to get value for: {{setting}}, falling back to default of: {{defaultValue}}",
-	"bot-missing_equipment_settings_property": "Bot {{botRole}} is missing an equpiment settings value for: {{setting}}, falling back to default of: {{defaultValue}}",
+	"bot-missing_equipment_settings_property": "Bot {{botRole}} is missing an equipment settings value for: {{setting}}, falling back to default of: {{defaultValue}}",
 	"bot-missing_item_template": "Unable to find item template with tpl: %s",
 	"bot-missing_saved_match_info": "getBotCap() Unable to get saved match info, falling back to default. Did you restart the server and not the client?",
 	"bot-missing_weapon_preset": "Unable to find preset for weapon with tpl: %s",
@@ -50,7 +50,7 @@
 	"bot-unable_to_edit_limits_of_unknown_map": "Unable to edit bot limits of map: %s as it cannot be found",
 	"bot-unable_to_find_loot_n_value_for_bot": "Unable to find loot N value for bot: %s, using scav n value instead",
 	"bot-unable_to_find_bot_in_cache": "Unable to find bot in cache with name: %s",
-	"bot-missing_application_context": "applicationContex could not find %s value. Did you restart the server without restarting the game?",
+	"bot-missing_application_context": "applicationContext could not find %s value. Did you restart the server without restarting the game?",
 	"client_request": "[Client Request] %s",
 	"customisation-item_already_purchased": "Clothing item {{itemId}} {{itemName}} already purchased",
 	"customisation-unable_to_find_suit_by_id": "Unable to find trader suit offer with id: %s",
@@ -90,7 +90,7 @@
 	"inventory-examine_item_does_not_exist": "examineItem() - No id with %s found",
 	"inventory-fill_container_failed": "fillContainerMapWithItem() returned with an error %s",
 	"inventory-invalid_item_missing_from_db": "Unable to get item: %s from db",
-	"inventory-invalid_move_to_container": "Attempted to move item with slotid: {{slotId}} into {{container}}, profile corruption was prevented",
+	"inventory-invalid_move_to_container": "Attempted to move item with slot id: {{slotId}} into {{container}}, profile corruption was prevented",
 	"inventory-no_stash_space": "Not enough stash space",
 	"inventory-unable_to_fill_container": "[OOB] for item: {{id}}; Error message: {{error}}",
 	"inventory-unable_to_find_item": "getExaminedItemTpl() Unable to find item with tpl: %s in database or flea",
@@ -105,13 +105,13 @@
 	"item-durability_value_invalid_use_default": "getRepairableItemQualityValue() weapon tpl: %s durability value is invalid, defaulting to 1",
 	"linux_use_priviledged_port_non_root": "Non-root processes cannot bind to ports below 1024",
 	"location-containers_generated_success": "A total of %s static containers generated",
-	"location-critical_error_see_log": "A critical error occured when generating loot, see server log for details",
+	"location-critical_error_see_log": "A critical error occurred when generating loot, see server log for details",
 	"location-dynamic_items_spawned_success": "A total of %s dynamic items spawned",
 	"location-generated_success": "Generated location %s",
 	"location-missing_root_item": "createItem() failed, root item is null, tpl: {{tpl}}, parentId: {{parentId}}",
 	"location-preset_not_found": "preset not found for {{tpl}}, defaultPreset: {{defaultId}} name: {{defaultName}}, parentId: {{parentId}}",
 	"location-spawn_point_count_requested_vs_found": "{{requested}} spawnpoints were requested while {{found}} are available {{mapName}}",
-	"location-unable_to_reparent_item": "createItem() failed, unable to reparent {{tpl}}, parentId: {{parentId}}",
+	"location-unable_to_reparent_item": "createItem() failed, unable to re-parent {{tpl}}, parentId: {{parentId}}",
 	"location-unable_to_find_airdrop_drop_config_of_type": "Unable to find airdrop config settings for type: %s, falling back to drop type: mixed ",
 	"location-unable_to_fix_broken_waves_missing_base": "%s lacks a base json, skipping map wave fixes",
 	"location-missing_dynamic_template": "Chosen dynamic spawnpoint %s has no template, skipping",
@@ -126,7 +126,7 @@
 	"modloader-checking_mod": "checking: %s",
 	"modloader-cyclic_dependency": "Cyclic dependency detected. This error needs to be fixed. The server is unable to start until this is fixed and will shut down",
 	"modloader-load_order_conflict": "`{{modOneName}}` and `{{modTwoName}}` have conflicting load order requirements, the server is unable to start until this is fixed and will shut down",
-	"modloader-dependency_container_not_initalized": "The dependency container was requested but it wasnt initialized",
+	"modloader-dependency_container_not_initalized": "The dependency container was requested but it wasn't initialized",
 	"modloader-error_parsing_mod_load_order": "Error parsing mod load order",
 	"modloader-incompatibilities_not_string_array": "Mod %s package.json property 'incompatibilities' should be a string array",
 	"modloader-incompatible_mod_found": "Mod {{author}}-{{name}} is incompatible with {{incompatibleModName}}",
@@ -212,7 +212,7 @@
 	"server_start_meme_1": "Live laugh love",
 	"server_start_meme_2": "Anime :(",
 	"server_start_meme_3": "If you can hear me, you need to wake up",
-	"server_start_meme_4": "Dont forget to like and subscribe",
+	"server_start_meme_4": "Don't forget to like and subscribe",
 	"server_start_meme_5": "Have you seen our meme page?",
 	"server_start_meme_6": "You better not be using a fitgirl repack, i swear to god",
 	"server_start_meme_7": "bingos binted",
@@ -232,7 +232,7 @@
 	"server_start_meme_21": "Have you ever wondered, does everyone see red the same colour you see it as?",
 	"server_start_meme_22": "git gud",
 	"server_start_meme_23": "SPT keeping your virginity safe since 2018",
-	"server_start_meme_24": "The secret safe haven server is real! Dont tell anyone!",
+	"server_start_meme_24": "The secret safe haven server is real! Don't tell anyone!",
 	"server_start_success": "Happy playing",
 	"server_start_player_active_botreload_skill": "Your character has the 'BotReload' skill active, this will cause your guns to reload unnaturally fast, ignore this message if this is intended",
 	"started_webserver_success": "Started webserver at %s",
@@ -402,7 +402,7 @@
 	"pmcresponse-victim_negative_71": "You needed that kill, your kd is so bad",
 	"pmcresponse-victim_negative_72": "I died to someone using a meta gun from 2019, shameful",
 	"pmcresponse-victim_negative_73": "Wow you killed me, you are so amazing (this is sarcasm btw)",
-	"pmcresponse-victim_negative_74": "I hate campers like you, runing the game",
+	"pmcresponse-victim_negative_74": "I hate campers like you, ruining the game",
 	"pmcresponse-victim_negative_75": "Yeah well i have a real life outside of tarkov",
 	"pmcresponse-victim_negative_76": "You only got me because my gun jammed",
 	"pmcresponse-victim_negative_77": "I had to take care of my kids, cant all be pro gamers like you",
@@ -513,7 +513,7 @@
 	"pmcresponse-killer_negative_12": "Try to put up a challenge next time",
 	"pmcresponse-killer_negative_13": "Rip little timmy",
 	"pmcresponse-killer_negative_14": "Another dirty little rat taken care of",
-	"pmcresponse-killer_negative_15": "That was embarassing to watch",
+	"pmcresponse-killer_negative_15": "That was embarrassing to watch",
 	"pmcresponse-killer_negative_16": "I expected at least a little resistance, oh well",
 	"pmcresponse-killer_negative_17": "I hope you didnt insure that gear as you wont be getting it back",
 	"pmcresponse-killer_negative_18": "I have a youtube series on how to get better at tarkov if you are interested",