From 704ef377f99527ace2ae6d61248d94ea2139837a Mon Sep 17 00:00:00 2001
From: Frutescens <info@laptop>
Date: Tue, 25 Jun 2024 22:54:49 -0700
Subject: [PATCH] Resolving merge conflict

---
 src/locales/en/challenges.ts | 87 ++++++++++--------------------------
 1 file changed, 23 insertions(+), 64 deletions(-)

diff --git a/src/locales/en/challenges.ts b/src/locales/en/challenges.ts
index b7dbe2f89a4..b76091fefa8 100644
--- a/src/locales/en/challenges.ts
+++ b/src/locales/en/challenges.ts
@@ -1,67 +1,26 @@
-import { SimpleTranslationEntries } from "#app/plugins/i18n";
+import { TranslationEntries } from "#app/interfaces/locales.js";
 
-export const challenges: SimpleTranslationEntries = {
+export const challenges: TranslationEntries = {
   "title": "Challenge Modifiers",
-  "start": "Start",
-  "illegalEvolution": "{{pokemon}} changed into an ineligble pokemon\nfor this challenge!",
-  "singleGeneration.name": "Mono Gen",
-  "singleGeneration.value.0": "Off",
-  "singleGeneration.desc.0": "You can only use pokemon from the chosen generation.",
-  "singleGeneration.value.1": "Gen 1",
-  "singleGeneration.desc.1": "You can only use pokemon from Generation I",
-  "singleGeneration.value.2": "Gen 2",
-  "singleGeneration.desc.2": "You can only use pokemon from Generation II.",
-  "singleGeneration.value.3": "Gen 3",
-  "singleGeneration.desc.3": "You can only use pokemon from Generation III.",
-  "singleGeneration.value.4": "Gen 4",
-  "singleGeneration.desc.4": "You can only use pokemon from Generation IV.",
-  "singleGeneration.value.5": "Gen 5",
-  "singleGeneration.desc.5": "You can only use pokemon from Generation V.",
-  "singleGeneration.value.6": "Gen 6",
-  "singleGeneration.desc.6": "You can only use pokemon from Generation VI.",
-  "singleGeneration.value.7": "Gen 7",
-  "singleGeneration.desc.7": "You can only use pokemon from Generation VII.",
-  "singleGeneration.value.8": "Gen 8",
-  "singleGeneration.desc.8": "You can only use pokemon from Generation VIII.",
-  "singleGeneration.value.9": "Gen 9",
-  "singleGeneration.desc.9": "You can only use pokemon from Generation IX.",
-  "singleType.name": "Mono Type",
-  "singleType.value.0": "Off",
-  "singleType.desc.0": "You can only use pokemon of the chosen type.",
-  "singleType.value.1": "Normal",
-  "singleType.desc.1": "You can only use pokemon with the Normal type.",
-  "singleType.value.2": "Fighting",
-  "singleType.desc.2": "You can only use pokemon with the Fighting type.",
-  "singleType.value.3": "Flying",
-  "singleType.desc.3": "You can only use pokemon with the Flying type.",
-  "singleType.value.4": "Poison",
-  "singleType.desc.4": "You can only use pokemon with the Poison type.",
-  "singleType.value.5": "Ground",
-  "singleType.desc.5": "You can only use pokemon with the Ground type.",
-  "singleType.value.6": "Rock",
-  "singleType.desc.6": "You can only use pokemon with the Rock type.",
-  "singleType.value.7": "Bug",
-  "singleType.desc.7": "You can only use pokemon with the Bug type.",
-  "singleType.value.8": "Ghost",
-  "singleType.desc.8": "You can only use pokemon with the Ghost type.",
-  "singleType.value.9": "Steel",
-  "singleType.desc.9": "You can only use pokemon with the Steel type.",
-  "singleType.value.10": "Fire",
-  "singleType.desc.10": "You can only use pokemon with the Fire type.",
-  "singleType.value.11": "Water",
-  "singleType.desc.11": "You can only use pokemon with the Water type.",
-  "singleType.value.12": "Grass",
-  "singleType.desc.12": "You can only use pokemon with the Grass type.",
-  "singleType.value.13": "Electric",
-  "singleType.desc.13": "You can only use pokemon with the Electric type.",
-  "singleType.value.14": "Psychic",
-  "singleType.desc.14": "You can only use pokemon with the Psychic type.",
-  "singleType.value.15": "Ice",
-  "singleType.desc.15": "You can only use pokemon with the Ice type.",
-  "singleType.value.16": "Dragon",
-  "singleType.desc.16": "You can only use pokemon with the Dragon type.",
-  "singleType.value.17": "Dark",
-  "singleType.desc.17": "You can only use pokemon with the Dark type.",
-  "singleType.value.18": "Fairy",
-  "singleType.desc.18": "You can only use pokemon with the Fairy type.",
+  "illegalEvolution": "{{pokemon}} changed into an ineligble pokémon\nfor this challenge!",
+  "singleGeneration": {
+    "name": "Mono Gen",
+    "desc": "You can only use Pokémon from Generation {{gen}}.",
+    "desc_default": "You can only use Pokémon from the chosen generation.",
+    "gen_1": "I",
+    "gen_2": "II",
+    "gen_3": "III",
+    "gen_4": "IV",
+    "gen_5": "V",
+    "gen_6": "VI",
+    "gen_7": "VII",
+    "gen_8": "VIII",
+    "gen_9": "IX",
+  },
+  "singleType": {
+    "name": "Mono Type",
+    "desc": "You can only use Pokémon with the {{type}} type.",
+    "desc_default": "You can only use Pokémon of the chosen type."
+    //types in pokemon-info
+  },
 } as const;