Merge remote-tracking branch 'shedaniel/l10n_3.x' into 3.x

3 files changed, 25 insertions, 25 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
index 95ca0b832..0bff5f39e 100755
--- a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
@@ -25,7 +25,7 @@
   "category.rei.brewing.result": "Potion obtenue",
   "category.rei.composting": "Compostage",
   "category.rei.stripping": "Écorçage",
-  "category.rei.information": "Information",
+  "category.rei.information": "Informations",
   "text.rei.composting.chance": "§e%d% % de chances",
   "text.rei.composting.page": "Page %d",
   "text.rei.config": "Configuration",
@@ -121,8 +121,8 @@
   "config.roughlyenoughitems.mirrorItemPanel.boolean.false": "Côté droit",
   "config.roughlyenoughitems.debugRenderTimeRequired": "Mode de débogage de la liste d'entrées :",
   "config.roughlyenoughitems.searchFieldLocation": "Position du champ de recherche :",
-  "config.roughlyenoughitems.searchFieldLocation.bottom_side": "En bas à gauche/droite",
-  "config.roughlyenoughitems.searchFieldLocation.top_side": "En haut à gauche/droite",
+  "config.roughlyenoughitems.searchFieldLocation.bottom_side": "Bas à gauche/droite",
+  "config.roughlyenoughitems.searchFieldLocation.top_side": "Haut à gauche/droite",
   "config.roughlyenoughitems.searchFieldLocation.center": "Milieu",
   "config.roughlyenoughitems.villagerScreenPermanentScrollBar": "Fondu de la barre de défilement :",
   "config.roughlyenoughitems.villagerScreenPermanentScrollBar.boolean.true": "Jamais",
@@ -136,8 +136,8 @@
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.true": "Activé",
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.false": "Désactivé",
   "config.roughlyenoughitems.showUtilsButtons": "Boutons utilitaires :",
-  "config.roughlyenoughitems.showUtilsButtons.boolean.true": "Activé",
-  "config.roughlyenoughitems.showUtilsButtons.boolean.false": "Désactivé",
+  "config.roughlyenoughitems.showUtilsButtons.boolean.true": "Activés",
+  "config.roughlyenoughitems.showUtilsButtons.boolean.false": "Désactivés",
   "config.roughlyenoughitems.gamemodeCommand": "Commande pour le mode de jeu :",
   "config.roughlyenoughitems.giveCommand": "Commande pour donner :",
   "config.roughlyenoughitems.loadDefaultPlugin": "Charger le plugin par défaut :",
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
index 8c24d8e49..982da4eb1 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -11,8 +11,8 @@
   "category.rei.smelting": "烧炼",
   "category.rei.smelting.fuel": "燃料",
   "category.rei.fuel": "燃料",
-  "category.rei.fuel.time": "Burn Time: %d ticks",
-  "category.rei.fuel.time_short": "%d ticks",
+  "category.rei.fuel.time": "燃烧时间：%d 刻",
+  "category.rei.fuel.time_short": "%d 刻",
   "category.rei.cooking.xp": "%f 经验",
   "category.rei.smoking": "烟熏",
   "category.rei.blasting": "熔炼",
@@ -25,7 +25,7 @@
   "category.rei.brewing.result": "输出药水",
   "category.rei.composting": "堆肥",
   "category.rei.stripping": "去皮",
-  "category.rei.information": "Information",
+  "category.rei.information": "信息",
   "text.rei.composting.chance": "§e%d%% 机会",
   "text.rei.composting.page": "第 %d 页",
   "text.rei.config": "设置",
@@ -106,9 +106,9 @@
   "config.roughlyenoughitems.clickableRecipeArrows": "可点击的配方箭头：",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.true": "启用",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.false": "禁用",
-  "config.roughlyenoughitems.renderEntryEnchantmentGlint": "Render Enchantment Glint:",
-  "config.roughlyenoughitems.entrySize": "Entry Size:",
-  "config.roughlyenoughitems.useCompactTabs": "Compact Tabs:",
+  "config.roughlyenoughitems.renderEntryEnchantmentGlint": "渲染附魔光效：",
+  "config.roughlyenoughitems.entrySize": "条目大小：",
+  "config.roughlyenoughitems.useCompactTabs": "简洁标签：",
   "config.roughlyenoughitems.darkTheme": "外观主题:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "深色主题",
   "config.roughlyenoughitems.darkTheme.boolean.false": "浅色主题",
@@ -119,7 +119,7 @@
   "config.roughlyenoughitems.mirrorItemPanel": "项目列表位置：",
   "config.roughlyenoughitems.mirrorItemPanel.boolean.true": "左侧",
   "config.roughlyenoughitems.mirrorItemPanel.boolean.false": "右侧",
-  "config.roughlyenoughitems.debugRenderTimeRequired": "Entry List Debug Mode:",
+  "config.roughlyenoughitems.debugRenderTimeRequired": "条目列表调试模式：",
   "config.roughlyenoughitems.searchFieldLocation": "搜索框的位置:",
   "config.roughlyenoughitems.searchFieldLocation.bottom_side": "左/右下角",
   "config.roughlyenoughitems.searchFieldLocation.top_side": "左/右上角",
@@ -161,7 +161,7 @@
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.true": "对面",
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.false": "列表顶部",
   "config.roughlyenoughitems.displayFavoritesTooltip": "显示收藏夹提示：",
