summaryrefslogtreecommitdiff
path: root/conf/messages.conf
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-06-28 20:11:19 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-06-28 20:11:19 +0800
commit8489dbf3b58d3bff70b27ea42884a14d5229430a (patch)
tree89e0f9be6b3bc7c3ebc135fc311d9f6d6ebbfeec /conf/messages.conf
parentde7919f0f59f47473e6de709b5d5287a4a55e18d (diff)
parent2154c0fa9cee582a36f9a8d7923a646a6d47adf0 (diff)
downloadhercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.gz
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.bz2
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.xz
hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf/messages.conf')
-rw-r--r--conf/messages.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index d9472952d..21e24e91a 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1505,5 +1505,7 @@
//src/map/pc.c::pc_isUseitem
1474: You cannot use this item while sitting
+1476: You are already mounting something else
+
//Custom translations
import: conf/import/msg_conf.txt