Updated system messages.

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java

@@ -94,7 +94,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 2))
 				{
-					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
+					player.sendPacket(SystemMessageId.TO_PARTICIPATE_IN_THE_32_CLAN_HALL_AUCTION_THE_CLAN_LEVEL_MUST_BE_2_OR_HIGHER_AND_THE_CHARACTER_MUST_BE_A_CLAN_LEADER_OR_HAVE_THE_RIGHT_TO_BID_AND_SELL);
 					return htmltext;
 				}
 				
@@ -123,7 +123,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 2))
 				{
-					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
+					player.sendPacket(SystemMessageId.TO_PARTICIPATE_IN_THE_32_CLAN_HALL_AUCTION_THE_CLAN_LEVEL_MUST_BE_2_OR_HIGHER_AND_THE_CHARACTER_MUST_BE_A_CLAN_LEADER_OR_HAVE_THE_RIGHT_TO_BID_AND_SELL);
 					return htmltext;
 				}
 				
@@ -175,7 +175,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 2))
 				{
-					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
+					player.sendPacket(SystemMessageId.TO_PARTICIPATE_IN_THE_32_CLAN_HALL_AUCTION_THE_CLAN_LEVEL_MUST_BE_2_OR_HIGHER_AND_THE_CHARACTER_MUST_BE_A_CLAN_LEADER_OR_HAVE_THE_RIGHT_TO_BID_AND_SELL);
 					return htmltext;
 				}
 				
@@ -332,7 +332,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			
 			if (!player.isClanLeader() || (clan.getLevel() < 2))
 			{
-				player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
+				player.sendPacket(SystemMessageId.TO_PARTICIPATE_IN_THE_32_CLAN_HALL_AUCTION_THE_CLAN_LEVEL_MUST_BE_2_OR_HIGHER_AND_THE_CHARACTER_MUST_BE_A_CLAN_LEADER_OR_HAVE_THE_RIGHT_TO_BID_AND_SELL);
 				return;
 			}
 			final ClanHall playerClanHall = ClanHallData.getInstance().getClanHallByClan(clan);

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/HappyHours/HappyHours.java

@@ -80,7 +80,7 @@ public class HappyHours extends LongTimeEvent
 					{
 						_lastRewardTime = System.currentTimeMillis();
 						final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true);
-						final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_SIBI_S_COINS);
+						final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_ORIANA_S_COINS);
 						systemMsg.addInt(20);
 						for (Player plr : World.getInstance().getPlayers())
 						{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java

@@ -192,7 +192,7 @@ public class AdminClan implements IAdminCommandHandler
 				player = World.getInstance().getPlayer(val);
 				if (player == null)
 				{
-					activeChar.sendPacket(SystemMessageId.INCORRECT_NAME_PLEASE_TRY_AGAIN);
+					activeChar.sendPacket(SystemMessageId.NAME_IS_NOT_ALLOWED_PLEASE_CHOOSE_ANOTHER_NAME);
 					return null;
 				}
 			}

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java

@@ -83,7 +83,7 @@ public class ChatGeneral implements IChatHandler
 			
 			if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 			{
-				activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
+				activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
 				return;
 			}
 			

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatShout.java

@@ -54,7 +54,7 @@ public class ChatShout implements IChatHandler
 		}
 		if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 		{
-			activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
+			activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java

@@ -54,7 +54,7 @@ public class ChatTrade implements IChatHandler
 		}
 		if (activeChar.getLevel() < 20)
 		{
-			activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(20));
+			activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_USERS_LV_S1_OR_LOWER).addInt(20));
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java

@@ -108,7 +108,7 @@ public class ChatWhisper implements IChatHandler
 			}
 			if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.getWhisperers().contains(receiver.getObjectId()) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 			{
-				activeChar.sendPacket(new SystemMessage(SystemMessageId.NON_PREMIUM_USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
+				activeChar.sendPacket(new SystemMessage(SystemMessageId.USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
 				return;
 			}
 			if (!BlockList.isBlocked(receiver, activeChar))

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java

@@ -61,7 +61,7 @@ public class ChatWorld implements IChatHandler
 		
 		if (activeChar.getLevel() < Config.WORLD_CHAT_MIN_LEVEL)
 		{
-			final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_USE_WORLD_CHAT_FROM_LV_S1);
+			final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_MUST_BE_LV_S1_OR_HIGHER_TO_USE_WORLD_CHAT_YOU_CAN_ALSO_USE_IT_WITH_VIP_BENEFITS);
 			msg.addInt(Config.WORLD_CHAT_MIN_LEVEL);
 			activeChar.sendPacket(msg);
 		}
@@ -75,7 +75,7 @@ public class ChatWorld implements IChatHandler
 		}
 		else if (activeChar.getWorldChatUsed() >= activeChar.getWorldChatPoints())
 		{
-			activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_A_NEW_DAY_STARTS_EVERY_DAY_AT_18_30);
+			activeChar.sendPacket(SystemMessageId.YOU_USED_WORLD_CHAT_UP_TO_TODAY_S_LIMIT_THE_USAGE_COUNT_OF_WORLD_CHAT_IS_RESET_EVERY_DAY_AT_6_30);
 		}
 		else
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java

