Removed a few out of date messages from msg_athena, and updated some others.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13204 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 162 insertions, 174 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 786cfb281..6baf24977 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/09/11
+	* Rev. 13204 Made the mail check on login read from msg_athena.conf. [L0ne_W0lf]
 2008/09/09
 	* Rev. 13202 Added commands related to WoE SE, allowing it to run independantly of WoE. [L0ne_W0lf]
 	- Added: @agitstart2, @agitend2, agitstart2, agitend2, and agitcheck2.
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 55d8143d0..7f98a6ebb 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2008/09/11
+	* Rev. 13204 Updated some messages in msg_athena.conf. [L0ne_W0lf]
 2008/08/19
 	* Added global sql settings 'sql.*' to inter_athena.conf.
 	* Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings.
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 734264578..820544020 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -23,8 +23,8 @@
 3: Character not found.
 4: Jump to %s
 5: Jump to %d %d
-6: Character respawn point saved.
-7: Warping to respawn point.
+6: Your save point has been changed.
+7: Warping to save point.
 8: Speed changed.
 9: Options changed.
 10: Invisible: Off
@@ -55,10 +55,10 @@
 35: You can't use this command with this class.
 36: Appearance changed.
 37: An invalid number was specified.
-38: Invalid location number or name.
+38: Invalid location number, or name.
 39: All monsters summoned!
 40: Invalid monster ID or name.
-41: Impossible to decrease the number/value.
+41: Unable to decrease the number/value.
 42: Stat changed.
 43: You're not in a guild.
 44: You're not the master of your guild.
@@ -74,7 +74,7 @@
 54: No player found in map '%s'.
 55: 1 player found in map '%s'.
 56: %d players found in map '%s'.
-57: Character's respawn point changed.
+57: Character's save point changed.
 58: Character's options changed.
 59: Night Mode Activated.
 60: Day Mode Activated.
@@ -89,37 +89,37 @@
 69: Character's job level lowered.
 70: You have learned the skill.
 71: You have forgotten the skill.
-72: Guild siege warfare start!
-73: Guild siege warfare has already started.
-74: Guild siege warfare end!
-75: Siege warfare hasn't started yet.
-76: You have received all skills.
+72: War of Emperium has been initiated.
+73: War of Emperium is currently in progress.
+74: War of Emperium has been ended.
+75: War of Emperium is currently not in progress.
+76: All skills have been added to your skill tree.
 77: The reference result of '%s' (name: id):
 78: %s: %d
 79: It is %d affair above.
-80: Give a display name and monster name/id please.
-81: Your GM level doesn't authorize you to do this action on this player.
-82: Please, use one of this number/name:
-83: Cannot spawn emperium.
+80: Give the display name or monster name/id please.
+81: Your GM level doesn't authorize you to preform this action on the specified player.
+82: Please provide a name or number from the list provided:
+83: Monster 'Emperium' cannot be spawned.
 84: All stats changed!
 85: Invalid time for ban command.
-86: Sorry, but a player name have at least 4 characters.
-87: Sorry, but a player name has 23 characters maximum.
+86: Sorry, player names have to be at least 4 characters.
+87: Sorry, player names can be no longer than 23 characters.
 88: Sending request to login server...
-89: Sorry, it's already the night. Impossible to execute the command.
-90: Sorry, it's already the day. Impossible to execute the command.
+89: Night mode is already enabled.
+90: Day mode is already enabled.
 91: Character's base level can't go any higher.
 92: All characters recalled!
-93: All online characters of the %s guild are near you.
-94: Incorrect name/ID, or no one from the guild is online.
-95: All online characters of the %s party are near you.
-96: Incorrect name or ID, or no one from the party is online.
-97: Item database reloaded.
-98: Monster database reloaded.
-99: Skill database reloaded.
-100: Scripts reloaded.
+93: All online characters of the %s guild have been recalled to your position.
+94: Incorrect name/ID, or no one from the specified guild is online.
+95: All online characters of the %s party have been recalled to your position.
+96: Incorrect name/ID, or no one from the specified party is online.
+97: Item database has been reloaded.
+98: Monster database has been reloaded.
+99: Skill database has been reloaded.
+100: Scripts have been reloaded.
 101: Login-server asked to reload GM accounts and their level.
-102: Mounted Peco.
+102: You have mounted a Peco Peco.
 103: No longer spying on the %s guild.
 104: Spying on the %s guild.
 105: No longer spying on the %s party.
@@ -133,14 +133,14 @@
 113: %d item(s) removed by a GM.
 114: %d item(s) removed from the player.
 115: %d item(s) removed. Player had only %d on %d items.
-116: Character does not have the item.
-117: GM has sent you to jail.
+116: Character does not have the specified item.
+117: You have been placed in jail by a GM.
 118: Player warped to jail.
 119: This player is not in jail.
-120: A GM has discharged you.
+120: A GM has discharged you from jail.
 121: Player unjailed.
 122: Disguise applied.
-123: Monster/NPC name/ID hasn't been found.
+123: Invalid Monster/NPC name/ID specified.
 124: Undisguise applied.
 125: You're not disguised.
 //Clone Messages
