- Added define MAX_CHARS so you can easily mod the server to support a different amount of characters per account (however, there is still the issue of hexing the client to support this change)

- Updated msg_athena.conf so it no longer uses broken english on several entries. Thanks to Scerez for the updated file.


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

1 files changed, 45 insertions, 45 deletions

diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index a5bb16694..4f20f9002 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -23,7 +23,7 @@
 3: Character not found.
 4: Jump to %s
 5: Jump to %d %d
-6: Character data respawn point saved.
+6: Character respawn point saved.
 7: Warping to respawn point.
 8: Speed changed.
 9: Options changed.
@@ -32,7 +32,7 @@
 12: Your job has been changed.
 13: You've died.
 14: Character killed.
-15: Player warped (message sends to player too).
+15: Player warped (message sent to player too).
 16: You've been revived!
 17: HP, SP recovered.
 18: Item created.
@@ -53,10 +53,10 @@
 33: GvG: Off.
 34: GvG: On.
 35: You can't use this command with this class.
-36: Appearence changed.
+36: Appearance changed.
 37: An invalid number was specified.
 38: Invalid location number or name.
-39: All monster summoned!
+39: All monsters summoned!
 40: Invalid monster ID or name.
 41: Impossible to decrease the number/value.
 42: Stat changed.
@@ -79,7 +79,7 @@
 59: Night Mode Activated.
 60: Day Mode Activated.
 61: The holy messenger has given judgement.
-62: Judgement was made.
+62: Judgement has passed.
 63: Mercy has been shown.
 64: Mercy has been granted.
 65: Character's base level raised.
@@ -90,7 +90,7 @@
 70: You have learned the skill.
 71: You have forgotten the skill.
 72: Guild siege warfare start!
-73: Already it has started siege warfare.
+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.
@@ -98,14 +98,14 @@
 78: %s: %d
 79: It is %d affair above.
 80: Give a display name and monster name/id please.
-81: Your GM level don't authorize you to do this action on this player.
+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.
 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 have 23 characters maximum.
-88: Character name sends to char-server to ask it.
+87: Sorry, but a player name has 23 characters maximum.
+88: Character name sent to char-server to ask it.
 89: Sorry, it's already the night. Impossible to execute the command.
 90: Sorry, it's already the day. Impossible to execute the command.
 91: Character's base level can't go any higher.
@@ -127,26 +127,26 @@
 107: All items have been repaired.
 108: No item need to be repaired.
 109: Player has been nuked!
-110: Npc Enabled.
+110: NPC Enabled.
 111: This NPC doesn't exist.
-112: Npc Disabled.
+112: NPC Disabled.
 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 jailed you.
-118: Player jailed.
-119: This player is not jailed.
-120: GM has discharge you.
+117: GM has sent you to jail.
+118: Player warped to jail.
+119: This player is not in jail.
+120: A GM has discharged you.
 121: Player unjailed.
 122: Disguise applied.
-123: Monster/NPC name/id hasn't been found.
+123: Monster/NPC name/ID hasn't been found.
 124: Undisguise applied.
 125: You're not disguised.
 //Clone Messages
 126: Cannot clone a player of higher GM level than yourself.
 127: You've reached your slave clones limit.
-128: Evil Clone spawned.
+128: Evil clone spawned.
 129: Unable to spawn evil clone.
 130: Clone spawned.
 131: Unable to spawn clone.
@@ -157,11 +157,11 @@
 141: Character's undisguise applied.
 142: Character is not disguised.
 143: Commands are disabled on this map.
-144: Invalid actual E-mail. If you have default E-mail, type a@a.com.
-145: Invalid new E-mail. Please enter a real E-mail.
-146: New E-mail must be a real E-mail.
-147: New E-mail must be different of the actual E-mail.
-148: Information sended to login-server via char-server.
+144: Invalid e-mail. If you have default e-mail, type a@a.com.
+145: Invalid new e-mail. Please enter a real e-mail.
+146: New e-mail must be a real e-mail.
+147: New e-mail must be different from the current e-mail.
+148: Information sent to login-server via char-server.
 149: Impossible to increase the number/value.
 150: No GM found.
 151: 1 GM found.
@@ -193,13 +193,13 @@
 177: Impossible to decrease a stat.
 178: Impossible to increase a stat.
 179: Guild level changed.
-180: The monter/egg name/id doesn't exist.
+180: The monter/egg name/ID doesn't exist.
 181: You already have a pet.
 182: Pet friendly value changed!
-183: Pet friendly is already the good value.
+183: Pet friendly is already in the good value.
 184: Sorry, but you have no pet.
 185: Pet hungry value changed!
