PublicMirrors/hydra
1
0
Fork 0
mirror of https://github.com/hydralauncher/hydra.git synced 2025-02-03 08:43:48 +03:00
Code Issues Actions 1 Packages Projects Releases 1 Wiki Activity

fix: adjust & clear merge conflict issues

Browse Source
This commit is contained in:
Guilherme Viana 2024-04-15 09:37:19 -03:00
parent 109b3ac3be
commit 5f05cb25b2
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/locales/en/translation.json
View File

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

4
src/locales/es/translation.json
View File

@ -91,9 +91,7 @@
"checking_files": "Verificando archivos…", "checking_files": "Verificando archivos…",
"starting_download": "Iniciando descarga…", "starting_download": "Iniciando descarga…",
"deleting": "Eliminando archivos…", "deleting": "Eliminando archivos…",
"delete": "Eliminar todos los 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."
}, },
"settings": { "settings": {
"downloads_path": "Ruta de descarga", "downloads_path": "Ruta de descarga",

5
src/locales/fr/translation.json
View File

@ -41,6 +41,7 @@
"pause": "Pause", "pause": "Pause",
"cancel": "Annuler", "cancel": "Annuler",
"remove": "Supprimer", "remove": "Supprimer",
"remove_from_list": "Retirer de la liste",
"space_left_on_disk": "{{space}} restant sur le disque", "space_left_on_disk": "{{space}} restant sur le disque",
"eta": "Conclusion dans {{eta}}", "eta": "Conclusion dans {{eta}}",
"downloading_metadata": "Téléchargement des métadonnées en cours…", "downloading_metadata": "Téléchargement des métadonnées en cours…",
@ -57,7 +58,9 @@
"release_date": "Sorti le {{date}}", "release_date": "Sorti le {{date}}",
"publisher": "Édité par {{publisher}}", "publisher": "Édité par {{publisher}}",
"copy_link_to_clipboard": "Copier le lien", "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": { "activation": {
"title": "Activer Hydra", "title": "Activer Hydra",

4
src/locales/pt/translation.json
View File

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

2
src/renderer/pages/downloads/downloads.tsx
View File

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

1
src/renderer/pages/game-details/hero-panel.tsx
View File

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