Merge branch '3.x' into 3.x-unstable

src/main/resources/assets/roughlyenoughitems/lang/de_de.json

@@ -73,12 +73,12 @@
   "text.rei.next_page": "Nächste Seite",
   "text.rei.back": "Zurück",
   "text.rei.select": "Auswählen",
-  "text.rei.working_station": "Working Station",
+  "text.rei.working_station": "Arbeitsstation",
   "text.rei.recipe_id": "\n%sRezept-Id: %s",
   "text.rei.recipe_screen_type.selection": "Darstellung Rezept-Bildschirm",
-  "text.rei.recipe_screen_type.selection.sub": "You can always edit this setting again via the config screen.",
+  "text.rei.recipe_screen_type.selection.sub": "Du kannst diese Einstellung jederzeit über den Konfigurationsbildschirm wieder bearbeiten.",
   "text.rei.view_recipes_for": "Rezepte für %s anzeigen",
-  "_comment": "Config Tooltips",
+  "_comment": "Konfigurations-Tooltips",
   "config.roughlyenoughitems.title": "Roughly Enough Items Konfiguration",
   "config.roughlyenoughitems.!general": "Allgemein",
   "config.roughlyenoughitems.appearance": "Darstellung",
@@ -88,7 +88,7 @@
   "config.roughlyenoughitems.clickableRecipeArrows": "Klickbare Rezeptpfeile:",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.true": "Aktiviert",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.false": "Deaktiviert",
-  "config.roughlyenoughitems.renderEntryExtraOverlay": "Render Entry Extra Overlay:",
+  "config.roughlyenoughitems.renderEntryExtraOverlay": "Render zusätzliches Entry-Overlay:",
   "config.roughlyenoughitems.darkTheme": "Erscheinungsbild:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "Dunkles Design",
   "config.roughlyenoughitems.darkTheme.boolean.false": "Helles Design",
@@ -109,22 +109,22 @@
   "config.roughlyenoughitems.disableRecipeBook": "Vanilla Rezeptbuch:",
   "config.roughlyenoughitems.disableRecipeBook.boolean.true": "Deaktiviert",
   "config.roughlyenoughitems.disableRecipeBook.boolean.false": "Aktiviert",
-  "config.roughlyenoughitems.fixTabCloseContainer": "Fix Vanilla Tab Container (When Recipe Book Disabled):",
+  "config.roughlyenoughitems.fixTabCloseContainer": "Korrigier den Vanilla Tab Container (wenn das Rezeptbuch deaktiviert ist):",
   "config.roughlyenoughitems.enableCraftableOnlyButton": "Filter für Herstellbare Gegenstände:",
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.true": "Aktiviert",
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.false": "Deaktiviert",
-  "config.roughlyenoughitems.showUtilsButtons": "Utils Buttons:",
+  "config.roughlyenoughitems.showUtilsButtons": "Werkzeugknöpfe:",
   "config.roughlyenoughitems.showUtilsButtons.boolean.true": "Aktiviert",
   "config.roughlyenoughitems.showUtilsButtons.boolean.false": "Deaktiviert",
   "config.roughlyenoughitems.gamemodeCommand": "Befehl Spielmodus-Wechsel:",
-  "config.roughlyenoughitems.giveCommand": "Give Command:",
-  "config.roughlyenoughitems.loadDefaultPlugin": "Load Default Plugin:",
-  "config.roughlyenoughitems.loadDefaultPlugin.boolean.false": "§cNo (Dangerous)",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread": "Recipe Sync Thread:",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "New REI Thread",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§cPacket Thread",
-  "config.roughlyenoughitems.weatherCommand": "Weather Command:",
-  "config.roughlyenoughitems.itemListOrdering": "Entry List Ordering:",
+  "config.roughlyenoughitems.giveCommand": "Geben-Befehl:",
+  "config.roughlyenoughitems.loadDefaultPlugin": "Standard-Plugin laden:",
+  "config.roughlyenoughitems.loadDefaultPlugin.boolean.false": "§cNein (Gefährlich)",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread": "Rezept-Synchronisationsthread:",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "Neuer REI-Thread",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§cPaket-Thread",
+  "config.roughlyenoughitems.weatherCommand": "Wetter Befehl:",
+  "config.roughlyenoughitems.itemListOrdering": "Reihenfolge der Itemlisten:",
   "config.roughlyenoughitems.list_ordering_button": "%s [%s]",
   "config.roughlyenoughitems.recipeScreenType": "Art des Rezept-Bildschirms:",
   "config.roughlyenoughitems.recipeScreenType.unset": "Nicht Gesetzt",