-186: Pet hungry is already the good value.
+186: Pet hungry is already in the good value.
 187: You can now rename your pet.
 188: You can already rename your pet.
 189: This player can now rename his/her pet.
@@ -229,9 +229,9 @@
 213: You can not mount a peco with your job.
 214: Unmounted Peco.
 215: This player cannot mount a Peco while in disguise.
-216: Now, this player mounts a peco.
-217: This player can not mount a peco with his/her job.
-218: Now, this player has not more peco.
+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.
 219: %d day
 220: %d days
 221: %s %d hour
@@ -242,13 +242,13 @@
 226: %s and %d seconds
 227: Party modification is disabled on this map.
 228: Guild modification is disabled on this map.
-229: Your Effect Has Changed.
+229: Your effect has changed.
 230: Server time (normal time): %A, %B %d %Y %X.
 231: Game time: The game is in permanent daylight.
 232: Game time: The game is in permanent night.
-233: Game time: The game is actualy in night for %s.
+233: Game time: The game is in night for %s.
 234: Game time: After, the game will be in permanent daylight.
-235: Game time: The game is actualy in daylight for %s.
+235: Game time: The game is in daylight for %s.
 236: Game time: After, the game will be in permanent night.
 237: Game time: After, the game will be in night for %s.
 238: Game time: A day cycle has a normal duration of %s.
@@ -259,7 +259,7 @@
 243: Map skills are off
 244: Map skills are on
 245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
-246: Your GM level don't authorize you to do this action.
+246: Your GM level doesn't authorize you to do 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,7 +267,7 @@
 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 commands configuration reloaded.
+254: GM command configuration reloaded.
 255: Battle configuration reloaded.
 256: Status database reloaded.
 257: Player database reloaded.
@@ -360,21 +360,21 @@
 338: | Location: %s %d %d
 
 // @duel (part 1)
-350: Duel: You can't use @invite. You aren't a duellist.
-351: Duel: The limit of players is reached.
+350: Duel: You can't use @invite. You aren't a duelist.
+351: Duel: The limit of players has been reached.
 352: Duel: Player name not found.
 353: Duel: The Player is in the duel already.
-354: Duel: Duel invitation has been sent.
+354: Invitation has been sent.
 355: Duel: You can't use @duel without @reject.
 356: Duel: You can take part in duel once per %d minutes.
 357: Duel: Invalid value.
-358: Duel: You can't use @leave. You aren't a duellist.
+358: Duel: You can't use @leave. You aren't a duelist.
 359: Duel: You've left the duel.
 360: Duel: You can't use @accept without a duel invitation.
 361: Duel: The duel invitation has been accepted.
 362: Duel: You can't use @reject without a duel invitation.
 363: Duel: The duel invitation has been rejected.
-364: Duel: You can't invite %s because he isn't on the same map. 
+364: Duel: You can't invite %s because he/she isn't on the same map. 
 // @duel (part 2)
 370:  -- Duels: %d/%d, Members: %d/%d, Max players: %d --
 371:  -- Duels: %d/%d, Members: %d/%d --
@@ -409,15 +409,15 @@
 402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
 
 // Homunculus messages
-450: You already have an homunculus
+450: You already have a homunculus
 
 // Messages of others (not for GM commands)
 // ----------------------------------------
 
 500: Night Mode is already active
 501: Your account time limit is: %d-%m-%Y %H:%M:%S.
-502: Day Mode is Activated
-503: Night Mode is Activated
+502: Day Mode is activated
+503: Night Mode is activated
 
 //Supernovice's Guardian Angel
 //actually.. new client msgtxt file contains these 3 lines... [Lupus]
@@ -454,11 +454,11 @@
 // 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.
 
-536: Character '%s' (account: %d) try to use a bot (it tries to detect a fake player).
-537: Character '%s' (account: %d) try to use a bot (it tries to detect a fake mob).
+536: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake player).
+537: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake mob).
 // Trade Spoof Messages
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
-539: This player has %d of a kind of item (id: %d), and try to trade %d of them.
+539: This player has %d of a kind of item (id: %d), and tried to trade %d of them.
 540: This player has been definitivly blocked.
 // Rare Items Drop/Steal announce
 541: '%s' won %s's %s (chance: %0.02f%%)
@@ -473,7 +473,7 @@
 547: Away automessage has been disabled.
 548: Usage: @away,@aw <message>. Enter empty message for disable it.
 // @Autotrade
-549: You should be vending to use @Autotrade.
+549: You should be vending to use @autotrade.
 
 //550 -> 650: Job Names
 550: Novice