@@ -111,7 +111,7 @@ public class ConvertItem extends AbstractEffect
 			final SystemMessage sm;
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 				sm.addItemName(unequippedItem);
 			}

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java

@@ -83,7 +83,7 @@ public class Disarmor extends AbstractEffect
 			final Item unequippedItem = unequipped.get(0);
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 				sm.addItemName(unequippedItem);
 			}

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java

@@ -82,12 +82,12 @@ public class AddSpiritExp implements IItemHandler
 	{
 		if (player.isInBattle())
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_ABSORB_DURING_BATTLE);
+			player.sendPacket(SystemMessageId.CANNOT_DRAIN_DURING_BATTLE);
 			return false;
 		}
 		if ((spirit.getLevel() == spirit.getMaxLevel()) && (spirit.getExperience() == spirit.getExperienceToNextLevel()))
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_ABSORB_BECAUSE_REACHED_MAXIMUM_LEVEL);
+			player.sendPacket(SystemMessageId.YOU_HAVE_REACHED_THE_HIGHEST_LEVEL_AND_CANNOT_ABSORB_ANY_FURTHER);
 			return false;
 		}
 		return true;

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -40,7 +40,7 @@ public class PetAttack implements IPlayerActionHandler
 		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetHold.java

@@ -41,7 +41,7 @@ public class PetHold implements IPlayerActionHandler
 		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetMove.java

@@ -41,7 +41,7 @@ public class PetMove implements IPlayerActionHandler
 		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -46,7 +46,7 @@ public class PetSkillUse implements IPlayerActionHandler
 		}
 		else if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetStop.java

@@ -40,7 +40,7 @@ public class PetStop implements IPlayerActionHandler
 		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java

@@ -39,11 +39,11 @@ public class UnsummonPet implements IPlayerActionHandler
 		}
 		else if (((Pet) pet).isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 		}
 		else if (pet.isDead())
 		{

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -46,7 +46,7 @@ public class OlympiadStat implements IUserCommandHandler
 		final WorldObject target = player.getTarget();
 		if ((target == null) || !target.isPlayer() || (target.getActingPlayer().getClassId().level() < 2))
 		{
-			player.sendPacket(SystemMessageId.COMMAND_AVAILABLE_FOR_THOSE_WHO_HAVE_COMPLETED_2ND_CLASS_TRANSFER);
+			player.sendPacket(SystemMessageId.THIS_COMMAND_IS_AVAILABLE_ONLY_WHEN_THE_TARGET_HAS_COMPLETED_THE_2ND_CLASS_TRANSFER);
 			return false;
 		}
 		
@@ -57,7 +57,7 @@ public class OlympiadStat implements IUserCommandHandler
 		sm.addInt(Olympiad.getInstance().getNoblePoints((Player) target));
 		player.sendPacket(sm);
 		
-		final SystemMessage sm2 = new SystemMessage(SystemMessageId.THE_MATCHES_THIS_WEEK_ARE_ALL_CLASS_BATTLES_THE_NUMBER_OF_MATCHES_THAT_ARE_ALLOWED_TO_PARTICIPATE_IS_S1);
+		final SystemMessage sm2 = new SystemMessage(SystemMessageId.YOU_CAN_PARTICIPATE_IN_S1_ALL_CLASS_BATTLE_MATCHES_THIS_WEEK);
 		sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatches(nobleObjId));
 		player.sendPacket(sm2);
 		return true;

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/AbstractInstance.java

@@ -117,7 +117,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 		{
 			if (instance.getTemplateId() != templateId)
 			{
-				player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+				player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_CAN_T_ENTER_THIS_INSTANCED_ZONE_YOU_VE_ALREADY_ENTERED_ANOTHER_DUNGEON).addString(player.getName()));
 				return;
 			}
 			onEnter(player, instance, false);
@@ -151,7 +151,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			// Check if maximum world count limit is exceeded
 			if ((template.getMaxWorlds() != -1) && (manager.getWorldCount(templateId) >= template.getMaxWorlds()))
 			{
-				player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANCE_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
+				player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANT_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
 				return;
 			}
 			
