iTXTech · PeratX · Dec 29, 2015 · Dec 29, 2015 · Dec 29, 2015 · Dec 29, 2015
diff --git a/src/pocketmine/command/defaults/StatusCommand.php b/src/pocketmine/command/defaults/StatusCommand.php
@@ -45,8 +45,8 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
 		$rUsage = Utils::getRealMemoryUsage();
 
 		$server = $sender->getServer();
-		$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----");
-		$sender->sendMessage(TextFormat::GOLD . "Player count: " . TextFormat::GREEN . \count($sender->getServer()->getOnlinePlayers()) . "/" . $sender->getServer()->getMaxPlayers());
+		$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "%pocketmine.command.status.title" . TextFormat::GREEN . " ----");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.player" . TextFormat::GREEN . \count($sender->getServer()->getOnlinePlayers()) . "/" . $sender->getServer()->getMaxPlayers());
 
 		$time = microtime(true) - \pocketmine\START_TIME;
 
@@ -68,12 +68,12 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
 		$uptime = ($minutes !== null ?
 				($hours !== null ?
 					($days !== null ?
-						"$days days "
-						: "") . "$hours hours "
-					: "") . "$minutes minutes "
-				: "") . "$seconds seconds";
+						"$days %pocketmine.command.status.days "
+						: "") . "$hours %pocketmine.command.status.hours "
+					: "") . "$minutes %pocketmine.command.status.minutes "
+				: "") . "$seconds %pocketmine.command.status.seconds";
 
-		$sender->sendMessage(TextFormat::GOLD . "Uptime: " . TextFormat::RED . $uptime);
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.uptime " . TextFormat::RED . $uptime);
 
 		$tpsColor = TextFormat::GREEN;
 		if($server->getTicksPerSecondAverage() < 10){
@@ -89,29 +89,29 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
 			$tpsColour = TextFormat::RED;
 		}
 
-		$sender->sendMessage(TextFormat::GOLD . "Average TPS: " . $tpsColor . $server->getTicksPerSecondAverage() . " (" . $server->getTickUsageAverage() . "%)");
-		$sender->sendMessage(TextFormat::GOLD . "Current TPS: " . $tpsColour . $server->getTicksPerSecond() . " (" . $server->getTickUsage() . "%)");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.AverageTPS " . $tpsColor . $server->getTicksPerSecondAverage() . " (" . $server->getTickUsageAverage() . "%)");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.CurrentTPS " . $tpsColour . $server->getTicksPerSecond() . " (" . $server->getTickUsage() . "%)");
 
-		$sender->sendMessage(TextFormat::GOLD . "Network upload: " . TextFormat::RED . \round($server->getNetwork()->getUpload() / 1024, 2) . " kB/s");
-		$sender->sendMessage(TextFormat::GOLD . "Network download: " . TextFormat::RED . \round($server->getNetwork()->getDownload() / 1024, 2) . " kB/s");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Networkupload " . TextFormat::RED . \round($server->getNetwork()->getUpload() / 1024, 2) . " kB/s");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Networkdownload " . TextFormat::RED . \round($server->getNetwork()->getDownload() / 1024, 2) . " kB/s");
 
-		$sender->sendMessage(TextFormat::GOLD . "Thread count: " . TextFormat::RED . Utils::getThreadCount());
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Threadcount " . TextFormat::RED . Utils::getThreadCount());
 
