Merge branch 'patch-2' into 1.14-dev

1 files changed, 15 insertions, 5 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
index e1bdc9abf..783ca182a 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -3,9 +3,15 @@
   "key.roughlyenoughitems.recipe_keybind": "显示配方",
   "key.roughlyenoughitems.hide_keybind": "隐藏／显示 REI",
   "key.roughlyenoughitems.usage_keybind": "显示用途",
-  "text.rei.config.general": "一般",
+  "text.rei.config.general": "常规",
+  "text.rei.config.action": "功能",
   "text.rei.config.cheating": "作弊:",
   "text.rei.cheating": "作弊",
+  "text.rei.cheating_disabled": "§7禁用作弊",
+  "text.rei.cheating_enabled": "§c启用作弊",
+  "text.rei.cheating_limited_enabled": "§b启用作弊(使用命令)",
+  "text.rei.cheating_enabled_no_perms": "§7启用§c作弊§7(无权限)",
+  "text.rei.no_permission_cheat": "作弊给予物品需要OP权限",
   "category.rei.crafting": "合成",
   "category.rei.smelting": "冶炼",
   "category.rei.smelting.fuel": "§e燃料",
@@ -52,8 +58,8 @@
   "text.rei.give_command.suggestion": "输入指令.",
   "text.rei.view_all_categories": "查看全部类别",
   "text.rei.go_back_first_page": "回到第 1 页",
-  "text.rei.config.appearance": "外貌",
-  "text.rei.config.modules": "组件",
+  "text.rei.config.appearance": "外观",
+  "text.rei.config.modules": "模块",
   "text.rei.config.advanced": "高级",
   "text.rei.config.disable_recipe_book": "禁用合成书:",
   "text.rei.choose_page": "选择页面",
@@ -78,9 +84,13 @@
   "text.rei.config.title": "Roughly Enough Items 配置",
   "text.rei.config.enable_legacy_speedcraft_support": "启用旧版插件支持: ",
   "text.rei.config.april_fools": "愚人节",
-  "text.rei.config.april_fools.2019": "强制启用REI 2019 愚人节的玩笑: ",
+  "text.rei.config.april_fools.2019": "强制启用REI 2019愚人节玩笑: ",
   "text.rei.config.item_cheating_mode": "物品作弊数量模式:",
   "text.rei.config.item_cheating_mode.rei_like": "标准",
   "text.rei.config.item_cheating_mode.jei_like": "反转",
-  "text.rei.no_config_api": "Cloth Config API 不存在!\n请安装它以显示游戏中的配置界面!"
+  "text.rei.config.light_gray_recipe_border": "浅灰色配方边框:",
+  "text.rei.config_api_failed": "如果Cloth Config API装载失败了或你没有安装它，你就会到达这个界面!\n升级/安装API或向bug跟踪器报告.",
+  "text.rei.back": "返回",
+  "_comment": "Don't change / translate the credit down below if you are doing it :)",
+  "text.rei.credit.text": "§lRoughly Enough Items\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n  - Originally by ZenDarva\n  - Created by Danielshe\n  - Plugin Support by TehNut\n\n§lLanguage Translation\n  English - Danielshe\n  Simplified Chinese - Danielshe\n  Traditional Chinese - hugoalh, gxy17886 & Danielshe\n  French - Yanis48\n  German - MelanX\n  Estonian - Madis0\n  Portuguese - thiagokenis\n  LOLCAT - Danielshe\n  Upside Down - Danielshe\n  Brazilian Portuguese - thiagokenis\n  Bulgarian - geniiii\n\n§lLicense\n§7Roughly Enough Items is using MIT."
 }