@@ -160,7 +160,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			{
 				if (getPlayerInstance(member) != null)
 				{
-					enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName())));
+					enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_CAN_T_ENTER_THIS_INSTANCED_ZONE_YOU_VE_ALREADY_ENTERED_ANOTHER_DUNGEON).addString(member.getName())));
 					return;
 				}
 				

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java

@@ -286,7 +286,7 @@ public class BotReportTable
 			{
 				if (rcdRep.getPointsLeft() == 0)
 				{
-					reporter.sendPacket(SystemMessageId.YOU_HAVE_USED_ALL_AVAILABLE_POINTS_POINTS_ARE_RESET_EVERYDAY_AT_NOON);
+					reporter.sendPacket(SystemMessageId.YOU_VE_SPENT_ALL_POINTS_THE_POINTS_WILL_BE_RESET_AT_06_30_SO_THAT_YOU_CAN_USE_THEM_AGAIN);
 					return false;
 				}
 				

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -155,7 +155,7 @@ public class HandysBlockCheckerManager
 			{
 				if (_arenaPlayers[i].getAllPlayers().contains(player))
 				{
-					final SystemMessage msg = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST);
+					final SystemMessage msg = new SystemMessage(SystemMessageId.C1_YOU_HAVE_ALREADY_REGISTERED_FOR_THE_MATCH);
 					msg.addString(player.getName());
 					player.sendPacket(msg);
 					return false;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java

@@ -84,7 +84,7 @@ public class PetitionManager
 		currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_APPLICATION_ACCEPTED));
 		
 		// Petition application accepted. Reciept No. is <ID>
-		SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
+		SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1);
 		sm.addInt(currPetition.getId());
 		currPetition.sendResponderPacket(sm);
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java

@@ -239,7 +239,7 @@ public class CursedWeapon implements INamable
 			// _player.getInventory().getItemByItemId(_itemId).dropMe(_player, _player.getX(), _player.getY(), _player.getZ());
 		}
 		_isDropped = true;
-		final SystemMessage sm = new SystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HAS_DROPPED_IN_S1_THE_QUANTITY_OF_ADENA_STACKED_IN_THE_S2_TREASURE_CHEST_IS_S3_IN_FIXED_QUANTITY_AND_S4_IN_VARIABLE_QUANTITY_THE_OWNER_AT_23_59_WILL_FINALLY_OWN_THIS_ADENA);
 		if (player != null)
 		{
 			sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name
@@ -261,7 +261,7 @@ public class CursedWeapon implements INamable
 		doTransform();
 		giveSkill();
 		
-		final SystemMessage msg = new SystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION);
+		final SystemMessage msg = new SystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_S1_THE_QUANTITY_OF_ADENA_STACKED_IN_THE_S2_TREASURE_CHEST_IS_S3_IN_FIXED_QUANTITY_AND_S4_IN_VARIABLE_QUANTITY_THE_OWNER_AT_23_59_WILL_FINALLY_OWN_THIS_ADENA);
 		msg.addZoneName(_player.getX(), _player.getY(), _player.getZ());
 		msg.addItemName(_player.getCursedWeaponEquippedId());
 		CursedWeaponsManager.announce(msg);
@@ -409,7 +409,7 @@ public class CursedWeapon implements INamable
 		final SocialAction atk = new SocialAction(_player.getObjectId(), 17);
 		_player.broadcastPacket(atk);
 		
-		sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
+		sm = new SystemMessage(SystemMessageId.S2_S_OWNER_HAS_APPEARED_IN_S1_THE_QUANTITY_OF_ADENA_STACKED_IN_THE_S2_TREASURE_CHEST_IS_S3_IN_FIXED_QUANTITY_AND_S4_IN_VARIABLE_QUANTITY_THE_OWNER_AT_23_59_WILL_FINALLY_OWN_THIS_ADENA);
 		sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
 		sm.addItemName(_item);
 		CursedWeaponsManager.announce(sm);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/ElementalSpirit.java

@@ -74,12 +74,12 @@ public class ElementalSpirit
 		
 		_data.addExperience(experience);
 		_owner.sendPacket(new ExElementalSpiritGetExp(_data.getType(), _data.getExperience()));
