fix: adjust & clear merge conflict issues

src/locales/en/translation.json

@@ -91,9 +91,7 @@
     "checking_files": "Checking files…",
     "starting_download": "Starting download…",
     "deleting": "Deleting files…",
-    "delete": "Remove all files",
-    "delete_modal_title": "Are you sure?",
-    "delete_modal_description": "This will remove all game files from your system."
+    "delete": "Remove all files"
   },
   "settings": {
     "downloads_path": "Downloads path",

src/locales/es/translation.json

@@ -91,9 +91,7 @@
     "checking_files": "Verificando archivos…",
     "starting_download": "Iniciando descarga…",
     "deleting": "Eliminando archivos…",
-    "delete": "Eliminar todos los archivos",
-    "delete_modal_title": "¿Estás seguro de esto?",
-    "delete_modal_description": "Esto eliminará todos los archivos del juego de tu sistema."
+    "delete": "Eliminar todos los archivos"
   },
   "settings": {
     "downloads_path": "Ruta de descarga",

src/locales/fr/translation.json

@@ -41,6 +41,7 @@
     "pause": "Pause",
     "cancel": "Annuler",
     "remove": "Supprimer",
+    "remove_from_list": "Retirer de la liste",
     "space_left_on_disk": "{{space}} restant sur le disque",
     "eta": "Conclusion dans {{eta}}",
     "downloading_metadata": "Téléchargement des métadonnées en cours…",
@@ -57,7 +58,9 @@
     "release_date": "Sorti le {{date}}",
     "publisher": "Édité par {{publisher}}",
     "copy_link_to_clipboard": "Copier le lien",
-    "copied_link_to_clipboard": "Lien copié"
+    "copied_link_to_clipboard": "Lien copié",
+    "delete_modal_title": "Êtes-vous sûr de cela?",
+    "delete_modal_description": "Cela effacera tous les fichiers de jeu de votre système"
   },
   "activation": {
     "title": "Activer Hydra",

src/locales/pt/translation.json

@@ -91,9 +91,7 @@
     "checking_files": "Verificando arquivos…",
     "starting_download": "Iniciando download…",
     "deleting": "Removendo arquivos…",
-    "delete": "Apagar arquivos",
-    "delete_modal_title": "Tem certeza disso?",
-    "delete_modal_description": "Isso apagará todos os arquivos do jogo de seu sistema."
+    "delete": "Apagar arquivos"
   },
   "settings": {
     "downloads_path": "Diretório dos downloads",

src/renderer/pages/downloads/downloads.tsx

@@ -187,7 +187,7 @@ export function Downloads() {
           theme="outline"
           disabled={deleting}
         >
-          {t("remove")}
+          {t("remove_from_list")}
         </Button>
       </>
     );

src/renderer/pages/game-details/hero-panel.tsx

@@ -9,6 +9,7 @@ import type { Game, ShopDetails } from "@types";
 
 import { formatDownloadProgress } from "@renderer/helpers";
 import { BinaryNotFoundModal } from "../shared-modals/binary-not-found-modal";
+import { DeleteModal } from "./delete-modal";
 import * as styles from "./hero-panel.css";
 
 export interface HeroPanelProps {