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

2 files changed, 82 insertions, 96 deletions

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.