-		_owner.sendPacket(new SystemMessage(SystemMessageId.OBTAINED_S2_ATTRIBUTE_XP_OF_S1).addInt(experience).addElementalSpirit(getType()));
+		_owner.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_S_S2_SKILL_XP).addInt(experience).addElementalSpirit(getType()));
 		
 		if (_data.getExperience() > getExperienceToNextLevel())
 		{
 			levelUp();
-			_owner.sendPacket(new SystemMessage(SystemMessageId.S1_ATTRIBUTE_SPIRIT_BECAME_LEVEL_S2).addElementalSpirit(_data.getType()).addByte(_data.getLevel()));
+			_owner.sendPacket(new SystemMessage(SystemMessageId.S1_ATTACK_SPIRITS_HAVE_REACHED_LEVEL_S2).addElementalSpirit(_data.getType()).addByte(_data.getLevel()));
 			_owner.sendPacket(new ElementalSpiritInfo(_owner, _owner.getActiveElementalSpiritType(), (byte) 0));
 			final UserInfo userInfo = new UserInfo(_owner);
 			userInfo.addComponentType(UserInfoType.ATT_SPIRITS);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Petition.java

@@ -76,14 +76,14 @@ public class Petition
 			else
 			{
 				// Ending petition consultation with <Player>.
-				SystemMessage sm = new SystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED);
+				SystemMessage sm = new SystemMessage(SystemMessageId.ENDED_THE_CUSTOMER_CONSULTATION_WITH_C1);
 				sm.addString(_petitioner.getName());
 				_responder.sendPacket(sm);
 				
 				if (endState == PetitionState.PETITIONER_CANCEL)
 				{
 					// Receipt No. <ID> petition cancelled.
-					sm = new SystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED);
+					sm = new SystemMessage(SystemMessageId.CANCELED_THE_QUERY_NO_S1);
 					sm.addInt(_id);
 					_responder.sendPacket(sm);
 				}
@@ -93,7 +93,7 @@ public class Petition
 		// End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button
 		if ((_petitioner != null) && _petitioner.isOnline())
 		{
-			_petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE);
+			_petitioner.sendPacket(SystemMessageId.GM_HAS_REPLIED_TO_YOUR_QUESTION_PLEASE_LEAVE_A_REVIEW_ON_OUR_CUSTOMER_QUERY_SERVICE);
 			_petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET);
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2247,7 +2247,7 @@ public class Player extends Playable
 		{
 			if (item.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(item.getEnchantLevel());
 				sm.addItemName(item);
 			}
@@ -5953,7 +5953,7 @@ public class Player extends Playable
 			final Item unequippedItem = unequipped.get(0);
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 				sm.addItemName(unequippedItem);
 			}
@@ -5994,7 +5994,7 @@ public class Player extends Playable
 				final Item unequippedItem = unequipped.get(0);
 				if (unequippedItem.getEnchantLevel() > 0)
 				{
-					sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+					sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 					sm.addInt(unequippedItem.getEnchantLevel());
 					sm.addItemName(unequippedItem);
 				}
@@ -9381,7 +9381,7 @@ public class Player extends Playable
 		}
 		if (isDead() || isAlikeDead() || ((getCurrentHp() < (getMaxHp() / 2)) || (getCurrentMp() < (getMaxMp() / 2))))
 		{
-			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50;
+			_noDuelReason = SystemMessageId.C1_S_HP_OR_MP_IS_BELOW_50_AND_CANNOT_DUEL;
 			return false;
 		}
 		if (_isInDuel || _startingDuel)
@@ -11607,7 +11607,7 @@ public class Player extends Playable
 		
 		if (elementalCrit)
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ATTACK_CRITICAL_IS_ACTIVATED);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.S1_SKILL_CRITICAL_HAS_BEEN_ACTIVATED);
 			sm.addElementalSpirit(getActiveElementalSpiritType());
 			sendPacket(sm);
 		}