@@ -168,9 +168,9 @@
 152: %d GMs found.
 153: %s is Unknown Command.
 154: %s failed.
-155: Impossible to change your job.
+155: You are unable to change your job.
 156: HP or/and SP modified.
-157: HP and SP are already with the good value.
+157: HP and SP have already been recovered.
 158: Base level can't go any lower.
 159: Job level can't go any lower.
 160: PvP is already Off.
@@ -179,33 +179,33 @@
 163: GvG is already On.
 164: Your memo point #%d doesn't exist.
 165: All monsters killed!
-166: No item has been refined!
-167: 1 item has been refined!
-168: %d items have been refined!
-169: This item (%d: '%s') is not an equipment.
-170: This item is not an equipment.
+166: No item has been refined.
+167: 1 item has been refined.
+168: %d items have been refined.
+169: The item (%d: '%s') is not equipable.
+170: The item is not equipable.
 171: %d - void
 //172: You replace previous memo position %d - %s (%d,%d).
 //173: Note: you don't have the 'Warp' skill level to use it.
-174: Number of status points changed!
-175: Number of skill points changed!
-176: Number of zenys changed!
-177: Impossible to decrease a stat.
-178: Impossible to increase a stat.
+174: Number of status points changed.
+175: Number of skill points changed.
+176: Current amount of zeny changed.
+177: You cannot decrease that stat anymore.
+178: You cannot increase that stat anymore.
 179: Guild level changed.
 180: The monster/egg name/ID doesn't exist.
 181: You already have a pet.
-182: Pet friendly value changed!
-183: Pet friendly is already in the good value.
+182: Pet intimacy changed.
+183: Pet intimacy is already at maximum.
 184: Sorry, but you have no pet.
-185: Pet hungry value changed!
-186: Pet hungry is already in the good value.
+185: Pet hunger changed.
+186: Pet hunger is already at maximum.
 187: You can now rename your pet.
 188: You can already rename your pet.
 189: This player can now rename his/her pet.
 190: This player can already rename his/her pet.
 191: Sorry, but this player has no pet.
-192: Impossible to change the character's job.
+192: Unable to change the specified character's job.
 193: Character's base level can't go any lower.
 194: Character's job level can't go any lower.
 195: All players have been kicked!
@@ -218,20 +218,20 @@
 202: This player has forgotten the skill.
 203: This player doesn't have this quest skill.
 204: WARNING: more than 1000 spiritballs can CRASH your server and/or client!
-205: You already have this number of spiritballs.
-206: '%s' skill points reseted!
-207: '%s' stats points reseted!
-208: '%s' skill and stats points reseted!
-209: Character's number of skill points changed!
-210: Character's number of status points changed!
-211: Character's number of zenys changed!
-212: Cannot mount a Peco while in disguise.
-213: You can not mount a peco with your job.
-214: Unmounted Peco.
-215: This player cannot mount a Peco while in disguise.
-216: This player mounted a peco.
-217: This player cannot mount a peco with his/her job.
-218: Now, this player no longer has a peco.
+205: You already have that number of spiritballs.
+206: '%s' skill points reset.
+207: '%s' stats points reset.
+208: '%s' skill and stat points have been reset.
+209: Character's skill points changed.
+210: Character's status points changed.
+211: Character's current zeny changed.
+212: Cannot mount a Peco Peco while in disguise.
+213: You can not mount a Peco Peco with your current job.
+214: You have released your Peco Peco.
+215: This player cannot mount a Peco Peco while in disguise.
+216: This player has mounted a Peco Peco.
+217: This player cannot mount a Peco Peco with his/her current job.
+218: This player's Peco Peco has been released.
 219: %d day
 220: %d days
 221: %s %d hour
@@ -254,12 +254,12 @@
 238: Game time: A day cycle has a normal duration of %s.
 239: Game time: After, the game will be in daylight for %s.
 240: %d monster(s) summoned!
-241: You can now kill anybody
-242: You are now killable by anyone
-243: Map skills are off
-244: Map skills are on
+241: You can now attack and kill players freely.
+242: You be attacked and killed by players.
+243: Skills have been disabled on this map.
+244: Skills have been enabled on this map.
 245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
-246: Your GM level doesn't authorize you to do this action.
+246: Your GM level doesn't authorize you to preform this action.
 247: You are not authorized to warp to this map.
 248: You are not authorized to warp from your current map.
 249: You are not authorized to warp to your save map.
@@ -267,10 +267,10 @@
 251: You have already opened your guild storage. Close it first.
 252: You are not in a guild.
 //253: You are not authorized to memo this map.
-254: GM command configuration reloaded.
-255: Battle configuration reloaded.
-256: Status database reloaded.
-257: Player database reloaded.
+254: GM command configuration has been reloaded.
+255: Battle configuration has been reloaded.
+256: Status database has been reloaded.
+257: Player database has been reloaded.
 258: Sent packet 0x%x (%d)
 259: Invalid packet
 260: This item cannot be traded.
@@ -280,7 +280,7 @@
 264: This item cannot be stored.
 265: %s has bought your item(s).
 266: Some of your items cannot be vended and were removed from the shop.