src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json

@@ -88,7 +88,7 @@
   "config.roughlyenoughitems.clickableRecipeArrows": "可点击的配方箭头：",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.true": "启用",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.false": "禁用",
-  "config.roughlyenoughitems.renderEntryExtraOverlay": "Render Entry Extra Overlay:",
+  "config.roughlyenoughitems.renderEntryExtraOverlay": "项目上显示额外的资料:",
   "config.roughlyenoughitems.darkTheme": "外观主题:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "深色主题",
   "config.roughlyenoughitems.darkTheme.boolean.false": "浅色主题",
@@ -120,22 +120,22 @@
   "config.roughlyenoughitems.giveCommand": "作弊命令:",
   "config.roughlyenoughitems.loadDefaultPlugin": "加载默认插件：",
   "config.roughlyenoughitems.loadDefaultPlugin.boolean.false": "§c禁用 (危险)",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread": "Recipe Sync Thread:",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "New REI Thread",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§cPacket Thread",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread": "配方同步线程：",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "新 REI 线程",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§c原线程",
   "config.roughlyenoughitems.weatherCommand": "天气命令：",
   "config.roughlyenoughitems.itemListOrdering": "条目列表排序：",
   "config.roughlyenoughitems.list_ordering_button": "%s [%s]",
   "config.roughlyenoughitems.recipeScreenType": "配方屏幕类型：",
   "config.roughlyenoughitems.recipeScreenType.unset": "未设定",
   "config.roughlyenoughitems.recipeScreenType.original": "默认",
-  "config.roughlyenoughitems.recipeScreenType.villager": "Villager Like",
-  "config.roughlyenoughitems.itemCheatingMode": "Item Cheating Amount:",
+  "config.roughlyenoughitems.recipeScreenType.villager": "像村民交易介面",
+  "config.roughlyenoughitems.itemCheatingMode": "物品作弊数量:",
   "config.roughlyenoughitems.itemCheatingMode.rei_like": "标准",
   "config.roughlyenoughitems.itemCheatingMode.jei_like": "反转",
   "config.roughlyenoughitems.appendModNames": "附加模组名称：",
   "config.roughlyenoughitems.scrollingEntryListWidget": "条目列表操作：",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "滚动",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "分页",
-  "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n  Originally by ZenDarva\n  Rewritten by Danielshe\n  Old Plugin Support by TehNut\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed with MIT."
+  "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7原是 Almost Enough Items 的分支.\n\n§l主要开发人员\n  AEI 作者 ZenDarva\n  重写作者 Danielshe\n\n§l语言翻译\n%s\n\n§l许可\n§7Roughly Enough Items 使用 MIT."
 }

src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json

@@ -88,7 +88,7 @@
   "config.roughlyenoughitems.clickableRecipeArrows": "可點擊的食譜箭頭:",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.true": "啟用",
   "config.roughlyenoughitems.clickableRecipeArrows.boolean.false": "禁用",
-  "config.roughlyenoughitems.renderEntryExtraOverlay": "項目上顯示額外的資料",
+  "config.roughlyenoughitems.renderEntryExtraOverlay": "項目上顯示額外的資料:",
   "config.roughlyenoughitems.darkTheme": "外觀主題:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "暗主題",
   "config.roughlyenoughitems.darkTheme.boolean.false": "亮主題",
@@ -120,7 +120,7 @@
   "config.roughlyenoughitems.giveCommand": "作弊命令:",
   "config.roughlyenoughitems.loadDefaultPlugin": "加載默認 Plugin:",
   "config.roughlyenoughitems.loadDefaultPlugin.boolean.false": "§c禁用 (危險)",
-  "config.roughlyenoughitems.registerRecipesInAnotherThread": "配方更新線程:",
+  "config.roughlyenoughitems.registerRecipesInAnotherThread": "配方同步線程:",
   "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.true": "新 REI 綫程",
   "config.roughlyenoughitems.registerRecipesInAnotherThread.boolean.false": "§c原線程",
   "config.roughlyenoughitems.weatherCommand": "天氣命令：",