@@ -11631,7 +11631,7 @@ public class Player extends Playable
 		{
 			if (elementalDamage != 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_HAS_INFLICTED_S3_DAMAGE_ATTRIBUTE_DAMAGE_S4_TO_S2);
+				sm = new SystemMessage(SystemMessageId.S1_HAS_INFLICTED_S3_S4_ATTRIBUTE_DAMGE_DAMAGE_TO_S2);
 			}
 			else
 			{
@@ -11719,7 +11719,7 @@ public class Player extends Playable
 				
 				if (equippedItem.getEnchantLevel() > 0)
 				{
-					sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+					sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 					sm.addInt(equippedItem.getEnchantLevel());
 					sm.addItemName(equippedItem);
 				}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java

@@ -43,7 +43,7 @@ public class WarnUserTakeBreakTask implements Runnable
 			if (_player.isOnline())
 			{
 				final long hours = TimeUnit.MILLISECONDS.toHours(_player.getUptime() + 60000);
-				_player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_PLAYING_FOR_S1_HOUR_S_HOW_ABOUT_MAKING_A_BREAK).addLong(hours));
+				_player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_PLAYING_FOR_S1_HOUR_S_HOW_ABOUT_TAKING_A_BREAK).addLong(hours));
 			}
 			else
 			{

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java

@@ -156,7 +156,7 @@ public class Fishing
 		{
 			if (Config.PREMIUM_ONLY_FISHING && !_player.hasPremiumStatus())
 			{
-				_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
+				_player.sendPacket(SystemMessageId.FISHING_WILL_END_BECAUSE_THE_CONDITIONS_HAVE_NOT_BEEN_MET);
 				_player.sendPacket(ActionFailed.STATIC_PACKET);
 				stopFishing(FishingEndType.ERROR);
 				return;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java

@@ -960,7 +960,7 @@ public class Instance implements IIdentifiable, INamable
 			ps.executeBatch();
 			
 			// Save to memory and send message to player
-			final SystemMessage msg = new SystemMessage(SystemMessageId.INSTANCE_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
+			final SystemMessage msg = new SystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
 			if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null)
 			{
 				msg.addInstanceName(_template.getId());
@@ -1023,7 +1023,7 @@ public class Instance implements IIdentifiable, INamable
 		if (!player.isOnEvent() && (_template.getEjectTime() > 0))
 		{
 			// Send message
-			final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANCE_ZONE);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANT_ZONE);
 			sm.addInt(_template.getEjectTime());
 			player.sendPacket(sm);
 			
@@ -1278,7 +1278,7 @@ public class Instance implements IIdentifiable, INamable
 		{
 			return;
 		}
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_INSTANCE_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_INSTANT_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
 		sm.addInt(delay);
 		broadcastPacket(sm);
 	}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java

@@ -33,7 +33,7 @@ public class ConditionGroupMin extends Condition
 	public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
 	{
 		super(template, parameters, true, showMessageAndHtml);
-		setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit()));
+		setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit()));
 	}
 	
 	@Override

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -154,7 +154,7 @@ public abstract class AbstractOlympiadGame
 		}
 		if (!player.isInventoryUnder90(true))
 		{
-			sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_AS_THE_INVENTORY_WEIGHT_SLOT_IS_FILLED_BEYOND_80);
+			sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_FOR_OLYMPIAD_AS_THE_INVENTORY_WEIGHT_SLOT_EXCEEDS_80);
 			sm.addPcName(player);
 			player.sendPacket(sm);
 			return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java

@@ -192,7 +192,7 @@ public class OlympiadManager
 		final int charId = player.getObjectId();
 		if (Olympiad.getInstance().getRemainingWeeklyMatches(charId) < 1)
 		{
-			player.sendPacket(SystemMessageId.THE_MAXIMUM_MATCHES_YOU_CAN_PARTICIPATE_IN_1_WEEK_IS_30);
+			player.sendPacket(SystemMessageId.YOU_CAN_PARTICIPATE_IN_UP_TO_30_MATCHES_PER_WEEK);
 			return false;
 		}
 		
@@ -258,7 +258,7 @@ public class OlympiadManager
 				}
 				
 				_nonClassBasedRegisters.add(charId);
-				player.sendPacket(SystemMessageId.YOU_ARE_CURRENTLY_REGISTERED_FOR_A_1V1_CLASS_IRRELEVANT_MATCH);
+				player.sendPacket(SystemMessageId.YOU_VE_BEEN_REGISTERED_IN_THE_WAITING_LIST_OF_ALL_CLASS_BATTLE);
 				break;
 			}
 		}
@@ -275,7 +275,7 @@ public class OlympiadManager
 		
 		if ((!noble.isInCategory(CategoryType.THIRD_CLASS_GROUP) && !noble.isInCategory(CategoryType.FOURTH_CLASS_GROUP)) || (noble.getLevel() < 55)) // Classic noble equivalent check.
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.CHARACTER_C1_DOES_NOT_MEET_THE_CONDITIONS_ONLY_CHARACTERS_WHO_HAVE_CHANGED_TWO_OR_MORE_CLASSES_CAN_PARTICIPATE_IN_OLYMPIAD);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_CHARACTERS_THAT_COMPLETED_THE_2ND_CLASS_TRANSFER_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
 			sm.addString(noble.getName());
 			noble.sendPacket(sm);
 			return false;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -681,7 +681,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	private void giveSkill(Player player, Npc trainer, Skill skill, boolean store)
 	{
 		// Send message.
-		final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_LEARNED_S1);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_2);
 		sm.addSkillName(skill);
 		player.sendPacket(sm);
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -87,7 +87,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
 		
 		if (player.hasItemRequest())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_CANCEL_DURING_AN_ITEM_ENHANCEMENT_OR_ATTRIBUTE_ENHANCEMENT);
