remove unused translation keys

merge pickup/insert with filter
Mari023 · Nov 29, 2023 · 06ec167 · 06ec167
1 parent 1ccd82e
commit 06ec167
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,3 @@
 - remove reverse charging, it seemed caused more issues than it fixed (fix #230)
-- change energy usage when quantum linked to be more like an ae2 quantum bridges energy usage (22.5 ae / tick) (fix #222)
+- change energy usage when quantum linked to be more like an ae2 quantum bridges energy usage (22.5 ae / tick) (fix #222)
+- update russian translations
diff --git a/src/main/java/de/mari_023/ae2wtlib/TextConstants.java b/src/main/java/de/mari_023/ae2wtlib/TextConstants.java
@@ -46,8 +46,6 @@ public static MutableComponent formatTerminalName(String terminal) {
 
     public static final Component TERMINAL_EMPTY = Component.literal(
             "This terminal does not contain any other Terminals");
-
-    public static final Component CYCLE = Component.translatable("gui.ae2wtlib.cycle_terminal");
     public static final Component CYCLE_TOOLTIP = Component.translatable(
             "gui.ae2wtlib.cycle_terminal.desc");
 
@@ -58,15 +56,13 @@ public static MutableComponent formatTerminalName(String terminal) {
     private static final Component WHITELIST = Component.translatable("gui.ae2wtlib.whitelist");
     private static final Component BLACKLIST = Component.translatable("gui.ae2wtlib.blacklist");
 
-    private static final Component PICKUP = Component.translatable("gui.ae2wtlib.pickup");
-    private static final Component INSERT = Component.translatable("gui.ae2wtlib.insert");
-
-    private static final Component FILTER = Component.translatable("gui.ae2wtlib.filter");
+    private static final Component PICKUP_FILTER = Component.translatable("gui.ae2wtlib.pickup_filter");
+    private static final Component INSERT_FILTER = Component.translatable("gui.ae2wtlib.insert_filter");
 
-    public static final MutableComponent PICKUP_WHITELIST = PICKUP.copy().append(FILTER).append(WHITELIST);
-    public static final MutableComponent PICKUP_BLACKLIST = PICKUP.copy().append(FILTER).append(BLACKLIST);
-    public static final MutableComponent INSERT_WHITELIST = INSERT.copy().append(FILTER).append(WHITELIST);
-    public static final MutableComponent INSERT_BLACKLIST = INSERT.copy().append(FILTER).append(BLACKLIST);
+    public static final MutableComponent PICKUP_WHITELIST = PICKUP_FILTER.copy().append(WHITELIST);
+    public static final MutableComponent PICKUP_BLACKLIST = PICKUP_FILTER.copy().append(BLACKLIST);
+    public static final MutableComponent INSERT_WHITELIST = INSERT_FILTER.copy().append(WHITELIST);
+    public static final MutableComponent INSERT_BLACKLIST = INSERT_FILTER.copy().append(BLACKLIST);
 
     public static final MutableComponent COPY_PICKUP = Component.translatable("gui.ae2wtlib.copy_pickup");
     public static final MutableComponent COPY_INSERT = Component.translatable("gui.ae2wtlib.copy_insert");

diff --git a/src/main/java/de/mari_023/ae2wtlib/wut/CycleTerminalButton.java b/src/main/java/de/mari_023/ae2wtlib/wut/CycleTerminalButton.java
@@ -21,7 +21,7 @@
 public class CycleTerminalButton extends Button implements ITooltip {
 
     public CycleTerminalButton(OnPress onPress) {
-        super(0, 0, 16, 16, TextConstants.CYCLE, onPress, Button.DEFAULT_NARRATION);
+        super(0, 0, 16, 16, Component.empty(), onPress, Button.DEFAULT_NARRATION);
         visible = true;
         active = true;
     }

diff --git a/src/main/resources/assets/ae2wtlib/lang/de_de.json b/src/main/resources/assets/ae2wtlib/lang/de_de.json
@@ -22,9 +22,8 @@
   "gui.ae2wtlib.Magnet": "Magnet Filter",
   "gui.ae2wtlib.whitelist": "Whitelist",
   "gui.ae2wtlib.blacklist": "Blacklist",
-  "gui.ae2wtlib.pickup": "Aufsammel",
-  "gui.ae2wtlib.insert": "Einfüge",
-  "gui.ae2wtlib.filter": "filter: ",
+  "gui.ae2wtlib.pickup_filter": "Aufsammelfilter: ",
+  "gui.ae2wtlib.insert_filter": "Einfügefilter: ",
   "gui.ae2wtlib.copy_pickup": "Zu Aufsammelfilter kopieren",
   "gui.ae2wtlib.copy_insert": "Zu Einfügefilter kopieren",
   "gui.ae2wtlib.switch": "Filter tauschen",
@@ -38,9 +37,5 @@
   "key.ae2.ae2wtlib_magnet": "Magnet Karte umschalten",
 
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 Wireless Terminals",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "Leistungsmultiplikator außer Reichweite",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Reichweite der Magnet Karte",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "Trinkets Integration aktivieren",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "Wenn dieser Wer kleiner als 1 ist, könnten Drahtlose Konsolen innerhalb der Reichweite eines Drahtlosen Zugangspunktes mehr Strom verbrauchen als außerhalb.",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Reichweite der Magnet Karte"
 }
diff --git a/src/main/resources/assets/ae2wtlib/lang/en_us.json b/src/main/resources/assets/ae2wtlib/lang/en_us.json
@@ -22,9 +22,8 @@
   "gui.ae2wtlib.Magnet": "Magnet Filter",
   "gui.ae2wtlib.whitelist": "Whitelist",
   "gui.ae2wtlib.blacklist": "Blacklist",
-  "gui.ae2wtlib.pickup": "Pickup",
-  "gui.ae2wtlib.insert": "Insert",
-  "gui.ae2wtlib.filter": " Filter: ",
+  "gui.ae2wtlib.pickup_filter": "Pickup Filter: ",
+  "gui.ae2wtlib.insert_filter": "Insert Filter: ",
   "gui.ae2wtlib.copy_pickup": "Copy to Pickup",
   "gui.ae2wtlib.copy_insert": "Copy to Insert",
   "gui.ae2wtlib.switch": "Switch Filters",
@@ -41,10 +40,5 @@
 
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 Wireless Terminals",
 
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "Out of Range Power Multiplier",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Magnet Card Range",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "Enable Trinkets Integration",
-
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "If this is lower than 1, being in range of a Wireless Access Point would use more power in some cases.",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Magnet Card Range"
 }
diff --git a/src/main/resources/assets/ae2wtlib/lang/ko_kr.json b/src/main/resources/assets/ae2wtlib/lang/ko_kr.json
@@ -18,9 +18,8 @@
   "gui.ae2wtlib.Magnet": "마그넷 필터",
   "gui.ae2wtlib.whitelist": "화이트리스트",
   "gui.ae2wtlib.blacklist": "블랙리스트",
-  "gui.ae2wtlib.pickup": "집기",
-  "gui.ae2wtlib.insert": "삽입",
-  "gui.ae2wtlib.filter": " 필터: ",
+  "gui.ae2wtlib.pickup_filter": "집기 필터: ",
+  "gui.ae2wtlib.insert_filter": "삽입 필터: ",
   "gui.ae2wtlib.copy_pickup": "집기 복사",
   "gui.ae2wtlib.copy_insert": "삽입 복사",
   "gui.ae2wtlib.switch": "필터 전환",
@@ -37,10 +36,5 @@
 
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 무선 터미널",
 
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "범위 밖 전력 소모 배율",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "마그넷 카드 범위",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "Trinkets 통합 사용",
-
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "값이 1보다 낮을 경우, 무선 액세스 지점에 있을 때 더 많은 전력을 소모하는 경우도 있습니다.",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "마그넷 카드 범위"
 }
diff --git a/src/main/resources/assets/ae2wtlib/lang/ru_ru.json b/src/main/resources/assets/ae2wtlib/lang/ru_ru.json
@@ -22,9 +22,8 @@
   "gui.ae2wtlib.Magnet": "Магнитный Фильтр",
   "gui.ae2wtlib.whitelist": "Белый список",
   "gui.ae2wtlib.blacklist": "Чёрный список",
-  "gui.ae2wtlib.pickup": "Pickup",
-  "gui.ae2wtlib.insert": "Insert",
-  "gui.ae2wtlib.filter": " Фильтр: ",
+  "gui.ae2wtlib.pickup_filter": "Фильтр подбора: ",
+  "gui.ae2wtlib.insert_filter": "Insert Filter: ",
   "gui.ae2wtlib.copy_pickup": "Копировать в Pickup",
   "gui.ae2wtlib.copy_insert": "Копировать в Insert",
   "gui.ae2wtlib.switch": "Поменять фильтры местами",
@@ -40,11 +39,6 @@
   "key.ae2.ae2wtlib_magnet": "Переключить магнитную карту",
 
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 Wireless Terminals",
-
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "Множитель мощности вне диапазона",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Диапазон магнитной карты",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "Включить Trinkets интеграцию",
-
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "Если оно меньше 1, нахождение в зоне действия беспроводной точки доступа в некоторых случаях потребляет больше энергии.",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Диапазон магнитной карты"
 }
diff --git a/src/main/resources/assets/ae2wtlib/lang/uk_ua.json b/src/main/resources/assets/ae2wtlib/lang/uk_ua.json
@@ -17,9 +17,8 @@
   "gui.ae2wtlib.Magnet": "Магнітний фільтр",
   "gui.ae2wtlib.whitelist": "Білий список",
   "gui.ae2wtlib.blacklist": "Чорний список",
-  "gui.ae2wtlib.pickup": "Підібрати",
-  "gui.ae2wtlib.insert": "Вставити",
-  "gui.ae2wtlib.filter": " Фільтр: ",
+  "gui.ae2wtlib.pickup_filter": "Підібрати Фільтр: ",
+  "gui.ae2wtlib.insert_filter": "Вставити Фільтр: ",
   "gui.ae2wtlib.copy_pickup": "Скопіювати до Підібрати",
   "gui.ae2wtlib.copy_insert": "Скопіювати до Вставити",
   "gui.ae2wtlib.switch": "Перемкнути фільтри",
@@ -32,9 +31,5 @@
   "key.ae2.ae2wtlib_restock": "Перемкнути поповнення",
   "key.ae2.ae2wtlib_magnet": "Перемкнути магнітну картку",
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 Бездротові термінали",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "Множник потужності за межами досяжності",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Досяжність магнітної картки",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "Увімкнути інтеграцію з модом Trinkets",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "Якщо це значення менше 1, перебування в межах досяжності бездротової точки доступу в деяких випадках споживатиме більше енергії.",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "Досяжність магнітної картки"
 }
diff --git a/src/main/resources/assets/ae2wtlib/lang/zh_cn.json b/src/main/resources/assets/ae2wtlib/lang/zh_cn.json
@@ -22,9 +22,8 @@
   "gui.ae2wtlib.Magnet": "磁铁过滤器",
   "gui.ae2wtlib.whitelist": "白名单",
   "gui.ae2wtlib.blacklist": "黑名单",
-  "gui.ae2wtlib.pickup": "捡起",
-  "gui.ae2wtlib.insert": "插入",
-  "gui.ae2wtlib.filter": " 筛选：",
+  "gui.ae2wtlib.pickup_filter": "捡起 筛选：",
+  "gui.ae2wtlib.insert_filter": "插入 筛选：",
   "gui.ae2wtlib.copy_pickup": "复制到捡起",
   "gui.ae2wtlib.copy_insert": "复制到插入",
   "gui.ae2wtlib.switch": "切换过滤器",
@@ -41,10 +40,5 @@
 
   "text.autoconfig.de/mari_023/ae2wtlib.title": "AE2 无线终端",
 
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier": "超出范围的功率乘数",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "磁卡范围",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.enableTrinket": "使能 Trinkets 集成",
-
-  "text.autoconfig.de/mari_023/ae2wtlib.option.outOfRangePowerMultiplier.@Tooltip": "如果该值低于 1，则在某些情况下，处于无线接入点范围内会消耗更多功率。",
-  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange.@Tooltip": ""
+  "text.autoconfig.de/mari_023/ae2wtlib.option.magnetCardRange": "磁卡范围"
 }