diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index daeb7fecb..b6faef0e1 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -43,7 +43,7 @@ public class GuiCraftingMonitor extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(craftingMonitor)); - String cancel = t("misc.refinedstorage:cancel"); + String cancel = t("gui.cancel"); String cancelAll = t("misc.refinedstorage:cancel_all"); int cancelButtonWidth = 14 + fontRendererObj.getStringWidth(cancel); @@ -137,7 +137,7 @@ public class GuiCraftingMonitor extends GuiBase { .replace("{items_crafting}", t("gui.refinedstorage:crafting_monitor.items_crafting")) .replace("{items_processing}", t("gui.refinedstorage:crafting_monitor.items_processing")) .replace("{not_started_yet}", t("gui.refinedstorage:crafting_monitor.not_started_yet")) - .replace("{none}", t("misc.refinedstorage:none"))); + .replace("{none}", t("gui.none"))); } } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index f155d3648..4f89cd81c 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -21,9 +21,9 @@ public class SideButtonCompare extends SideButton { String tooltip = TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n"; if ((config.getCompare() & mask) == mask) { - tooltip += gui.t("misc.refinedstorage:yes"); + tooltip += gui.t("gui.yes"); } else { - tooltip += gui.t("misc.refinedstorage:no"); + tooltip += gui.t("gui.no"); } return tooltip; diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 31b283d01..148ec259a 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -47,12 +47,8 @@ misc.refinedstorage:wireless_grid.tooltip.2=Z: %d misc.refinedstorage:wireless_grid.out_of_range=Controller out of range. misc.refinedstorage:wireless_grid.not_found=Controller not found. -misc.refinedstorage:yes=Yes -misc.refinedstorage:no=No misc.refinedstorage:start=Start misc.refinedstorage:clear=Clear -misc.refinedstorage:none=None -misc.refinedstorage:cancel=Cancel misc.refinedstorage:cancel_all=Cancel All misc.refinedstorage:priority=Priority diff --git a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang index 9b0b60538..d66e72f07 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang @@ -4,7 +4,7 @@ gui.refinedstorage:controller.0=Contrôleur gui.refinedstorage:controller.1=Contrôleur Créatif gui.refinedstorage:controller.machine_amount=%dx gui.refinedstorage:grid=Grille -gui.refinedstorage:grid.craft=Grille de Craft +gui.refinedstorage:grid.craft=Craft gui.refinedstorage:grid.pattern=Modèle gui.refinedstorage:grid.pattern_create=Modèle Créatif gui.refinedstorage:wireless_grid=Grille sans Fil @@ -46,12 +46,8 @@ misc.refinedstorage:wireless_grid.tooltip.2=Z: %d misc.refinedstorage:wireless_grid.out_of_range=Contrôleur hors de portés. misc.refinedstorage:wireless_grid.not_found=Contrôleur non trouvé. -misc.refinedstorage:yes=Oui -misc.refinedstorage:no=Non misc.refinedstorage:start=Départ misc.refinedstorage:clear=Vider -misc.refinedstorage:none=Aucun -misc.refinedstorage:cancel=Annuler misc.refinedstorage:cancel_all=Tout Annuler misc.refinedstorage:priority=Priorité diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 6f0acd895..88011ddb2 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -47,12 +47,8 @@ misc.refinedstorage:wireless_grid.tooltip.2=Z: %d misc.refinedstorage:wireless_grid.out_of_range=Controller buiten bereik. misc.refinedstorage:wireless_grid.not_found=Controller niet gevonden. -misc.refinedstorage:yes=Ja -misc.refinedstorage:no=Nee misc.refinedstorage:start=Start misc.refinedstorage:clear=Legen -misc.refinedstorage:none=Geen -misc.refinedstorage:cancel=Annuleer misc.refinedstorage:cancel_all=Annuleer alles misc.refinedstorage:priority=Prioriteit