+			player.sendPacket(SystemMessageId.YOU_CAN_T_CANCEL_WHILE_ENCHANTING_AN_ITEM_OR_ATTRIBUTE);
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -213,7 +213,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
 			
 			if (itemToRemove.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(itemToRemove.getEnchantLevel());
 				sm.addItemName(itemToRemove);
 			}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java

@@ -181,7 +181,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
 		{
 			if (itemToRemove.getEnchantLevel() > 0)
 			{
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(itemToRemove.getEnchantLevel());
 				sm.addItemName(itemToRemove);
 				player.sendPacket(sm);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -292,7 +292,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
 						{
 							if (item.getEnchantLevel() > 0)
 							{
-								final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+								final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 								sm.addInt(item.getEnchantLevel());
 								sm.addItemName(item);
 								player.sendPacket(sm);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java

@@ -85,7 +85,7 @@ public class RequestPetGetItem implements IClientIncomingPacket
 		
 		if (pet.isUncontrollable())
 		{
-			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java

@@ -82,7 +82,7 @@ public class RequestPetition implements IClientIncomingPacket
 		
 		if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
 		{
-			player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
+			player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_LINEAGE2_CUSTHELP_COM_IF_YOU_BECOME_TRAPPED_OR_UNABLE_TO_MOVE_PLEASE_USE_THE_UNSTUCK_COMMAND);
 			return;
 		}
 		
@@ -102,11 +102,11 @@ public class RequestPetition implements IClientIncomingPacket
 		}
 		
 		final int petitionId = PetitionManager.getInstance().submitPetition(player, _content, _type);
-		SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
+		SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1);
 		sm.addInt(petitionId);
 		player.sendPacket(sm);
 		
-		sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_NYOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY);
+		sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_YOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY);
 		sm.addInt(totalPetitions);
 		sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
 		player.sendPacket(sm);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java

@@ -70,7 +70,7 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
 				final PledgeWaitingInfo pledgeDraftList = new PledgeWaitingInfo(player.getObjectId(), player.getLevel(), _karma, player.getClassId().getId(), player.getName());
 				if (ClanEntryManager.getInstance().addToWaitingList(player.getObjectId(), pledgeDraftList))
 				{
-					player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+					player.sendPacket(SystemMessageId.ENTERED_INTO_WAITING_LIST_NAME_IS_AUTOMATICALLY_DELETED_AFTER_30_DAYS_IF_DELETE_FROM_WAITING_LIST_IS_USED_YOU_CANNOT_ENTER_NAMES_INTO_THE_WAITING_LIST_FOR_5_MINUTES);
 				}
 				else
 				{

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java

@@ -85,7 +85,7 @@ public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
 			{
 				if (ClanEntryManager.getInstance().addToClanList(clan.getId(), pledgeRecruitInfo))
 				{
-					player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
+					player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_ENTRY_APPLICATION_INFO_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
 				}
 				else
 				{
@@ -99,7 +99,7 @@ public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
 			{
 				if (ClanEntryManager.getInstance().updateClanList(clan.getId(), pledgeRecruitInfo))
 				{
-					player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
+					player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_ENTRY_APPLICATION_INFO_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
 				}
 				else
 				{

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -90,7 +90,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
 		
 		if (player.hasItemRequest())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_MAIL_WHILE_ENCHANTING_AN_ITEM_BESTOWING_AN_ATTRIBUTE_OR_COMBINING_JEWELS);
+			player.sendPacket(SystemMessageId.YOU_CAN_T_RECEIVE_WHILE_ENCHANTING_AN_ITEM_OR_ATTRIBUTE_COMBINING_JEWELS_OR_SEALING_UNSEALING_OR_COMBINING);
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java

@@ -139,7 +139,7 @@ public class RequestSendPost implements IClientIncomingPacket
 		
 		if (player.hasItemRequest())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_SEND_MAIL_WHILE_ENCHANTING_AN_ITEM_BESTOWING_AN_ATTRIBUTE_OR_COMBINING_JEWELS);
+			player.sendPacket(SystemMessageId.YOU_CAN_T_SEND_WHILE_ENCHANTING_AN_ITEM_OR_ATTRIBUTE_COMBINING_JEWELS_OR_SEALING_UNSEALING_OR_COMBINING);
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java

@@ -109,7 +109,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
 			final Item unequippedItem = unequipped.get(0);
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 			}
 			else

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -254,9 +254,9 @@ public class UseItem implements IClientIncomingPacket
 			{
 				if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.EMPTY_15);
+					// final SystemMessage sm = new SystemMessage(SystemMessageId.EMPTY_15);
-					sm.addItemName(item);
+					// sm.addItemName(item);
-					player.sendPacket(sm);
+					// player.sendPacket(sm);
 					return;
 				}
 			}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java