-267: '%s' designated maps reseted!
+267: '%s' designated maps reset.
 268: Reloaded the Message of the Day.
 269: Displaying first %d out of %d matches
 //@me output format
@@ -290,7 +290,7 @@
 273: Commands available:
 274: %d commands found.
 275: No commands found.
-276: You can't open shop on this map
+276: You can't open a shop on this map
 277: Usage: @request <petition/message to online GMs>.
 278: (@request): %s
 279: @request sent.
@@ -298,15 +298,15 @@
 281: You can't create chat rooms on this map
 //Party-related
 282: You need to be a party leader to use this command.
-283: Target character must be online and be in your party.
+283: Target character must be online and in your current party.
 284: Leadership transferred.
 285: You've become the party leader.
 286: There's been no change in the setting.
 //Missing stuff for @killer related commands.
-287: Killer state reset
-288: You are no longer killable
-289: The player is now killable
-290: The player is no longer killable
+287: Killer state reset.
+288: You are no longer killable.
+289: The player is now killable.
+290: The player is no longer killable.
 291: Weather effects will dispell on warp/refresh
 // Guild Castles Number
 // --------------------
@@ -435,25 +435,9 @@
 508: This player hasn't been banned (Ban option is disabled).
 //509 Available....
 
-//mail system
+// mail system
 //----------------------
-510: You have no messages.
-511: %d - From : %s (New - Priority)
-512: %d - From : %s (New)
-513: %d - From : %s
-514: You have %d unread messages.
-515: You have %d unread priority messages.
-516: You have no unread messages.
-517: Message not found.
-518: Reading message from %s.
-519: Cannot delete unread priority mail.
-520: You have received new mail, use @listmail before deleting.
-521: Message deleted.
-522: You must wait 10 minutes before sending another message.
-523: Access Denied.
-524: Character does not exist.
-525: Mail has been sent.
-526: You have new mail.
+510: You have %d new emails (%d unread)
 
 // Bot detect messages (currently unused)
 535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 26d53acbe..f29c13b39 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1076,7 +1076,7 @@ int atcommand_save(const int fd, struct map_session_data* sd, const char* comman
 
 	chrif_save(sd,0);
 	
-	clif_displaymessage(fd, msg_txt(6)); // Character data respawn point saved.
+	clif_displaymessage(fd, msg_txt(6)); // Your save point has been changed.
 
 	return 0;
 }
@@ -1101,7 +1101,7 @@ int atcommand_load(const int fd, struct map_session_data* sd, const char* comman
 	}
 
 	pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 0);
-	clif_displaymessage(fd, msg_txt(7)); // Warping to respawn point.
+	clif_displaymessage(fd, msg_txt(7)); // Warping to save point..
 
 	return 0;
 }
