Merge branch 'master' into zCatch-Exp

Conflicts:
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp
	src/game/server/player.h

1 files changed, 0 insertions, 91 deletions

diff --git a/scripts/update_localization.py b/scripts/update_localization.py
deleted file mode 100644
index 08c1866e..00000000
--- a/scripts/update_localization.py
+++ /dev/null
@@ -1,91 +0,0 @@
-import os, re, sys
-match = re.search('(.*)/', sys.argv[0])
-if match != None:
-	os.chdir(match.group(1))
-os.chdir('../')
-
-source_exts = [".c", ".cpp", ".h"]
-
-def parse_source():
-	stringtable = {}
-	def process_line(line):
-		if 'Localize("'.encode() in line:
-			fields = line.split('Localize("'.encode(), 1)[1].split('"'.encode(), 1)
-			stringtable[fields[0]] = ""
-			process_line(fields[1])
-
-	for root, dirs, files in os.walk("src"):
-		for name in files:
-			filename = os.path.join(root, name)
-			
-			if os.sep + "external" + os.sep in filename:
-				continue
-			
-			if filename[-2:] in source_exts or filename[-4:] in source_exts:
-				for line in open(filename, "rb"):
-					process_line(line)
-
-	return stringtable
-
-def load_languagefile(filename):
-	f = open(filename, "rb")
-	lines = f.readlines()
-	f.close()
-
-	stringtable = {}
-
-	for i in range(0, len(lines)-1):
-		l = lines[i].strip()
-		if len(l) and not l[0:1] == "=".encode() and not l[0:1] == "#".encode():
-			stringtable[l] = lines[i+1][3:].rstrip()
-
-	return stringtable
-
-def generate_languagefile(outputfilename, srctable, loctable):
-	f = open(outputfilename, "wb")
-
-	num_items = 0
-	new_items = 0
-	old_items = 0
-
-	srctable_keys = []
-	for key in srctable:
-		srctable_keys.append(key)
-	srctable_keys.sort()
-
-	content = "\n##### translated strings #####\n\n".encode()
-	for k in srctable_keys:
-		if k in loctable and len(loctable[k]):
-			content += k + "\n== ".encode() + loctable[k] + "\n\n".encode()
-			num_items += 1
-
-	content += "##### needs translation #####\n\n".encode()
-	for k in srctable_keys:
-		if not k in loctable or len(loctable[k]) == 0:
-			content += k + "\n== \n\n".encode()
-			num_items += 1
-			new_items += 1
-
-	content += "##### old translations #####\n\n".encode()
-	for k in loctable:
-		if not k in srctable:
-			content += k + "\n== ".encode() + loctable[k] + "\n\n".encode()
-			num_items += 1
-			old_items += 1
-
-	f.write(content)
-	f.close()
-	print("%-40s %8d %8d %8d" % (outputfilename, num_items, new_items, old_items))
-
-srctable = parse_source()
-
-print("%-40s %8s %8s %8s" % ("filename", "total", "new", "old"))
-
-for filename in os.listdir("data/languages"):
-	if not ".txt" in filename:
-		continue
-	if filename == "index.txt":
-		continue
-
-	filename = "data/languages/" + filename
-	generate_languagefile(filename, srctable, load_languagefile(filename))