summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 22:57:29 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 22:57:29 +0000
commitabb0bcf66009f081cc3287213bf861cc1577018f (patch)
treef20a0ede00ca5c2009a5e50681aa7b31fd7b57e9
parentd6f695749fb3ef591a39f6f328d37a81b9a763d1 (diff)
downloadhercules-abb0bcf66009f081cc3287213bf861cc1577018f.tar.gz
hercules-abb0bcf66009f081cc3287213bf861cc1577018f.tar.bz2
hercules-abb0bcf66009f081cc3287213bf861cc1577018f.tar.xz
hercules-abb0bcf66009f081cc3287213bf861cc1577018f.zip
Fixed a typo in msg_athena.conf, "This item cannot be drop" -> "This item cannot be dropped"
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7435 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--conf-tmpl/msg_athena.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d8776eca8..6bb673f64 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/30
+ * Fixed a typo in msg_athena.conf, "This item cannot be drop" -> "This item cannot be dropped" [MasterOfMuppets]
* Added a check to prevent equipped items from being traded. [Skotlex]
* Added UF_SONG (0x400) to differentiate songs from dances. [Skotlex]
* Added preliminar support for making a Song+Dance turn into BA_DISSONANCE
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 017442b15..14be0a2fc 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -271,7 +271,7 @@
260: This item cannot be traded.
261: Script could not be loaded.
262: Script loaded.
-263: This item cannot be drop.
+263: This item cannot be dropped.
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.