diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index e0b96ce15..640217823 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-13 15:24+0100\n"
-"PO-Revision-Date: 2013-11-25 10:04+0200\n"
-"Last-Translator: Shen Zheyu <arsdragonfly@gmail.com>\n"
+"PO-Revision-Date: 2015-03-03 19:56+0800\n"
+"Last-Translator: Yuan Yutao <yyt16384@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 1.7-dev\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: builtin/fstk/ui.lua:67
 msgid "Ok"
-msgstr "OK"
+msgstr "确定"
 
 #: builtin/mainmenu/dlg_config_world.lua:26
 msgid "World:"
@@ -94,19 +94,19 @@ msgstr "创建"
 
 #: builtin/mainmenu/dlg_create_world.lua:68
 msgid "You have no subgames installed."
-msgstr ""
+msgstr "你没有安装子游戏。"
 
 #: builtin/mainmenu/dlg_create_world.lua:69
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "从minetest.net下载一个"
 
 #: builtin/mainmenu/dlg_create_world.lua:72
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
+msgstr "警告：最小开发测试是为开发者准备的。"
 
 #: builtin/mainmenu/dlg_create_world.lua:73
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
+msgstr "从minetest.net下载一个子游戏，例如minetest_game"
 
 #: builtin/mainmenu/dlg_create_world.lua:97
 msgid "A world named \"$1\" already exists"
@@ -159,13 +159,12 @@ msgid "Install Mod: file: \"$1\""
 msgstr "安装MOD：文件：”$1“"
 
 #: builtin/mainmenu/modmgr.lua:343
-#, fuzzy
 msgid ""
 "\n"
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"安装MOD：不支持的文件类型“$1“"
+"安装MOD：不支持的文件类型“$1”或压缩包损坏"
 
 #: builtin/mainmenu/modmgr.lua:363
 msgid "Failed to install $1 to $2"
@@ -181,33 +180,32 @@ msgstr "安装MOD：找不到$1的真正MOD名"
 
 #: builtin/mainmenu/store.lua:88
 msgid "Unsorted"
-msgstr ""
+msgstr "未分类"
 
 #: builtin/mainmenu/store.lua:99 builtin/mainmenu/store.lua:584
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
 #: builtin/mainmenu/store.lua:125
-#, fuzzy
 msgid "Downloading"
-msgstr "下载"
+msgstr "下载中"
 
 #: builtin/mainmenu/store.lua:127
 msgid "please wait..."
-msgstr ""
+msgstr "请等待..."
 
 #: builtin/mainmenu/store.lua:159
 msgid "Successfully installed:"
-msgstr ""
+msgstr "成功安装了："
 
 #: builtin/mainmenu/store.lua:163
 #, fuzzy
 msgid "Shortname:"
-msgstr "世界名称"
+msgstr "短名称："
 
 #: builtin/mainmenu/store.lua:167 src/guiFormSpecMenu.cpp:2866
 msgid "ok"
-msgstr ""
+msgstr "好"
 
 #: builtin/mainmenu/store.lua:476
 msgid "Rating"
@@ -222,8 +220,9 @@ msgid "Install"
 msgstr "安装"
 
 #: builtin/mainmenu/store.lua:522
+#, fuzzy
 msgid "Close store"
-msgstr ""
+msgstr "关闭商店"
 
 #: builtin/mainmenu/store.lua:530
 msgid "Page $1 of $2"
@@ -341,11 +340,11 @@ msgstr "公共服务器"
 
 #: builtin/mainmenu/tab_server.lua:45
 msgid "Bind Address"
-msgstr ""
+msgstr "绑定地址"
 
 #: builtin/mainmenu/tab_server.lua:47
 msgid "Port"
-msgstr ""
+msgstr "端口"
 
 #: builtin/mainmenu/tab_server.lua:51
 msgid "Server Port"
@@ -357,11 +356,11 @@ msgstr "服务器"
 
 #: builtin/mainmenu/tab_settings.lua:23
 msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "你确定要重置你的单人游戏世界吗？"
 
 #: builtin/mainmenu/tab_settings.lua:27
 msgid "No!!!"
-msgstr ""
+msgstr "不！！！"
 
 #: builtin/mainmenu/tab_settings.lua:134
 msgid "Smooth Lighting"
@@ -376,7 +375,6 @@ msgid "3D Clouds"
 msgstr "3D云彩"
 
 #: builtin/mainmenu/tab_settings.lua:140
-#, fuzzy
 msgid "Fancy Trees"
 msgstr "更漂亮的树"
 