@@ -58,12 +58,12 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket
 		
 		if (Config.PREMIUM_ONLY_ATTENDANCE_REWARDS && !player.hasPremiumStatus())
 		{
-			player.sendPacket(SystemMessageId.YOUR_VIP_RANK_IS_TOO_LOW_TO_RECEIVE_THE_REWARD);
+			player.sendPacket(SystemMessageId.YOUR_VIP_LEVEL_IS_TOO_LOW_TO_RECEIVE_THE_REWARD);
 			return;
 		}
 		else if (Config.VIP_ONLY_ATTENDANCE_REWARDS && (player.getVipTier() <= 0))
 		{
-			player.sendPacket(SystemMessageId.YOUR_VIP_RANK_IS_TOO_LOW_TO_RECEIVE_THE_REWARD);
+			player.sendPacket(SystemMessageId.YOUR_VIP_LEVEL_IS_TOO_LOW_TO_RECEIVE_THE_REWARD);
 			return;
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalInitTalent.java

@@ -59,7 +59,7 @@ public class ExElementalInitTalent implements IClientIncomingPacket
 		
 		if (player.isInBattle())
 		{
-			client.sendPacket(new SystemMessage(SystemMessageId.UNABLE_TO_RESET_SPIRIT_ATTRIBUTE_DURING_BATTLE));
+			client.sendPacket(new SystemMessage(SystemMessageId.CANNOT_RESET_SPIRIT_CHARACTERISTICS_DURING_BATTLE));
 			client.sendPacket(new ElementalSpiritSetTalent(player, _type, false));
 			return;
 		}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java

@@ -74,7 +74,7 @@ public class ExElementalSpiritAbsorb implements IClientIncomingPacket
 		final boolean canAbsorb = checkConditions(player, spirit);
 		if (canAbsorb)
 		{
-			client.sendPacket(SystemMessageId.SUCCESFUL_ABSORPTION);
+			client.sendPacket(SystemMessageId.DRAIN_SUCCESSFUL);
 			spirit.addExperience(absorbItem.getExperience() * _amount);
 			final UserInfo userInfo = new UserInfo(player);
 			userInfo.addComponentType(UserInfoType.ATT_SPIRITS);
@@ -92,17 +92,17 @@ public class ExElementalSpiritAbsorb implements IClientIncomingPacket
 		}
 		if (player.isInBattle())
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_ABSORB_DURING_BATTLE);
+			player.sendPacket(SystemMessageId.CANNOT_DRAIN_DURING_BATTLE);
 			return false;
 		}
 		if ((spirit.getLevel() == spirit.getMaxLevel()) && (spirit.getExperience() == spirit.getExperienceToNextLevel()))
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_ABSORB_BECAUSE_REACHED_MAXIMUM_LEVEL);
+			player.sendPacket(SystemMessageId.YOU_HAVE_REACHED_THE_HIGHEST_LEVEL_AND_CANNOT_ABSORB_ANY_FURTHER);
 			return false;
 		}
 		if ((_amount < 1) || !player.destroyItemByItemId("Absorb", _itemId, _amount, player, true))
 		{
-			player.sendPacket(SystemMessageId.NOT_ENOUGH_INGREDIENTS_TO_ABSORB);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_MATERIALS_REQUIRED_TO_ABSORB);
 			return false;
 		}
 		return true;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolution.java

@@ -85,17 +85,17 @@ public class ExElementalSpiritEvolution implements IClientIncomingPacket
 		}
 		if (player.isInBattle())
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_EVOLVE_DURING_BATTLE);
+			player.sendPacket(SystemMessageId.CANNOT_EVOLVE_DURING_BATTLE);
 			return false;
 		}
 		if (!spirit.canEvolve())
 		{
-			player.sendPacket(SystemMessageId.THIS_SPIRIT_CANNOT_EVOLVE);
+			player.sendPacket(SystemMessageId.SPIRIT_CANNOT_BE_EVOLVED);
 			return false;
 		}
 		if (!consumeEvolveItems(player, spirit))
 		{
-			player.sendPacket(SystemMessageId.NOT_ENOUGH_INGREDIENTS_FOR_EVOLUTION);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_MATERIALS_REQUIRED_TO_EVOLVE);
 			return false;
 		}
 		return true;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtract.java

