diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
index 8760db1fa..f43b0052f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
@@ -29,12 +29,12 @@ public class GuiPriority extends GuiCraftingStart {
 
     @Override
     protected String getStartButtonText() {
-        return "Set";
+        return t("misc.refinedstorage:set");
     }
 
     @Override
     protected String getTitle() {
-        return "Priority";
+        return t("misc.refinedstorage:priority");
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
index 350ea0487..91b9355da 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
@@ -60,9 +60,9 @@ public class GuiStorage extends GuiBase {
             addSideButton(new SideButtonAccessType(this, gui.getAccessTypeParameter()));
         }
 
-        String txt = "Priority"; // @TODO: I18n
-        int bw = 10 + fontRendererObj.getStringWidth(txt);
-        priorityButton = addButton(x + 169 - bw, y + 41, bw, 20, txt);
+        int buttonWidth = 10 + fontRendererObj.getStringWidth(t("misc.refinedstorage:priority"));
+
+        priorityButton = addButton(x + 169 - buttonWidth, y + 41, buttonWidth, 20, t("misc.refinedstorage:priority"));
     }
 
     @Override
@@ -87,9 +87,8 @@ public class GuiStorage extends GuiBase {
             t("misc.refinedstorage:storage.stored_minimal", RSUtils.formatQuantity(gui.getStored())) :
             t("misc.refinedstorage:storage.stored_capacity_minimal", RSUtils.formatQuantity(gui.getStored()), RSUtils.formatQuantity(gui.getCapacity())));
 
-        // @TODO: I18n
         if (texture.contains("disk_drive")) { // HACK!
-            drawString(70, 42, "Disks");
+            drawString(70, 42, t("gui.refinedstorage:disk_drive.disks"));
         }
 
         drawString(7, 129, t("container.inventory"));
diff --git a/src/main/resources/assets/refinedstorage/lang/de_DE.lang b/src/main/resources/assets/refinedstorage/lang/de_DE.lang
index 649f8f52d..faa7a3933 100755
--- a/src/main/resources/assets/refinedstorage/lang/de_DE.lang
+++ b/src/main/resources/assets/refinedstorage/lang/de_DE.lang
@@ -44,10 +44,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=Verbrauch: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Stored: %d
-misc.refinedstorage:storage.stored_capacity=Gespeichert: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Stored: %s
+misc.refinedstorage:storage.stored_capacity=Gespeichert: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% voll
 
 misc.refinedstorage:wireless_grid.tooltip=Verbunden mit %d, %d, %d.
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index 7d5cc6f95..72dbcdc27 100755
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -8,6 +8,7 @@ gui.refinedstorage:grid.pattern_create=Create Pattern
 gui.refinedstorage:wireless_grid=Wireless Grid
 gui.refinedstorage:fluid_grid=Fluid Grid
 gui.refinedstorage:disk_drive=Drive
+gui.refinedstorage:disk_drive.disks=Disks
 gui.refinedstorage:external_storage=External Storage
 gui.refinedstorage:importer=Importer
 gui.refinedstorage:exporter=Exporter
@@ -73,6 +74,7 @@ misc.refinedstorage:pattern.oredict=Uses ore dictionary
 
 misc.refinedstorage:start=Start
 misc.refinedstorage:clear=Clear
+misc.refinedstorage:set=Set
 misc.refinedstorage:cancel_all=Cancel All
 misc.refinedstorage:priority=Priority
 misc.refinedstorage:oredict=Oredict
diff --git a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang
index 5b9479e1d..f389a9024 100755
--- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang
+++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang
@@ -32,10 +32,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=Usage: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Stored: %d
-misc.refinedstorage:storage.stored_capacity=Stocké: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Stored: %s
+misc.refinedstorage:storage.stored_capacity=Stocké: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% plein
 
 misc.refinedstorage:wireless_grid.out_of_range=Il n'y a pas un Émetteur sans Fil dans la gamme.
diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
index fce520800..e8ad0e984 100755
--- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
+++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
@@ -46,10 +46,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=Vebruik: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Opgeslagen: %d
-misc.refinedstorage:storage.stored_capacity=Opgeslagen: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Opgeslagen: %s
+misc.refinedstorage:storage.stored_capacity=Opgeslagen: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% vol
 
 misc.refinedstorage:wireless_grid.tooltip=Gelinkt aan %d, %d, %d.
diff --git a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang
index cbfc79cc3..048a88c19 100755
--- a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang
+++ b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang
@@ -32,10 +32,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=Usage: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Stored: %d
-misc.refinedstorage:storage.stored_capacity=Stored: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Stored: %s
+misc.refinedstorage:storage.stored_capacity=Stored: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% full
 
 misc.refinedstorage:wireless_grid.out_of_range=Não há Transmissor Sem Fio na gama.
diff --git a/src/main/resources/assets/refinedstorage/lang/ru_RU.lang b/src/main/resources/assets/refinedstorage/lang/ru_RU.lang
index 5707f7659..012e734f7 100755
--- a/src/main/resources/assets/refinedstorage/lang/ru_RU.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ru_RU.lang
@@ -44,10 +44,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=Usage: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Запасено: %d
-misc.refinedstorage:storage.stored_capacity=Запасено: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Запасено: %s
+misc.refinedstorage:storage.stored_capacity=Запасено: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% полный
 
 misc.refinedstorage:wireless_grid.tooltip=Привязано к %d, %d, %d.
diff --git a/src/main/resources/assets/refinedstorage/lang/zh_CN.lang b/src/main/resources/assets/refinedstorage/lang/zh_CN.lang
index 608942f89..2db71e467 100755
--- a/src/main/resources/assets/refinedstorage/lang/zh_CN.lang
+++ b/src/main/resources/assets/refinedstorage/lang/zh_CN.lang
@@ -46,10 +46,10 @@ misc.refinedstorage:energy_stored=%d / %d RS
 misc.refinedstorage:energy_usage=使用: %d RS/t
 misc.refinedstorage:energy_usage_minimal=%d RS/t
 
-misc.refinedstorage:storage.stored=Stored: %d
-misc.refinedstorage:storage.stored_capacity=已存储: %d / %d
-misc.refinedstorage:storage.stored_minimal=%d
-misc.refinedstorage:storage.stored_capacity_minimal=%d / %d
+misc.refinedstorage:storage.stored=Stored: %s
+misc.refinedstorage:storage.stored_capacity=已存储: %s / %s
+misc.refinedstorage:storage.stored_minimal=%s
+misc.refinedstorage:storage.stored_capacity_minimal=%s / %s
 misc.refinedstorage:storage.full=%d%% 已使用
 
 misc.refinedstorage:wireless_grid.tooltip=连接到 %d, %d, %d.