-		$sender->sendMessage(TextFormat::GOLD . "Main thread memory: " . TextFormat::RED . number_format(round(($mUsage[0] / 1024) / 1024, 2)) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Total memory: " . TextFormat::RED . number_format(round(($mUsage[1] / 1024) / 1024, 2)) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Total virtual memory: " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2)) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Heap memory: " . TextFormat::RED . number_format(round(($rUsage[0] / 1024) / 1024, 2)) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Maximum memory (system): " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2)) . " MB.");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Mainmemory " . TextFormat::RED . number_format(round(($mUsage[0] / 1024) / 1024, 2)) . " MB.");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Totalmemory " . TextFormat::RED . number_format(round(($mUsage[1] / 1024) / 1024, 2)) . " MB.");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Totalvirtualmemory " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2)) . " MB.");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Heapmemory " . TextFormat::RED . number_format(round(($rUsage[0] / 1024) / 1024, 2)) . " MB.");
+		$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Maxmemorysystem " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2)) . " MB.");
 
 		if($server->getProperty("memory.global-limit") > 0){
-			$sender->sendMessage(TextFormat::GOLD . "Maximum memory (manager): " . TextFormat::RED . number_format(round($server->getProperty("memory.global-limit"), 2)) . " MB.");
+			$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.Maxmemorymanager " . TextFormat::RED . number_format(round($server->getProperty("memory.global-limit"), 2)) . " MB.");
 		}
 		foreach($server->getLevels() as $level){
-			$sender->sendMessage(TextFormat::GOLD . "World \"" . $level->getFolderName() . "\"" . ($level->getFolderName() !== $level->getName() ? " (" . $level->getName() . ")" : "") . ": " .
-				TextFormat::RED . number_format(count($level->getChunks())) . TextFormat::GREEN . " chunks, " .
-				TextFormat::RED . number_format(count($level->getEntities())) . TextFormat::GREEN . " entities, " .
-				TextFormat::RED . number_format(count($level->getTiles())) . TextFormat::GREEN . " tiles. " .
-				"Time " . (($level->getTickRate() > 1 or $level->getTickRateTime() > 40) ? TextFormat::RED : TextFormat::YELLOW) . round($level->getTickRateTime(), 2) . "ms" . ($level->getTickRate() > 1 ? " (tick rate " . $level->getTickRate() . ")" : "")
+			$sender->sendMessage(TextFormat::GOLD . "%pocketmine.command.status.World \"" . $level->getFolderName() . "\"" . ($level->getFolderName() !== $level->getName() ? " (" . $level->getName() . ")" : "") . ": " .
+				TextFormat::RED . number_format(count($level->getChunks())) . TextFormat::GREEN . " %pocketmine.command.status.chunks " .
+				TextFormat::RED . number_format(count($level->getEntities())) . TextFormat::GREEN . " %pocketmine.command.status.entities " .
+				TextFormat::RED . number_format(count($level->getTiles())) . TextFormat::GREEN . " %pocketmine.command.status.tiles " .
+				"%pocketmine.command.status.Time " . (($level->getTickRate() > 1 or $level->getTickRateTime() > 40) ? TextFormat::RED : TextFormat::YELLOW) . round($level->getTickRateTime(), 2) . "%pocketmine.command.status.ms" . ($level->getTickRate() > 1 ? " (tick rate " . $level->getTickRate() . ")" : "")
 			);
 		}
 

diff --git a/src/pocketmine/lang/locale/chs.ini b/src/pocketmine/lang/locale/chs.ini
@@ -1,15 +1,19 @@
-
+# Language file compatible with Minecraft: Pocket Edition identifiers=
+#=
+# A message doesn't need to be there to be shown correctly on the client.=
+# Only messages shown in PocketMine itself need to be here=
+
 language.name=中文(简体) by PeratX QQ:1215714524
 language.selected=设定 {%0} ({%1}) 为基本语言
 
 multiplayer.player.joined={%0} 加入了游戏
 multiplayer.player.left={%0} 离开了游戏
 
-chat.type.achievement={%0} 刚刚获得了成就 {%1}
 chat.type.text=<{%0}> {%1}
 chat.type.emote=* {%0} {%1}
 chat.type.announcement=[{%0}] {%1}
 chat.type.admin=[{%0}: {%1}]
+chat.type.achievement={%0} 刚刚获得了成就 {%1}
 
 disconnectionScreen.outdatedClient=客户端版本过旧！
 disconnectionScreen.outdatedServer=服务器版本过旧！
@@ -82,6 +86,7 @@ commands.me.usage=/me <action ...>
 
 commands.give.item.notFound=ID为 {%0} 的物品并不存在
 commands.give.success=将 {%0} * {%1} 给 {%2}
+commands.give.tagError=數據格式不正確: {%0}
 
 commands.effect.usage=/effect <玩家名称> <效果> [秒数] [倍数] [隐藏粒子] 或 /effect <玩家名称> clear
 commands.effect.notFound=然而ID为 {%0} 的特殊效果并不存在
@@ -91,18 +96,18 @@ commands.effect.success.removed.all=已解除 {%0} 身上所有特殊状态
 commands.effect.failure.notActive=无法从 {%1} 身上移除 {%0}，因为其身上无此效果
 commands.effect.failure.notActive.all=无法移除效果，因为 {%0} 身上没有任何效果
 
+commands.enchant.noItem=目標沒有手持一樣物品
+commands.enchant.notFound=沒有一個附魔ID為 {%0}
+commands.enchant.success=附魔完成
+commands.enchant.usage=/enchant <玩家名稱> <附魔ID> [物品等级]
 commands.particle.success=正在应用 {%0} 效果 {%1} 次
 commands.particle.notFound=未知的效果名称 {%0}
-
 commands.players.usage=/list
 commands.players.list=There are {%0}/{%1} players online:
-
 commands.kill.successful=已删除 {%0}
-
 commands.banlist.ips=共有 {%0} 个被封锁的 IP 地址：
 commands.banlist.players=共有 {%0} 个被封锁的玩家：
 commands.banlist.usage=/banlist [ips|players]
-
 commands.defaultgamemode.usage=/defaultgamemode <模式>
 commands.defaultgamemode.success=服务器的默认游戏模式为 {%0}
 
@@ -164,10 +169,8 @@ commands.whitelist.usage=/whitelist <on|off|list|add|remove|reload>
 commands.gamemode.success.self=设定自己的游戏模式为 {%0}
 commands.gamemode.success.other=设定 {%0} 的游戏模式为 {%1}
 commands.gamemode.usage=/gamemode <模式> [玩家名称]
-
 commands.help.header=--- 查看帮助列表第 {%0} 页共 {%1} 页 (/help <page>) ---
 commands.help.usage=/help [页数|指令名称]
-
 commands.message.usage=/tell <玩家名称> <讯息...>
 commands.message.sameTarget=您不能传送讯息给自己！
 
@@ -176,17 +179,13 @@ commands.difficulty.success=设定游戏难度为 {%0}
 
 commands.spawnpoint.usage=/spawnpoint [玩家名称] [<x> <y> <z>]
 commands.spawnpoint.success=设定 {%0} 的重生点为 ({%1}，{%2}，{%3})
-
 commands.setworldspawn.usage=/setworldspawn [<x> <y> <z>]
 commands.setworldspawn.success=设定世界重生点为 ({%0}，{%1}，{%2})
-
-
-
+# -------------------- PocketMine language files, only for console --------------------
 pocketmine.data.playerNotFound=无法找到玩家数据 "{%0}"，创建新的配置文件
 pocketmine.data.playerCorrupted=发现损坏的数据 "{%0}"，创建新的配置文件
 pocketmine.data.playerOld=发现旧的玩家数据 "{%0}"，更新配置文件
 pocketmine.data.saveError=无法储存 "{%0}" 的玩家数据：{%1}
-
 pocketmine.level.notFound=无法找到 "{%0}" 地图
 pocketmine.level.loadError=无法读取地图 "{%0}"：{%1}
 pocketmine.level.generationError=无法产生地图 "{%0}"：{%1}
@@ -196,7 +195,6 @@ pocketmine.level.backgroundGeneration=正在于背景生成世界 “{%0}“ 的
 pocketmine.level.defaultError=没有读取预设的地图
 pocketmine.level.preparing=准备地图中... "{%0}"
 pocketmine.level.unloading=正在移除地图 "{%0}"
-
 pocketmine.server.start=正在启动支持 Minecraft：PE {%0} 版本的服务器
 pocketmine.server.networkError=[网络] 停止接口 {%0} 由于 {%1}
 pocketmine.server.networkStart=正在启动服务器在 {%0}:{%1}
@@ -226,7 +224,33 @@ pocketmine.command.reload.reloaded=重新读取完成
 pocketmine.command.status.description=重新读取服务器的性能。
 pocketmine.command.status.usage=/status
 
+pocketmine.command.status.title=服务器状态
+pocketmine.command.status.player=服务器人数: 
+pocketmine.command.status.days=天
+pocketmine.command.status.hours=小时
+pocketmine.command.status.minutes=分
+pocketmine.command.status.seconds=秒
+pocketmine.command.status.uptime=运行时间:
+pocketmine.command.status.AverageTPS=平均TPS:
+pocketmine.command.status.CurrentTPS=瞬时TPS:
+pocketmine.command.status.Networkupload=网络上传:
+pocketmine.command.status.Networkdownload=网络下载:
+pocketmine.command.status.Threadcount=线程总数:
+pocketmine.command.status.Mainmemory=线程总数:
+pocketmine.command.status.Totalmemory=总内存:
+pocketmine.command.status.Totalvirtualmemory=总虚拟内存:
+pocketmine.command.status.Heapmemory=堆栈内存:
+pocketmine.command.status.Maxmemorysystem=系统最大内存:
+pocketmine.command.status.Maxmemorymanager=核心全局最大内存:
+pocketmine.command.status.World=世界
+pocketmine.command.status.chunks=区块,
+pocketmine.command.status.entities=实体,
+pocketmine.command.status.tiles=tiles.
+pocketmine.command.status.Time=时间
+pocketmine.command.status.ms=毫秒
 
+pocketmine.command.gc.description=回收垃圾
+pocketmine.command.gc.usage=/gc
 pocketmine.command.timings.description=纪录计时数据，以检视服务器的性能。
 pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
 pocketmine.command.timings.enable=启用定时和重启
@@ -237,29 +261,24 @@ pocketmine.command.timings.pasteError=已记录在事件记录文件中
 pocketmine.command.timings.timingsUpload=计时数据已被上载至 {%0}
 pocketmine.command.timings.timingsRead=你可以在 {%0} 阅读计时结果
 pocketmine.command.timings.timingsWrite=计时数据已被储存至 {%0}
-
 pocketmine.command.version.description=检视此服务器 (及其使用的插件) 的版本
 pocketmine.command.version.usage=/version [插件名称]
 pocketmine.command.version.noSuchPlugin=该服务器没有运行任何叫这个名称的插件。使用 /plugins 来获得插件列表。
-
 pocketmine.command.give.description=给指定玩家一定数量的物品
 pocketmine.command.give.usage=/give <玩家名称> <项目[:损毁程度]> [数量]
-
 pocketmine.command.kill.description=自杀或杀死其他玩家
 pocketmine.command.kill.usage=/kill [玩家名称]
-
 pocketmine.command.particle.description=加入粒子效果至世界
 pocketmine.command.particle.usage=/particle <玩家名称> <x> <y> <z> <xd> <yd> <zd> [数量] [数据值]
-
 pocketmine.command.time.description=更改每个世界的时间
 pocketmine.command.time.usage=/time <set|add> <数值> 或 /time <start|stop|query>
-
 pocketmine.command.ban.player.description=禁止指定的玩家使用此服务器
 pocketmine.command.ban.ip.description=禁止指定的 IP 地址使用此服务器
 pocketmine.command.banlist.description=查看来自该服务器禁止的所有玩家
 pocketmine.command.defaultgamemode.description=设定默认的游戏模式
 pocketmine.command.deop.description=移除指定玩家的管理员权限
 pocketmine.command.difficulty.description=设定游戏的难易度
+pocketmine.command.enchant.description=把物件附魔
 pocketmine.command.effect.description=增加/减少玩家身上的效果
 pocketmine.command.gamemode.description=改变玩家到一个特定的游戏模式
 pocketmine.command.help.description=显示帮助列表
@@ -280,23 +299,16 @@ pocketmine.command.stop.description=关闭服务器
 pocketmine.command.tp.description=传送指定玩家（或是自己）到另一位玩家或坐标
 pocketmine.command.tell.description=传送私讯给指定玩家
 pocketmine.command.whitelist.description=管理员允许使用此服务器的玩家列表
-
-pocketmine.command.gc.description=回收垃圾
-pocketmine.command.gc.usage=/gc
-
 pocketmine.crash.create=一个未知的错误发生了，使服务器崩溃。正在储存错误报告。
 pocketmine.crash.error=未能储存错误报告︰{%0}
 pocketmine.crash.submit=请上载档案「{%0}」至在线崩溃储存库。请尽量提供更多数据。
 pocketmine.crash.archive=错误报告已经上传到在线崩溃储存库。你可以在{%0} 查看到它或使用ID #{%1}。
-
 pocketmine.debug.enable=启用 LevelDB 支援
-
 pocketmine.player.invalidMove={%0} 行动可疑！
 pocketmine.player.logIn={%0}[/{%1}:{%2}] logged in with entity id {%3} at ({%4}, {%5}, {%6}, {%7})
 pocketmine.player.logOut={%0}[/{%1}:{%2}] logged out due to {%3}
 pocketmine.player.transfered={%0}[/{%1}:{%2}] 被传送到了 {%3}
 pocketmine.player.invalidEntity={%0} 尝试攻击一个无效的实体
-
 pocketmine.plugin.load=读取中... {%0}
 pocketmine.plugin.enable=开启中... {%0}
 pocketmine.plugin.disable=关闭中... {%0}

diff --git a/src/pocketmine/lang/locale/eng.ini b/src/pocketmine/lang/locale/eng.ini
@@ -223,6 +223,32 @@ pocketmine.command.reload.reloaded=Reload complete.
 
 pocketmine.command.status.description=Reads back the server's performance.
 pocketmine.command.status.usage=/status
+
+pocketmine.command.status.title=Server status
+pocketmine.command.status.player=Player count: 
+pocketmine.command.status.days=days
+pocketmine.command.status.hours=hours
+pocketmine.command.status.minutes=minutes
+pocketmine.command.status.seconds=seconds
+pocketmine.command.status.uptime=Uptime:
+pocketmine.command.status.AverageTPS=Average TPS:
+pocketmine.command.status.CurrentTPS=Current TPS:
+pocketmine.command.status.Networkupload=Network upload:
+pocketmine.command.status.Networkdownload=Network download:
+pocketmine.command.status.Threadcount=Thread count:
+pocketmine.command.status.Mainmemory=Main thread memory;
+pocketmine.command.status.Totalmemory=Total memory:
+pocketmine.command.status.Totalvirtualmemory=Total virtual memory:
+pocketmine.command.status.Heapmemory=Heap memory:
+pocketmine.command.status.Maxmemorysystem=Maximum memory (system):
+pocketmine.command.status.Maxmemorymanager=Maximum memory (manager):
+pocketmine.command.status.World=World
+pocketmine.command.status.chunks=chunks,
+pocketmine.command.status.entities=entities,
+pocketmine.command.status.tiles=tiles.
+pocketmine.command.status.Time=Time
+pocketmine.command.status.ms=ms
+
 pocketmine.command.gc.description=Fires garbage collection tasks
 pocketmine.command.gc.usage=/gc
 pocketmine.command.timings.description=Records timings to see performance of the server.
@@ -281,6 +307,7 @@ pocketmine.debug.enable=LevelDB support enabled
 pocketmine.player.invalidMove={%0} moved wrongly!
 pocketmine.player.logIn={%0}[/{%1}:{%2}] logged in with entity id {%3} at ({%4}, {%5}, {%6}, {%7})
 pocketmine.player.logOut={%0}[/{%1}:{%2}] logged out due to {%3}
+pocketmine.player.transfered={%0}[/{%1}:{%2}] was transfered to {%3}
 pocketmine.player.invalidEntity={%0} tried to attack an invalid entity
 pocketmine.plugin.load=Loading {%0}
 pocketmine.plugin.enable=Enabling {%0}
@@ -297,4 +324,4 @@ pocketmine.plugin.fileError=Could not load '{%0}' in folder '{%1}': {%2}
 pocketmine.plugin.commandError=Could not load command {%0} for plugin {%1}
 pocketmine.plugin.aliasError=Could not load alias {%0} for plugin {%1}
 pocketmine.plugin.deprecatedEvent=Plugin '{%0}' has registered a listener for '{%1}' on method '{%2}', but the event is Deprecated.
-pocketmine.plugin.eventError="Could not pass event '{%0}' to '{%1}': {%2} on {%3}
+pocketmine.plugin.eventError="Could not pass event '{%0}' to '{%1}': {%2} on {%3}