@@ -1360,7 +1360,7 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c
 		if (pc_jobchange(sd, job, upper) == 0)
 			clif_displaymessage(fd, msg_txt(12)); // Your job has been changed.
 		else {
-			clif_displaymessage(fd, msg_txt(155)); // Impossible to change your job.
+			clif_displaymessage(fd, msg_txt(155)); // You are unable to change your job.
 			return -1;
 		}
 	} else {
@@ -1506,7 +1506,7 @@ int atcommand_heal(const int fd, struct map_session_data* sd, const char* comman
 
 	if (hp == 0 && sp == 0) {
 		if (!status_percent_heal(&sd->bl, 100, 100))
-			clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value.
+			clif_displaymessage(fd, msg_txt(157)); // HP and SP have already been recovered.
 		else
 			clif_displaymessage(fd, msg_txt(17)); // HP, SP recovered.
 		return 0;
@@ -2197,8 +2197,8 @@ int atcommand_go(const int fd, struct map_session_data* sd, const char* command,
  
 	// if no value, display all value
 	if (!message || !*message || sscanf(message, "%11s", map_name) < 1 || town < 0 || town >= ARRAYLENGTH(data)) {
-		clif_displaymessage(fd, msg_txt(38)); // Invalid location number or name.
-		clif_displaymessage(fd, msg_txt(82)); // Please, use one of this number/name:
+		clif_displaymessage(fd, msg_txt(38)); // Invalid location number, or name.
+		clif_displaymessage(fd, msg_txt(82)); // Please provide a name or number from the list provided:
 		clif_displaymessage(fd, " 0=Prontera         1=Morroc       2=Geffen");
 		clif_displaymessage(fd, " 3=Payon            4=Alberta      5=Izlude");
 		clif_displaymessage(fd, " 6=Al De Baran      7=Lutie        8=Comodo");
@@ -2327,7 +2327,7 @@ int atcommand_monster(const int fd, struct map_session_data* sd, const char* com
 	memset(atcmd_output, '\0', sizeof(atcmd_output));
 
 	if (!message || !*message) {
-			clif_displaymessage(fd, msg_txt(80)); // Give a display name and monster name/id please.
+			clif_displaymessage(fd, msg_txt(80)); // Give the display name or monster name/id please.
 			return -1;
 	}
 	if (sscanf(message, "\"%23[^\"]\" %23s %d", name, monster, &number) > 1 ||
@@ -2356,7 +2356,7 @@ int atcommand_monster(const int fd, struct map_session_data* sd, const char* com
 	}
 
 	if (mob_id == MOBID_EMPERIUM) {
-		clif_displaymessage(fd, msg_txt(83)); // Cannot spawn emperium.
+		clif_displaymessage(fd, msg_txt(83)); // Monster 'Emperium' cannot be spawned.
 		return -1;
 	}
 
@@ -2676,11 +2676,11 @@ int atcommand_refine(const int fd, struct map_session_data* sd, const char* comm
 	}
 
 	if (count == 0)
-		clif_displaymessage(fd, msg_txt(166)); // No item has been refined!
+		clif_displaymessage(fd, msg_txt(166)); // No item has been refined.
 	else if (count == 1)
-		clif_displaymessage(fd, msg_txt(167)); // 1 item has been refined!
+		clif_displaymessage(fd, msg_txt(167)); // 1 item has been refined.
 	else {
-		sprintf(atcmd_output, msg_txt(168), count); // %d items have been refined!
+		sprintf(atcmd_output, msg_txt(168), count); // %d items have been refined.
 		clif_displaymessage(fd, atcmd_output);
 	}
 
@@ -2714,7 +2714,7 @@ int atcommand_produce(const int fd, struct map_session_data* sd, const char* com
 	if ((item_data = itemdb_searchname(item_name)) == NULL &&
 	    (item_data = itemdb_exists(atoi(item_name))) == NULL)
 	{
-		sprintf(atcmd_output, msg_txt(170)); // This item is not an equipment.
+		sprintf(atcmd_output, msg_txt(170)); // The item is not equipable.
 		clif_displaymessage(fd, atcmd_output);
 		return -1;
 	}
@@ -2743,7 +2743,7 @@ int atcommand_produce(const int fd, struct map_session_data* sd, const char* com
 		if ((flag = pc_additem(sd, &tmp_item, 1)))
 			clif_additem(sd, 0, 0, flag);
 	} else {
-		sprintf(atcmd_output, msg_txt(169), item_id, item_data->name); // This item (%d: '%s') is not an equipment.
+		sprintf(atcmd_output, msg_txt(169), item_id, item_data->name); // The item (%d: '%s') is not equipable.
 		clif_displaymessage(fd, atcmd_output);
 		return -1;
 	}
@@ -2853,12 +2853,12 @@ int atcommand_statuspoint(const int fd, struct map_session_data* sd, const char*
 	if (new_status_point != (int)sd->status.status_point) {
 		sd->status.status_point = (unsigned short)new_status_point;
 		clif_updatestatus(sd, SP_STATUSPOINT);
-		clif_displaymessage(fd, msg_txt(174)); // Number of status points changed!
+		clif_displaymessage(fd, msg_txt(174)); // Number of status points changed.
 	} else {
 		if (point < 0)
-			clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+			clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 		else
-			clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+			clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 		return -1;
 	}
 
@@ -2888,12 +2888,12 @@ int atcommand_skillpoint(const int fd, struct map_session_data* sd, const char*
 	if (new_skill_point != (int)sd->status.skill_point) {
 		sd->status.skill_point = (unsigned short)new_skill_point;
 		clif_updatestatus(sd, SP_SKILLPOINT);
-		clif_displaymessage(fd, msg_txt(175)); // Number of skill points changed!
+		clif_displaymessage(fd, msg_txt(175)); // Number of skill points changed.
 	} else {
 		if (point < 0)
-			clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+			clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 		else
-			clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+			clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 		return -1;
 	}
 
@@ -2922,12 +2922,12 @@ int atcommand_zeny(const int fd, struct map_session_data* sd, const char* comman
 	if (new_zeny != sd->status.zeny) {
 		sd->status.zeny = new_zeny;
 		clif_updatestatus(sd, SP_ZENY);
-		clif_displaymessage(fd, msg_txt(176)); // Number of zenys changed!
+		clif_displaymessage(fd, msg_txt(176)); // Current amount of zeny changed.
 	} else {
 		if (zeny < 0)
-			clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+			clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 		else
-			clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+			clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 		return -1;
 	}
 
@@ -2981,9 +2981,9 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma
 		clif_displaymessage(fd, msg_txt(42)); // Stat changed.
 	} else {
 		if (value < 0)
-			clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+			clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 		else
-			clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+			clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 		return -1;
 	}
 
@@ -3037,9 +3037,9 @@ int atcommand_stat_all(const int fd, struct map_session_data* sd, const char* co
 		clif_displaymessage(fd, msg_txt(84)); // All stats changed!
 	} else {
 		if (value < 0)
-			clif_displaymessage(fd, msg_txt(177)); // Impossible to decrease a stat.
+			clif_displaymessage(fd, msg_txt(177)); // You cannot decrease that stat anymore.
 		else
-			clif_displaymessage(fd, msg_txt(178)); // Impossible to increase a stat.
+			clif_displaymessage(fd, msg_txt(178)); // You cannot increase that stat anymore.
 		return -1;
 	}
 
@@ -3170,12 +3170,12 @@ int atcommand_petfriendly(const int fd, struct map_session_data* sd, const char*
 	}
 	
 	if (friendly == pd->pet.intimate) {
-		clif_displaymessage(fd, msg_txt(183)); // Pet friendly is already the good value.
+		clif_displaymessage(fd, msg_txt(183)); // Pet intimacy is already at maximum.
 		return -1;
 	}
 	pd->pet.intimate = friendly;
 	clif_send_petstatus(sd);
-	clif_displaymessage(fd, msg_txt(182)); // Pet friendly value changed!
+	clif_displaymessage(fd, msg_txt(182)); // Pet intimacy changed.
 	return 0;
 }
 
@@ -3203,13 +3203,13 @@ int atcommand_pethungry(const int fd, struct map_session_data* sd, const char* c
 		return -1;
 	}
 	if (hungry == pd->pet.hungry) {
-		clif_displaymessage(fd, msg_txt(186)); // Pet hungry is already the good value.
+		clif_displaymessage(fd, msg_txt(186)); // Pet hunger is already at maximum.
 		return -1;
 	}
 
 	pd->pet.hungry = hungry;
 	clif_send_petstatus(sd);
-	clif_displaymessage(fd, msg_txt(185)); // Pet hungry value changed!
+	clif_displaymessage(fd, msg_txt(185)); // Pet hunger changed.
 
 	return 0;
 }
@@ -3267,7 +3267,7 @@ int atcommand_recall(const int fd, struct map_session_data* sd, const char* comm
 
 	if ( pc_isGM(sd) < pc_isGM(pl_sd) )
 	{
-		clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif_displaymessage(fd, msg_txt(81)); // Your GM level doesn't authorize you to preform this action on the specified player.
 		return -1;
 	}
 	
@@ -3435,7 +3435,7 @@ int atcommand_night(const int fd, struct map_session_data* sd, const char* comma
 	if (night_flag != 1) {
 		map_night_timer(night_timer_tid, 0, 0, 1);
 	} else {
-		clif_displaymessage(fd, msg_txt(89)); // Sorry, it's already the night. Impossible to execute the command.
+		clif_displaymessage(fd, msg_txt(89)); // Night mode is already enabled.
 		return -1;
 	}
 
@@ -3452,7 +3452,7 @@ int atcommand_day(const int fd, struct map_session_data* sd, const char* command
 	if (night_flag != 0) {
 		map_day_timer(day_timer_tid, 0, 0, 1);
 	} else {
-		clif_displaymessage(fd, msg_txt(90)); // Sorry, it's already the day. Impossible to execute the command.
+		clif_displaymessage(fd, msg_txt(90)); // Day mode is already enabled.
 		return -1;
 	}
 
@@ -3633,7 +3633,7 @@ int atcommand_allskill(const int fd, struct map_session_data* sd, const char* co
 	pc_allskillup(sd); // all skills
 	sd->status.skill_point = 0; // 0 skill points
 	clif_updatestatus(sd, SP_SKILLPOINT); // update
-	clif_displaymessage(fd, msg_txt(76)); // You have received all skills.
+	clif_displaymessage(fd, msg_txt(76)); // All skills have been added to your skill tree.
 
 	return 0;
 }
@@ -3791,13 +3791,13 @@ int atcommand_agitstart(const int fd, struct map_session_data* sd, const char* c
 {
 	nullpo_retr(-1, sd);
 	if (agit_flag == 1) {
-		clif_displaymessage(fd, msg_txt(73)); // Already it has started siege warfare.
+		clif_displaymessage(fd, msg_txt(73)); // War of Emperium is currently in progress.
 		return -1;
 	}
 
 	agit_flag = 1;
 	guild_agit_start();
-	clif_displaymessage(fd, msg_txt(72)); // Guild siege warfare start!
+	clif_displaymessage(fd, msg_txt(72)); // War of Emperium has been initiated.
 
 	return 0;
 }
@@ -3827,13 +3827,13 @@ int atcommand_agitend(const int fd, struct map_session_data* sd, const char* com
 {
 	nullpo_retr(-1, sd);
 	if (agit_flag == 0) {
-		clif_displaymessage(fd, msg_txt(75)); // Siege warfare hasn't started yet.
+		clif_displaymessage(fd, msg_txt(75)); // War of Emperium is currently not in progress.
 		return -1;
 	}
 
 	agit_flag = 0;
 	guild_agit_end();
-	clif_displaymessage(fd, msg_txt(74)); // Guild siege warfare end!
+	clif_displaymessage(fd, msg_txt(74)); // War of Emperium has been ended.
 
 	return 0;
 }
@@ -4011,7 +4011,7 @@ int atcommand_guildrecall(const int fd, struct map_session_data* sd, const char*
 	}
 	mapit_free(iter);
 
-	sprintf(atcmd_output, msg_txt(93), g->name); // All online characters of the %s guild are near you.
+	sprintf(atcmd_output, msg_txt(93), g->name); // All online characters of the %s guild have been recalled to your position.
 	clif_displaymessage(fd, atcmd_output);
 	if (count) {
 		sprintf(atcmd_output, "Because you are not authorised to warp from some maps, %d player(s) have not been recalled.", count);
@@ -4070,7 +4070,7 @@ int atcommand_partyrecall(const int fd, struct map_session_data* sd, const char*
 	}
 	mapit_free(iter);
 
-	sprintf(atcmd_output, msg_txt(95), p->party.name); // All online characters of the %s party are near you.
+	sprintf(atcmd_output, msg_txt(95), p->party.name); // All online characters of the %s party have been recalled to your position.
 	clif_displaymessage(fd, atcmd_output);
 	if (count) {
 		sprintf(atcmd_output, "Because you are not authorised to warp from some maps, %d player(s) have not been recalled.", count);
@@ -4087,7 +4087,7 @@ int atcommand_reloaditemdb(const int fd, struct map_session_data* sd, const char
 {
 	nullpo_retr(-1, sd);
 	itemdb_reload();
-	clif_displaymessage(fd, msg_txt(97)); // Item database reloaded.
+	clif_displaymessage(fd, msg_txt(97)); // Item database has been reloaded.
 
 	return 0;
 }
@@ -4101,7 +4101,7 @@ int atcommand_reloadmobdb(const int fd, struct map_session_data* sd, const char*
 	mob_reload();
 	read_petdb();
 	merc_reload();
-	clif_displaymessage(fd, msg_txt(98)); // Monster database reloaded.
+	clif_displaymessage(fd, msg_txt(98)); // Monster database has been reloaded.
 
 	return 0;
 }
@@ -4114,7 +4114,7 @@ int atcommand_reloadskilldb(const int fd, struct map_session_data* sd, const cha
 	nullpo_retr(-1, sd);
 	skill_reload();
 	merc_skill_reload();
-	clif_displaymessage(fd, msg_txt(99)); // Skill database reloaded.
+	clif_displaymessage(fd, msg_txt(99)); // Skill database has been reloaded.
 
 	return 0;
 }
@@ -4219,7 +4219,7 @@ int atcommand_reloadscript(const int fd, struct map_session_data* sd, const char
 	script_reload();
 	npc_reload();
 
-	clif_displaymessage(fd, msg_txt(100)); // Scripts reloaded.
+	clif_displaymessage(fd, msg_txt(100)); // Scripts have been reloaded.
 
 	return 0;
 }
@@ -4471,21 +4471,21 @@ int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char*
 	if (!pc_isriding(sd)) { // if actually no peco
 		if (!pc_checkskill(sd, KN_RIDING))
 		{
-			clif_displaymessage(fd, msg_txt(213)); // You can not mount a peco with your job.
+			clif_displaymessage(fd, msg_txt(213)); // You can not mount a Peco Peco with your current job.
 			return -1;
 		}
 
 		if (sd->disguise)
 		{
-			clif_displaymessage(fd, msg_txt(212)); // Cannot mount a Peco while in disguise.
+			clif_displaymessage(fd, msg_txt(212)); // Cannot mount a Peco Peco while in disguise.
 			return -1;
 		}
 
 		pc_setoption(sd, sd->sc.option | OPTION_RIDING);
-		clif_displaymessage(fd, msg_txt(102)); // Mounted Peco.
+		clif_displaymessage(fd, msg_txt(102)); // You have mounted a Peco Peco.
 	} else {	//Dismount
 		pc_setoption(sd, sd->sc.option & ~OPTION_RIDING);
-		clif_displaymessage(fd, msg_txt(214)); // Unmounted Peco.
+		clif_displaymessage(fd, msg_txt(214)); // You have released your Peco Peco.
 	}
 
 	return 0;
@@ -4525,7 +4525,7 @@ int atcommand_guildspy(const int fd, struct map_session_data* sd, const char* co
 			clif_displaymessage(fd, atcmd_output);
 		}
 	} else {
-		clif_displaymessage(fd, msg_txt(94)); // Incorrect name/ID, or no one from the guild is online.
+		clif_displaymessage(fd, msg_txt(94)); // Incorrect name/ID, or no one from the specified guild is online.
 		return -1;
 	}
 
@@ -4567,7 +4567,7 @@ int atcommand_partyspy(const int fd, struct map_session_data* sd, const char* co
 			clif_displaymessage(fd, atcmd_output);
 		}
 	} else {
-		clif_displaymessage(fd, msg_txt(96)); // Incorrect name or ID, or no one from the party is online.
+		clif_displaymessage(fd, msg_txt(96)); // Incorrect name/ID, or no one from the specified party is online.
 		return -1;
 	}
 
@@ -4995,7 +4995,7 @@ int atcommand_unjail(const int fd, struct map_session_data* sd, const char* comm
 
 	//Reset jail time to 1 sec.
 	sc_start(&pl_sd->bl,SC_JAILED,100,1,1000);
-	clif_displaymessage(pl_sd->fd, msg_txt(120)); // GM has discharge you.
+	clif_displaymessage(pl_sd->fd, msg_txt(120)); // A GM has discharged you from jail.
 	clif_displaymessage(fd, msg_txt(121)); // Player unjailed.
 	return 0;
 }
@@ -5168,7 +5168,7 @@ int atcommand_disguise(const int fd, struct map_session_data* sd, const char* co
 
 	if (id == 0)
 	{
-		clif_displaymessage(fd, msg_txt(123));	// Monster/NPC name/id hasn't been found.
+		clif_displaymessage(fd, msg_txt(123));	// Invalid Monster/NPC name/ID specified.
 		return -1;
 	}
 
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 411188b9e..eb571277e 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -106,7 +106,7 @@ int charcommand_jobchange(const int fd, struct map_session_data* sd, const char*
 	}
 
 	if (pc_jobchange(pl_sd, job, upper) != 0) {
-		clif_displaymessage(fd, msg_txt(192)); // Impossible to change the character's job.
+		clif_displaymessage(fd, msg_txt(192)); // Unable to change the specified character's job.
 		return -1;
 	}
 
@@ -312,7 +312,7 @@ int charcommand_reset(const int fd, struct map_session_data* sd, const char* com
 
 	pc_resetstate(pl_sd);
 	pc_resetskill(pl_sd,1);
-	sprintf(output, msg_txt(208), character); // '%s' skill and stats points reseted!
+	sprintf(output, msg_txt(208), character); // '%s' skill and stat points have been reset.
 	clif_displaymessage(fd, output);
 
 	return 0;
@@ -403,7 +403,7 @@ int charcommand_save(const int fd, struct map_session_data* sd, const char* comm
 		pc_setsavepoint(pl_sd, map[m].index, x, y);
 	else
 		pc_setsavepoint(pl_sd, mapindex_name2id(map_name), x, y);
-	clif_displaymessage(fd, msg_txt(57)); // Character's respawn point changed.
+	clif_displaymessage(fd, msg_txt(57)); // Character's save point changed.	
 
 	return 0;
 }
@@ -441,7 +441,7 @@ int charcommand_spiritball(const int fd, struct map_session_data* sd,const char*
 		if (spirit > 1000)
 			clif_displaymessage(fd, msg_txt(204)); // WARNING: more than 1000 spiritballs can CRASH your server and/or client!
 	} else {
-		clif_displaymessage(fd, msg_txt(205)); // You already have this number of spiritballs.
+		clif_displaymessage(fd, msg_txt(205)); // You already have that number of spiritballs.
 		return -1;
 	}
 
@@ -887,12 +887,12 @@ int charcommand_zeny(const int fd, struct map_session_data* sd, const char* comm
 		if (new_zeny != pl_sd->status.zeny) {
 			pl_sd->status.zeny = new_zeny;
 			clif_updatestatus(pl_sd, SP_ZENY);
-			clif_displaymessage(fd, msg_txt(211)); // Character's number of zenys changed!
+			clif_displaymessage(fd, msg_txt(211)); // Character's current zeny changed.
 		} else {
 			if (zeny < 0)
-				clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+				clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 			else
-				clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+				clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 			return -1;
 		}
 	} else {
@@ -1242,7 +1242,7 @@ int charcommand_skreset(const int fd, struct map_session_data* sd, const char* c
 	if ((pl_sd = map_nick2sd(player)) != NULL) {
 		if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can reset skill points only lower or same gm level
 			pc_resetskill(pl_sd,1);
-			sprintf(tmp_cmdoutput, msg_txt(206), player); // '%s' skill points reseted!
+			sprintf(tmp_cmdoutput, msg_txt(206), player); // '%s' skill points reset.
 			clif_displaymessage(fd, tmp_cmdoutput);
 		} else {
 			clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
@@ -1274,7 +1274,7 @@ int charcommand_streset(const int fd, struct map_session_data* sd, const char* c
 	if ((pl_sd = map_nick2sd(player)) != NULL) {
 		if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can reset stats points only lower or same gm level
 			pc_resetstate(pl_sd);
-			sprintf(tmp_cmdoutput, msg_txt(207), player); // '%s' stats points reseted!
+			sprintf(tmp_cmdoutput, msg_txt(207), player); // '%s' stats points reset.
 			clif_displaymessage(fd, tmp_cmdoutput);
 		} else {
 			clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
@@ -1352,12 +1352,12 @@ int charcommand_skpoint(const int fd, struct map_session_data* sd, const char* c
 		if (new_skill_point != (int)pl_sd->status.skill_point) {
 			pl_sd->status.skill_point = new_skill_point;
 			clif_updatestatus(pl_sd, SP_SKILLPOINT);
-			clif_displaymessage(fd, msg_txt(209)); // Character's number of skill points changed!
+			clif_displaymessage(fd, msg_txt(209)); // Character's skill points changed.
 		} else {
 			if (point < 0)
-				clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+				clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 			else
-				clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+				clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 			return -1;
 		}
 	} else {
@@ -1394,12 +1394,12 @@ int charcommand_stpoint(const int fd, struct map_session_data* sd, const char* c
 		if (new_status_point != (int)pl_sd->status.status_point) {
 			pl_sd->status.status_point = new_status_point;
 			clif_updatestatus(pl_sd, SP_STATUSPOINT);
-			clif_displaymessage(fd, msg_txt(210)); // Character's number of status points changed!
+			clif_displaymessage(fd, msg_txt(210)); // Character's status points changed.
 		} else {
 			if (point < 0)
-				clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+				clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 			else
-				clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+				clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 			return -1;
 		}
 	} else {
@@ -1458,7 +1458,7 @@ int charcommand_feelreset(const int fd, struct map_session_data* sd, const char*
 	if ((pl_sd = map_nick2sd(character)) != NULL) {
 		if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can reset a character only for lower or same GM level
 			pc_resetfeel(pl_sd);
-			sprintf(output, msg_txt(267), character); // '%s' designated maps reseted!
+			sprintf(output, msg_txt(267), character); // '%s' designated maps reset.
 			clif_displaymessage(fd, output);
 		} else {
 			clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
@@ -2244,9 +2244,9 @@ int charcommand_param(const int fd, struct map_session_data* sd, const char* com
 			clif_displaymessage(fd, msg_txt(42)); // Stat changed.
 	} else {
 		if (value < 0)
-			clif_displaymessage(fd, msg_txt(41)); // Impossible to decrease the number/value.
+			clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
 		else
-			clif_displaymessage(fd, msg_txt(149)); // Impossible to increase the number/value.
+			clif_displaymessage(fd, msg_txt(149)); // Unable to increase the number/value.
 		return -1;
 	}
 
@@ -2669,25 +2669,25 @@ int charcommand_mount_peco(const int fd, struct map_session_data* sd, const char
 	{ // if actually no peco
 		if (!pc_checkskill(pl_sd, KN_RIDING))
 		{
-			clif_displaymessage(fd, msg_txt(217));	// Player cannot mount a PecoePeco with his/her job.
+			clif_displaymessage(fd, msg_txt(217));	// This player cannot mount a Peco Peco with his/her current job.
 			return -1;
 		}
 
 		if (pl_sd->disguise)
 		{
-			clif_displaymessage(fd, msg_txt(215)); // Player cannot mount a PecoPeco while in disguise.
+			clif_displaymessage(fd, msg_txt(215)); // This player cannot mount a Peco Peco while in disguise.
 			return -1;
 		}
 
 		pc_setoption(pl_sd, pl_sd->sc.option | OPTION_RIDING);
 		if (pl_sd->fd != fd)
 			clif_displaymessage(fd, "Player mounted a peco.");
-		clif_displaymessage(pl_sd->fd, msg_txt(216));	// Mounted Peco.
+		clif_displaymessage(pl_sd->fd, msg_txt(216));	// This player has mounted a Peco Peco.
 	}
 	else
 	{	//Dismount
 		pc_setoption(pl_sd, pl_sd->sc.option & ~OPTION_RIDING);
-		clif_displaymessage(pl_sd->fd, msg_txt(218)); // Unmounted Peco.
+		clif_displaymessage(pl_sd->fd, msg_txt(218)); // This player's Peco Peco has been released.
 		if (pl_sd->fd != fd)
 			clif_displaymessage(fd, "Player unmounted a peco.");
 	}
@@ -2760,7 +2760,7 @@ int charcommand_delitem(const int fd, struct map_session_data* sd, const char* c
 				sprintf(output, msg_txt(115), count, count, number); // %d item(s) removed. Player had only %d on %d items.
 			clif_displaymessage(fd, output);
 		} else {
-			clif_displaymessage(fd, msg_txt(116)); // Character does not have the item.
+			clif_displaymessage(fd, msg_txt(116)); // Character does not have the specified item.
 			return -1;
 		}
 	}
diff --git a/src/map/clif.c b/src/map/clif.c
index 20808ad3a..53398a376 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10099,7 +10099,7 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd)
 	if( sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOROOM )
 		return;
 	if( map[sd->bl.m].flag.novending || map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNOVENDING) ) {
-		clif_displaymessage (sd->fd, msg_txt(276)); // "You can't open shop on this map"
+		clif_displaymessage (sd->fd, msg_txt(276)); // "You can't open a shop on this map"
 		return;
 	}
 	if( message[0] == '\0' ) // invalid input
diff --git a/src/map/intif.c b/src/map/intif.c
index 3fccef4e9..6ad29368e 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1444,13 +1444,13 @@ int intif_parse_Mail_inboxreceived(int fd)
 	else
 	{
 		char output[128];
-		sprintf(output, "You have %d new emails (%d unread)", sd->mail.inbox.unchecked, sd->mail.inbox.unread + sd->mail.inbox.unchecked);
+		sprintf(output, msg_txt(510), sd->mail.inbox.unchecked, sd->mail.inbox.unread + sd->mail.inbox.unchecked);
 		clif_disp_onlyself(sd, output, strlen(output));
 	}
 	return 0;
 }
 /*------------------------------------------
- * Mail Readed
+ * Mail Read
  *------------------------------------------*/
 int intif_Mail_read(int mail_id)
 {