@@ -385,13 +383,12 @@ msgid "Opaque Water"
 msgstr "不透明的水"
 
 #: builtin/mainmenu/tab_settings.lua:144
-#, fuzzy
 msgid "Connected Glass"
-msgstr "连接"
+msgstr "连接的玻璃"
 
 #: builtin/mainmenu/tab_settings.lua:149
 msgid "Restart minetest for driver change to take effect"
-msgstr ""
+msgstr "重启minetest以使驱动更改生效"
 
 #: builtin/mainmenu/tab_settings.lua:151
 msgid "Mip-Mapping"
@@ -418,34 +415,32 @@ msgid "Change keys"
 msgstr "改变键位设置"
 
 #: builtin/mainmenu/tab_settings.lua:167
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "单人游戏"
+msgstr "重置单人游戏"
 
 #: builtin/mainmenu/tab_settings.lua:171
 msgid "GUI scale factor"
-msgstr ""
+msgstr "图形界面缩放因子"
 
 #: builtin/mainmenu/tab_settings.lua:175
 msgid "Scaling factor applied to menu elements: "
-msgstr ""
+msgstr "缩放因子应用于菜单元素："
 
 #: builtin/mainmenu/tab_settings.lua:181
 msgid "Touch free target"
-msgstr ""
+msgstr "自由触摸目标"
 
 #: builtin/mainmenu/tab_settings.lua:187
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "触摸阈值（像素）"
 
 #: builtin/mainmenu/tab_settings.lua:194 builtin/mainmenu/tab_settings.lua:208
-#, fuzzy
 msgid "Bumpmapping"
 msgstr "贴图处理"
 
 #: builtin/mainmenu/tab_settings.lua:196 builtin/mainmenu/tab_settings.lua:209
 msgid "Generate Normalmaps"
-msgstr ""
+msgstr "生成法线贴图"
 
 #: builtin/mainmenu/tab_settings.lua:198 builtin/mainmenu/tab_settings.lua:210
 msgid "Parallax Occlusion"
@@ -453,15 +448,15 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua:200 builtin/mainmenu/tab_settings.lua:211
 msgid "Waving Water"
-msgstr ""
+msgstr "摇摆的水"
 
 #: builtin/mainmenu/tab_settings.lua:202 builtin/mainmenu/tab_settings.lua:212
 msgid "Waving Leaves"
-msgstr ""
+msgstr "摇摆的树叶"
 
 #: builtin/mainmenu/tab_settings.lua:204 builtin/mainmenu/tab_settings.lua:213
 msgid "Waving Plants"
-msgstr ""
+msgstr "摇摆的植物"
 
 #: builtin/mainmenu/tab_settings.lua:255
 msgid "To enable shaders the OpenGL driver needs to be used."
@@ -473,17 +468,15 @@ msgstr "设置"
 
 #: builtin/mainmenu/tab_simple_main.lua:67
 msgid "Fly mode"
-msgstr ""
+msgstr "飞行模式"
 
 #: builtin/mainmenu/tab_simple_main.lua:71
-#, fuzzy
 msgid "Start Singleplayer"
-msgstr "单人游戏"
+msgstr "开始单人游戏"
 
 #: builtin/mainmenu/tab_simple_main.lua:72
-#, fuzzy
 msgid "Config mods"
-msgstr "配置"
+msgstr "配置MOD"
 
 #: builtin/mainmenu/tab_simple_main.lua:191
 #, fuzzy
@@ -507,7 +500,6 @@ msgid "No information available"
 msgstr "无可用信息"
 
 #: builtin/mainmenu/tab_texturepacks.lua:114
-#, fuzzy
 msgid "Texturepacks"
 msgstr "材质包"
 
@@ -537,11 +529,11 @@ msgstr "媒体..."
 
 #: src/game.cpp:2267
 msgid " KB/s"
-msgstr ""
+msgstr " KB/秒"
 
 #: src/game.cpp:2271
 msgid " MB/s"
-msgstr ""
+msgstr " MB/秒"
 
 #: src/game.cpp:4220
 msgid ""
@@ -969,7 +961,7 @@ msgstr "主菜单"
 
 #: src/main.cpp:1719
 msgid "Player name too long."
-msgstr ""
+msgstr "玩家名过长。"
 
 #: src/main.cpp:1757
 msgid "Connection error (timed out?)"
@@ -981,7 +973,7 @@ msgstr "没有选择世界或提供地址。未执行操作。"
 
 #: src/main.cpp:1926
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "提供的世界路径不存在："
 
 #: src/main.cpp:1935
 msgid "Could not find or load game \""