-  "config.roughlyenoughitems.snapToRows": "Entry List Snap To Rows:",
+  "config.roughlyenoughitems.snapToRows": "对齐条目列表：",
   "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "复制ID讯息：",
   "config.roughlyenoughitems.scrollingEntryListWidget": "条目列表操作：",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "滚动",
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
index 14e1a17e1..e43e9b5cb 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
@@ -11,8 +11,8 @@
   "category.rei.smelting": "冶煉",
   "category.rei.smelting.fuel": "燃料",
   "category.rei.fuel": "燃料",
-  "category.rei.fuel.time": "Burn Time: %d ticks",
-  "category.rei.fuel.time_short": "%d ticks",
+  "category.rei.fuel.time": "燃燒時間：%d 刻",
+  "category.rei.fuel.time_short": "%d 刻",
   "category.rei.cooking.xp": "%f XP",
   "category.rei.smoking": "煙熏",
   "category.rei.blasting": "熔煉",
@@ -25,7 +25,7 @@
   "category.rei.brewing.result": "輸出藥水",
   "category.rei.composting": "堆肥",
   "category.rei.stripping": "剝奪",
-  "category.rei.information": "Information",
+  "category.rei.information": "資訊",
   "text.rei.composting.chance": "§e%d%% 機會",
   "text.rei.composting.page": "第 %d 頁",
   "text.rei.config": "設置",
@@ -83,7 +83,7 @@
   "text.rei.recipe_screen_type.selection": "合成介面選擇",
   "text.rei.recipe_screen_type.selection.sub": "你可以在設置中改變合成介面.",
   "text.rei.view_recipes_for": "顯示%s的所有合成",
-  "tooltip.rei.fluid_amount": "§7%d Unit",
+  "tooltip.rei.fluid_amount": "§7%d 單位",
   "msg.rei.copied_recipe_id": "已復製配方ID",
   "msg.rei.recipe_id_details": "配方ID：%s",
   "_comment": "設置提示",
@@ -106,9 +106,9 @@
   "config.roughlyenoughitems.clickableRecipeArrows": "可點擊的食譜箭頭:",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.true": "啟用",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.false": "禁用",
-  "config.roughlyenoughitems.renderEntryEnchantmentGlint": "Render Enchantment Glint:",
-  "config.roughlyenoughitems.entrySize": "Entry Size:",
-  "config.roughlyenoughitems.useCompactTabs": "Compact Tabs:",
+  "config.roughlyenoughitems.renderEntryEnchantmentGlint": "顯示附魔光效：",
+  "config.roughlyenoughitems.entrySize": "物品大小：",
+  "config.roughlyenoughitems.useCompactTabs": "簡潔分類標籤：",
   "config.roughlyenoughitems.darkTheme": "外觀主題:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "暗主題",
   "config.roughlyenoughitems.darkTheme.boolean.false": "亮主題",
@@ -116,10 +116,10 @@
   "config.roughlyenoughitems.lightGrayRecipeBorder.boolean.true": "淺灰",
   "config.roughlyenoughitems.lightGrayRecipeBorder.boolean.false": "高對比",
   "config.roughlyenoughitems.maxRecipePerPage": "每頁可以顯示最多合成:",
-  "config.roughlyenoughitems.mirrorItemPanel": "物品列表的位置:",
+  "config.roughlyenoughitems.mirrorItemPanel": "項目列表位置:",
   "config.roughlyenoughitems.mirrorItemPanel.boolean.true": "左邊",
   "config.roughlyenoughitems.mirrorItemPanel.boolean.false": "右邊",
-  "config.roughlyenoughitems.debugRenderTimeRequired": "Entry List Debug Mode:",
+  "config.roughlyenoughitems.debugRenderTimeRequired": "項目列表測試模式：",
   "config.roughlyenoughitems.searchFieldLocation": "搜索框的位置:",
   "config.roughlyenoughitems.searchFieldLocation.bottom_side": "左下 / 右下",
   "config.roughlyenoughitems.searchFieldLocation.top_side": "左上 / 右上",
@@ -146,7 +146,7 @@
   "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "新 REI 綫程",
   "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§c原線程",
   "config.roughlyenoughitems.weatherCommand": "天氣命令：",
-  "config.roughlyenoughitems.itemListOrdering": "Item List Ordering:",
+  "config.roughlyenoughitems.itemListOrdering": "排列：",
   "config.roughlyenoughitems.list_ordering_button": "%s [%s]",
   "config.roughlyenoughitems.recipeScreenType": "配方屏幕類型：",
   "config.roughlyenoughitems.recipeScreenType.unset": "未設定",
@@ -159,9 +159,9 @@
   "config.roughlyenoughitems.appendModNames": "附加模組名稱：",
   "config.roughlyenoughitems.displayFavoritesOnTheLeft": "我的最愛的位置：",
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.true": "對面",
-  "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.false": "清單的頂部",
+  "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.false": "列表的頂部",
   "config.roughlyenoughitems.displayFavoritesTooltip": "顯示我的最愛提示：",
-  "config.roughlyenoughitems.snapToRows": "Entry List Snap To Rows:",
+  "config.roughlyenoughitems.snapToRows": "對齊項目列表：",
   "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "複製ID訊息：",
   "config.roughlyenoughitems.scrollingEntryListWidget": "項目列表操作:",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "滾動",