@@ -64,7 +64,7 @@ public class ExElementalSpiritExtract implements IClientIncomingPacket
 		if (canExtract)
 		{
 			final int amount = spirit.getExtractAmount();
-			client.sendPacket(new SystemMessage(SystemMessageId.EXTRACTED_S1_S2_SUCCESSFULLY).addItemName(spirit.getExtractItem()).addInt(amount));
+			client.sendPacket(new SystemMessage(SystemMessageId.EXTRACTED_S1_X_S2_SUCCESSFULLY).addItemName(spirit.getExtractItem()).addInt(amount));
 			spirit.reduceLevel();
 			player.addItem("Extract", spirit.getExtractItem(), amount, player, true);
 			
@@ -80,12 +80,12 @@ public class ExElementalSpiritExtract implements IClientIncomingPacket
 	{
 		if ((spirit.getLevel() < 2) || (spirit.getExtractAmount() < 1))
 		{
-			player.sendPacket(SystemMessageId.NOT_ENOUGH_ATTRIBUTE_XP_FOR_EXTRACTION);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SKILL_XP_TO_EXTRACT);
 			return false;
 		}
 		if (!player.getInventory().validateCapacity(1))
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_EXTRACT_BECAUSE_INVENTORY_IS_FULL);
+			player.sendPacket(SystemMessageId.INVENTORY_IS_FULL_CANNOT_EXTRACT);
 			return false;
 		}
 		if (player.getPrivateStoreType() != PrivateStoreType.NONE)
@@ -95,12 +95,12 @@ public class ExElementalSpiritExtract implements IClientIncomingPacket
 		}
 		if (player.isInBattle())
 		{
-			player.sendPacket(SystemMessageId.UNABLE_TO_EVOLVE_DURING_BATTLE);
+			player.sendPacket(SystemMessageId.CANNOT_EVOLVE_DURING_BATTLE);
 			return false;
 		}
 		if (!player.reduceAdena("Extract", ElementalSpiritData.EXTRACT_FEE, player, true))
 		{
-			player.sendPacket(SystemMessageId.NOT_ENOUGH_INGREDIENTS_TO_EXTRACT);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_MATERIALS_REQUIRED_TO_EXTRACT);
 			return false;
 		}
 		return true;

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/ExUpgradeSystemNormalRequest.java

@@ -125,7 +125,7 @@ public class ExUpgradeSystemNormalRequest implements IClientIncomingPacket
 				{
 					addItem.setEnchantLevel(item.getEnchantLevel());
 				}
-				player.sendPacket(new SystemMessage(SystemMessageId.C1_HAS_SUCCEEDED_IN_UPGRADING_EQUIPMENT_AND_OBTAINED_A_S2).addPcName(player).addItemName(addItem));
+				player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_OBTAINED_S2_THROUGH_EQUIPMENT_UPGRADE).addPcName(player).addItemName(addItem));
 			}
 			if (upgradeHolder.getBonus() != null)
 			{
@@ -141,7 +141,7 @@ public class ExUpgradeSystemNormalRequest implements IClientIncomingPacket
 						{
 							addItem.setEnchantLevel(item.getEnchantLevel());
 						}
-						player.sendPacket(new SystemMessage(SystemMessageId.C1_HAS_SUCCEEDED_IN_UPGRADING_EQUIPMENT_AND_OBTAINED_A_S2).addPcName(player).addItemName(addItem));
+						player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_OBTAINED_S2_THROUGH_EQUIPMENT_UPGRADE).addPcName(player).addItemName(addItem));
 					}
 				}
 			}
@@ -158,7 +158,7 @@ public class ExUpgradeSystemNormalRequest implements IClientIncomingPacket
 					{
 						addItem.setEnchantLevel(item.getEnchantLevel());
 					}
-					player.sendPacket(new SystemMessage(SystemMessageId.C1_HAS_SUCCEEDED_IN_UPGRADING_EQUIPMENT_AND_OBTAINED_A_S2).addPcName(player).addItemName(addItem));
+					player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_OBTAINED_S2_THROUGH_EQUIPMENT_UPGRADE).addPcName(player).addItemName(addItem));
 				}
 			}
 		}

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java

@@ -122,7 +122,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket
 		
 		// Send result packet.
 		
-		player.sendPacket(new SystemMessage(SystemMessageId.C1_HAS_SUCCEEDED_IN_UPGRADING_EQUIPMENT_AND_OBTAINED_A_S2).addPcName(player).addItemName(addedItem));
+		player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_OBTAINED_S2_THROUGH_EQUIPMENT_UPGRADE).addPcName(player).addItemName(addedItem));
 		player.sendPacket(new InventoryUpdate());
 		player.sendPacket(new ExUpgradeSystemResult(addedItem.getObjectId(), 1));
 	}