Merge branch 'master0.6' into zCatch

Conflicts:
	data/languages/index.txt
	src/game/server/entities/character.cpp

1 files changed, 97 insertions, 0 deletions

diff --git a/data/languages/index.txt b/data/languages/index.txt
new file mode 100644
index 00000000..751c6bfa
--- /dev/null
+++ b/data/languages/index.txt
@@ -0,0 +1,97 @@
+##### language indices #####
+
+belarusian
+== Беларуская
+== 112
+
+bosnian
+== Bosanski
+== 70
+
+brazilian_portuguese
+== Português brasileiro
+== 76
+
+bulgarian
+== Български
+== 100
+
+czech
+== Česky
+== 203
+
+danish
+== Dansk
+== 208
+
+dutch
+== Nederlands
+== 528
+
+finnish
+== Suomi
+== 246
+
+french
+== Français
+== 250
+
+german
+== Deutsch
+== 276
+
+hungarian
+== Magyar
+== 348
+
+italian
+== Italiano
+== 380
+
+kyrgyz
+== Кыргызча
+== 417
+
+norwegian
+== Norsk
+== 578
+
+polish
+== Polski
+== 616
+
+portuguese
+== Português
+== 620
+
+romanian
+== Română
+== 642
+
+russian
+== Русский
+== 643
+
+serbian
+== Srpski
+== 688
+
+slovak
+== Slovensky
+== 703
+
+spanish
+== Español
+== 724
+
+swedish
+== Svenska
+== 752
+
+turkish
+== Türkçe
+== 792
+
+ukrainian
+== Українська
+== 804