diff --git a/src/pocketmine/lang/BaseLang.php b/src/pocketmine/lang/BaseLang.php
index c04fcbf67..71db6d84b 100644
--- a/src/pocketmine/lang/BaseLang.php
+++ b/src/pocketmine/lang/BaseLang.php
@@ -82,28 +82,7 @@ class BaseLang{
 
 	protected static function loadLang($path, array &$d){
 		if(file_exists($path)){
-			if(strlen($content = file_get_contents($path)) > 0){
-				foreach(explode("\n", $content) as $line){
-					$line = trim($line);
-					if($line === "" or $line{0} === "#"){
-						continue;
-					}
-
-					$t = explode("=", $line, 2);
-					if(count($t) < 2){
-						continue;
-					}
-
-					$key = trim($t[0]);
-					$value = trim($t[1]);
-
-					if($value === ""){
-						continue;
-					}
-
-					$d[$key] = $value;
-				}
-			}
+			$d = parse_ini_file($path, false, INI_SCANNER_RAW);
 			return true;
 		}else{
 			return false;
diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index 24b5e323c..3499fe4a6 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit 24b5e323c440144561111d3843a5a59e8e21f973
+Subproject commit 3499fe4a6a1973cc965396f184eb01c52de79aa4