From 39a48f06f2427aca374d298ee36413613dfc32b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathis=20Dr=C3=B6ge?= Date: Sun, 5 Jan 2025 16:08:31 +0100 Subject: [PATCH 1/3] "Proton-GE" -> "GE-Proton" --- public/locales/ar/translation.json | 2 +- public/locales/be/translation.json | 2 +- public/locales/bg/translation.json | 2 +- public/locales/ca/translation.json | 2 +- public/locales/cs/translation.json | 2 +- public/locales/de/translation.json | 2 +- public/locales/en/translation.json | 4 ++-- public/locales/es/translation.json | 2 +- public/locales/et/translation.json | 2 +- public/locales/fr/translation.json | 2 +- public/locales/hu/translation.json | 2 +- public/locales/it/translation.json | 2 +- public/locales/ja/translation.json | 2 +- public/locales/ko/translation.json | 2 +- public/locales/lt/translation.json | 2 +- public/locales/nb_NO/translation.json | 2 +- public/locales/pl/translation.json | 2 +- public/locales/pt/translation.json | 2 +- public/locales/pt_BR/translation.json | 2 +- public/locales/ru/translation.json | 2 +- public/locales/sk/translation.json | 2 +- public/locales/sv/translation.json | 2 +- public/locales/tr/translation.json | 2 +- public/locales/uk/translation.json | 2 +- public/locales/zh_Hans/translation.json | 2 +- src/backend/utils.ts | 10 ++++----- src/backend/wine/manager/downloader/main.ts | 11 +++++----- .../wine/manager/downloader/utilities.ts | 4 +--- src/backend/wine/manager/utils.ts | 21 ++++++++++++------- src/common/types.ts | 2 +- src/frontend/screens/WineManager/index.tsx | 8 +++---- 31 files changed, 57 insertions(+), 51 deletions(-) diff --git a/public/locales/ar/translation.json b/public/locales/ar/translation.json index 040d01614b..f467c99eb0 100644 --- a/public/locales/ar/translation.json +++ b/public/locales/ar/translation.json @@ -911,7 +911,7 @@ "noResults": "لم تسفر التصنيفات الحالية عن أية نتائج." }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton هو نوع Proton تم إنشاؤه بواسطة Glorious Eggroll. من المفترض استخدامه في Steam، لكن بعض الألعاب خارج Steam قد تعمل بشكل أفضل مع هذا المتغير. ويوفر سجلات غير مجدية في الغالب لاستكشاف الأخطاء وإصلاحها.", + "proton-ge": "GE-Proton هو نوع Proton تم إنشاؤه بواسطة Glorious Eggroll. من المفترض استخدامه في Steam، لكن بعض الألعاب خارج Steam قد تعمل بشكل أفضل مع هذا المتغير. ويوفر سجلات غير مجدية في الغالب لاستكشاف الأخطاء وإصلاحها.", "wine-ge": "Wine-GE-Proton هو نوع من Wine تم إنشاؤه بواسطة Glorious Eggroll. إنه Wine الموصى باستخدامه خارج Steam. يوفر هذا سجلات مفيدة عند استكشاف الأخطاء وإصلاحها." }, "categories-manager": { diff --git a/public/locales/be/translation.json b/public/locales/be/translation.json index 4d6be232a8..97ca50ae87 100644 --- a/public/locales/be/translation.json +++ b/public/locales/be/translation.json @@ -905,7 +905,7 @@ "restore": "Аднавіць акно" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton - гэта варыянт Proton, створаны Glorious Eggroll. Ён прызначаны для выкарыстання ў Steam, але некаторыя гульні па-за Steam могуць працаваць лепш з гэтым варыянтам. Ён дае ў асноўным бескарысныя часопісы для выпраўлення непаладак.", + "proton-ge": "GE-Proton - гэта варыянт Proton, створаны Glorious Eggroll. Ён прызначаны для выкарыстання ў Steam, але некаторыя гульні па-за Steam могуць працаваць лепш з гэтым варыянтам. Ён дае ў асноўным бескарысныя часопісы для выпраўлення непаладак.", "wine-ge": "Wine-GE-Proton - гэта варыянт Wine, створаны Glorious Eggroll. Рэкамендуецца выкарыстоўваць Wine за межамі Steam. Гэта дае карысныя журналы пры выпраўленні непаладак." }, "emptyLibrary": { diff --git a/public/locales/bg/translation.json b/public/locales/bg/translation.json index d045c95377..2d4c7a0e08 100644 --- a/public/locales/bg/translation.json +++ b/public/locales/bg/translation.json @@ -948,7 +948,7 @@ "noResults": "Няма резултати от текущите филтри." }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton е вариант на Proton разработен от Glorious Eggroll. Той има за цел да бъде ползван в Steam, но някои игри извън Steam може да работят по-добре с този вариант. Журналите за отстраняване на грешки, които предоставя, са в голяма част неизползваеми.", + "proton-ge": "GE-Proton е вариант на Proton разработен от Glorious Eggroll. Той има за цел да бъде ползван в Steam, но някои игри извън Steam може да работят по-добре с този вариант. Журналите за отстраняване на грешки, които предоставя, са в голяма част неизползваеми.", "wine-ge": "Wine-GE-Proton е вариант на Wine разработен от Glorious Eggroll. Това е препоръчителният вариант на Wine, който да се ползва извън Steam. Той предоставя полезни журнали за отстраняване на грешки." }, "categories-manager": { diff --git a/public/locales/ca/translation.json b/public/locales/ca/translation.json index 137fc35205..9cb104d61c 100644 --- a/public/locales/ca/translation.json +++ b/public/locales/ca/translation.json @@ -941,7 +941,7 @@ "add-new-category": "Afegeix una categoria nova" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton és una variant del Proton creada per Glorious Eggroll. S'ha de fer servir amb l'Steam, però alguns jocs de fora de l'Steam també poden funcionar millor amb el Proton-GE-Proton. Proporciona registres generalment poc útils per a la solució de problemes.", + "proton-ge": "GE-Proton és una variant del Proton creada per Glorious Eggroll. S'ha de fer servir amb l'Steam, però alguns jocs de fora de l'Steam també poden funcionar millor amb el Proton-GE-Proton. Proporciona registres generalment poc útils per a la solució de problemes.", "wine-ge": "Wine-GE-Proton és una variant del Wine creada per Glorious Eggroll. És el Wine recomanat per a fer servir fora d'Steam. Proporciona registres útils per a la solució de problemes." }, "emptyLibrary": { diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json index 6fc41e940b..548dd52ec0 100644 --- a/public/locales/cs/translation.json +++ b/public/locales/cs/translation.json @@ -942,7 +942,7 @@ "add-new-category": "Přidat novou kategorii" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton je verze Protonu od vývojáře Glorious Eggroll. Je vytvořena k použití ve službě Steam, některé hry mimo síť služby Steam ale mohou s touto verzí lépe fungovat. Poskytuje převážně zbytečné protokoly pro ladění chyb.", + "proton-ge": "GE-Proton je verze Protonu od vývojáře Glorious Eggroll. Je vytvořena k použití ve službě Steam, některé hry mimo síť služby Steam ale mohou s touto verzí lépe fungovat. Poskytuje převážně zbytečné protokoly pro ladění chyb.", "wine-ge": "Wine-GE-Proton je verze Protonu od vývojáře Glorious Eggroll. Jedná se o doporučenou verzi Wine k použití mimo službu Steam. Poskytuje užitečné protokoly pro ladění chyb." }, "emptyLibrary": { diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index a998b9b233..085a1f654a 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -939,7 +939,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Proton ist eine Wine-Variation erstellt von Glorious Eggroll. Es ist gedacht zur Verwendung außerhalb von Steam. Zudem stellt es nützliche Fehlerprotokolle bereit.", - "proton-ge": "Proton-GE-Proton ist eine Variante von Proton, geschaffen von Glorious Eggroll. Obwohl diese Variante für Steam gedacht ist funktionieren einige Spiele außerhalb Steams trotzdem besser mit dieser. Es stellt jedoch größtenteils nutzlose Fehlerprotokolle bereit." + "proton-ge": "GE-Proton ist eine Variante von Proton, geschaffen von Glorious Eggroll. Obwohl diese Variante für Steam gedacht ist funktionieren einige Spiele außerhalb Steams trotzdem besser mit dieser. Es stellt jedoch größtenteils nutzlose Fehlerprotokolle bereit." }, "emptyLibrary": { "noGames": "Ihre Bibliothek ist leer. Sie können sich durch/bei einen Store <1>einloggen oder auf <3> klicken, um manuell ein Spiel hinzuzufügen.", diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index f01fe01866..7843e93976 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -911,8 +911,8 @@ "size": "Size" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).", - "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of Proton-GE with the UMU launcher." + "proton-ge": "GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).", + "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the UMU launcher." }, "winetricks": { "install": "Install", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index d684ba6661..817c0ffc4c 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -961,7 +961,7 @@ "confirm-remove": "Confirmar remoción de \"{{name}}\"" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton es una variante de Proton creada por Glorious Eggroll. Está diseñada para usarse en Steam, pero algunos juegos fuera de Steam podrían funcionar mejor con esta variante. Genera registros casi siempre inútiles para solucionar problemas.", + "proton-ge": "GE-Proton es una variante de Proton creada por Glorious Eggroll. Está diseñada para usarse en Steam, pero algunos juegos fuera de Steam podrían funcionar mejor con esta variante. Genera registros casi siempre inútiles para solucionar problemas.", "wine-ge": "Wine-GE-Proton es una variante de Wine creada por Glorious Eggroll. Es la versión de Wine para ser usada fuera de Steam. Genera registros útiles para solucionar problemas." } } diff --git a/public/locales/et/translation.json b/public/locales/et/translation.json index 3143df27cc..1cf5e170c4 100644 --- a/public/locales/et/translation.json +++ b/public/locales/et/translation.json @@ -944,7 +944,7 @@ "title": "Halda kategooriaid" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton on Protoni variant, mille lõi Glorious Eggroll. See on mõeldud Steami jaoks kasutamiseks, aga mõned Steami-välised mängud võivad sellega paremini töötada. Selle tõrkeotsingu logid on enamasti kasutud.", + "proton-ge": "GE-Proton on Protoni variant, mille lõi Glorious Eggroll. See on mõeldud Steami jaoks kasutamiseks, aga mõned Steami-välised mängud võivad sellega paremini töötada. Selle tõrkeotsingu logid on enamasti kasutud.", "wine-ge": "Wine-GE-Proton on Wine'i variant, mille lõi Glorious Eggroll. See on soovitatav Wine'i versioon, mida kasutada väljaspool Steami. Selle tõrkeotsingu logid on kasulikud ja asjakohased." }, "adtraction-locked": { diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 2a2ac4339d..65c5307474 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -941,7 +941,7 @@ "restore": "Restaurer la fenêtre" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton est une variante de Proton créée par Glorious Eggroll. Il est destiné à être utilisé par Steam, mais certains jeux extérieurs à Steam pourraient mieux fonctionner avec cette version. Il propose des rapports pour la plupart inutiles à la résolution des problèmes.", + "proton-ge": "GE-Proton est une variante de Proton créée par Glorious Eggroll. Il est destiné à être utilisé par Steam, mais certains jeux extérieurs à Steam pourraient mieux fonctionner avec cette version. Il propose des rapports pour la plupart inutiles à la résolution des problèmes.", "wine-ge": "Wine-GE-Proton est une variante de Wine créée par Glorious Eggroll. C'est la version de Wine recommandée pour un usage en dehors de Steam." }, "emptyLibrary": { diff --git a/public/locales/hu/translation.json b/public/locales/hu/translation.json index 2079074469..e79ede230a 100644 --- a/public/locales/hu/translation.json +++ b/public/locales/hu/translation.json @@ -944,7 +944,7 @@ "noResults": "A jelenlegi szűrők nem adtak találatokat." }, "wineExplanation": { - "proton-ge": "A Proton-GE-Proton egy olyan Proton változat, melyet Glorious Eggroll készít. Steam melletti használathoz készült, de egyes nem steames játékok is jobban működhetnek ezzel a változattal. Hibakereséshez többnyire haszontalan naplófájlokat biztosít.", + "proton-ge": "A GE-Proton egy olyan Proton változat, melyet Glorious Eggroll készít. Steam melletti használathoz készült, de egyes nem steames játékok is jobban működhetnek ezzel a változattal. Hibakereséshez többnyire haszontalan naplófájlokat biztosít.", "wine-ge": "A Wine-GE-Proton egy olyan Wine változat, melyet Glorious Eggroll készít. Ez az ajánlott Wine verzió a nem steames játékokhoz. Hasznos naplókat biztosít a hibakereséshez." }, "adtraction-locked": { diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index 0a4e9bab73..b445b0e699 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -952,7 +952,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Proton è una variante Wine creata da Glorious Eggroll. È il Wine consigliato da utilizzare al di fuori di Steam. Fornisce logs utili per la risoluzione dei problemi.", - "proton-ge": "Proton-GE-Proton è una variante di Proton creata da Glorious Eggroll. È pensato per essere utilizzato su Steam, ma alcuni giochi esterni a Steam potrebbero funzionare meglio con questa variante. Fornisce logs per lo più inutili per la risoluzione dei problemi." + "proton-ge": "GE-Proton è una variante di Proton creata da Glorious Eggroll. È pensato per essere utilizzato su Steam, ma alcuni giochi esterni a Steam potrebbero funzionare meglio con questa variante. Fornisce logs per lo più inutili per la risoluzione dei problemi." }, "adtraction-locked": { "description": "Sembra che il dominio track.adtraction.com non si sia caricato o sia bloccato. Con adtraction, ogni acquisto che fai nel GOG store supporta finanziariamente Heroic. Valuta di rimuovere il blocco se hai voglia di contribuire.", diff --git a/public/locales/ja/translation.json b/public/locales/ja/translation.json index 99691a4ac9..67f442e2a6 100644 --- a/public/locales/ja/translation.json +++ b/public/locales/ja/translation.json @@ -906,7 +906,7 @@ "restore": "ウィンドウの復元" }, "wineExplanation": { - "proton-ge": "Proton-GE-ProtonはGlorious Eggrollによって作成されたProtonの亜種です。Steamで使うことを想定していますが、Steam以外のゲームではこの亜種の方がうまく動くかもしれません。トラブルシューティングのためにほとんど役に立たないログを提供します。", + "proton-ge": "GE-ProtonはGlorious Eggrollによって作成されたProtonの亜種です。Steamで使うことを想定していますが、Steam以外のゲームではこの亜種の方がうまく動くかもしれません。トラブルシューティングのためにほとんど役に立たないログを提供します。", "wine-ge": "Wine-GE-ProtonはGlorious Eggrollによって作成されたWineの亜種です。Steam以外での使用を推奨するWineです。トラブルシューティング時に便利なログを提供します。" }, "categories-manager": { diff --git a/public/locales/ko/translation.json b/public/locales/ko/translation.json index 62396a6a30..1ebbaa9226 100644 --- a/public/locales/ko/translation.json +++ b/public/locales/ko/translation.json @@ -955,7 +955,7 @@ "description": "track.adtraction.com 도메인이 로드되지 않았거나 차단된 것 같습니다. Adtraction을 사용하면 GOG 스토어에서 구매하는 모든 상품이 Heroic을 재정적으로 지원합니다. 기여하고 싶다면 차단을 해제하는 것을 고려하세요." }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton은 Glorious Eggroll이 만든 프로톤 변형입니다. 스팀에서 사용하도록 만들어졌지만 스팀 외부의 일부 게임은 이 변형에서 더 잘 작동할 수 있습니다. 문제 해결을 위해 대부분 쓸모없는 로그를 제공합니다.", + "proton-ge": "GE-Proton은 Glorious Eggroll이 만든 프로톤 변형입니다. 스팀에서 사용하도록 만들어졌지만 스팀 외부의 일부 게임은 이 변형에서 더 잘 작동할 수 있습니다. 문제 해결을 위해 대부분 쓸모없는 로그를 제공합니다.", "wine-ge": "Wine-GE-Proton은 Glorious Eggroll이 만든 와인 변형입니다. 스팀 외부에서 사용하기에 권장되는 와인입니다. 이는 문제 해결 시 유용한 로그를 제공합니다." }, "emptyLibrary": { diff --git a/public/locales/lt/translation.json b/public/locales/lt/translation.json index 16ab568dda..8b01f6ea63 100644 --- a/public/locales/lt/translation.json +++ b/public/locales/lt/translation.json @@ -915,7 +915,7 @@ }, "wineExplanation": { "wine-ge": "„Wine-GE-Proton“ yra „Wine“ variantas sukurtas „Glorious Eggroll“. Yra rekomenduojamas „Wine“, nenaudojant „Steam“. Jis pateikia reikšmingus žurnalus derinimui.", - "proton-ge": "„Proton-GE-Proton“ yra „Proton“ variantas sukurtas „Glorious Eggroll“. Jis yra skirtas, naudojant „Steam“, bet kai kurie žaidimai, neveikiantys „Steam“ gali veikti geriau su šiuo variantu. Jis pateikia daugmaž nereikšmingus žurnalus derinimui." + "proton-ge": "„GE-Proton“ yra „Proton“ variantas sukurtas „Glorious Eggroll“. Jis yra skirtas, naudojant „Steam“, bet kai kurie žaidimai, neveikiantys „Steam“ gali veikti geriau su šiuo variantu. Jis pateikia daugmaž nereikšmingus žurnalus derinimui." }, "message": { "sync": "Sinchronizavimas baigtas", diff --git a/public/locales/nb_NO/translation.json b/public/locales/nb_NO/translation.json index 1f0b4d76ef..56219b4499 100644 --- a/public/locales/nb_NO/translation.json +++ b/public/locales/nb_NO/translation.json @@ -821,7 +821,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Proton er en Wine-variant laget av Glorious Eggroll. Det er den anbefalte Wine-versjonen for bruk utenfor Steam. Den gir nyttige logger ved feilsøking.", - "proton-ge": "Proton-GE-Proton er en Proton-variant opprettet av Glorious Eggroll. Den er ment for bruk i Steam, men noen spill utenfor Steam kan fungere bedre med denne varianten. Den gir stort sett ubrukelige logger for feilsøking." + "proton-ge": "GE-Proton er en Proton-variant opprettet av Glorious Eggroll. Den er ment for bruk i Steam, men noen spill utenfor Steam kan fungere bedre med denne varianten. Den gir stort sett ubrukelige logger for feilsøking." }, "adtraction-locked": { "dont-show-again": "Ikke vis denne advarselen igjen", diff --git a/public/locales/pl/translation.json b/public/locales/pl/translation.json index cc43e2e21a..e89266fbad 100644 --- a/public/locales/pl/translation.json +++ b/public/locales/pl/translation.json @@ -938,7 +938,7 @@ "new-category": "Nowa Kategoria" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton to wersja Proton stworzona przez Glorious Eggroll. Jest przeznaczona do użytku w Steam, lecz niektóre gry spoza Steam mogą działać lepiej przy użyciu tej wersji. W większości zapewnia bezużyteczne dzienniki do rozwiązywania problemów.", + "proton-ge": "GE-Proton to wersja Proton stworzona przez Glorious Eggroll. Jest przeznaczona do użytku w Steam, lecz niektóre gry spoza Steam mogą działać lepiej przy użyciu tej wersji. W większości zapewnia bezużyteczne dzienniki do rozwiązywania problemów.", "wine-ge": "Wine-GE-Proton to wersja Wine stworzona przez Glorious Eggroll. Jest to rekomendowana wersja Wine do użytku poza Steam. Zapewnia użyteczne dzienniki do rozwiązywania problemów." }, "emptyLibrary": { diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index 29232aab8a..0aaa3f1ea9 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -926,7 +926,7 @@ "noResults": "Os filtros atuais não produziram resultados." }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton é uma variante do Proton criada por Glorious Eggroll. Foi concebido para ser utilizado no Steam, mas alguns jogos fora do Steam podem funcionar melhor com esta variante. Fornece registos praticamente inúteis para solução de problemas.", + "proton-ge": "GE-Proton é uma variante do Proton criada por Glorious Eggroll. Foi concebido para ser utilizado no Steam, mas alguns jogos fora do Steam podem funcionar melhor com esta variante. Fornece registos praticamente inúteis para solução de problemas.", "wine-ge": "O Wine-GE-Proton é uma variante do Wine criada pela Glorious Eggroll. É o Wine recomendado para ser utilizado fora do Steam. Isto fornece registos úteis para solução de problemas." } } diff --git a/public/locales/pt_BR/translation.json b/public/locales/pt_BR/translation.json index c35ef3f1c7..b6145e0b4b 100644 --- a/public/locales/pt_BR/translation.json +++ b/public/locales/pt_BR/translation.json @@ -946,7 +946,7 @@ "noGames": "Sua biblioteca está vazia. Você pode <1>log in usando a loja ou clicar <3> para adicionar um manualmente." }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton é uma variante Proton criada por Glorious Eggroll. É feita para ser usada na Steam, mas alguns jogos fora da Steam podem funcionar melhor com essa variante. Ela fornece logs majoritariamente inúteis para solução de problemas.", + "proton-ge": "GE-Proton é uma variante Proton criada por Glorious Eggroll. É feita para ser usada na Steam, mas alguns jogos fora da Steam podem funcionar melhor com essa variante. Ela fornece logs majoritariamente inúteis para solução de problemas.", "wine-ge": "Wine-GE-Proton é uma variante Wine criada por Glorious Eggroll. É o Wine recomendado para ser usado fora da Steam. Ele fornece logs úteis para solução de problemas." }, "categories-manager": { diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 5454bcf1ff..99c0419475 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -961,7 +961,7 @@ "rename": "Переименовать «{{name}}»" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton - это вариант Proton, созданный Glorious Eggroll. Он предназначен для использования в Steam, но некоторые игры за пределами Steam могут работать лучше с этим вариантом. Он предоставляет в основном бесполезные для устранения неполадок логи.", + "proton-ge": "GE-Proton - это вариант Proton, созданный Glorious Eggroll. Он предназначен для использования в Steam, но некоторые игры за пределами Steam могут работать лучше с этим вариантом. Он предоставляет в основном бесполезные для устранения неполадок логи.", "wine-ge": "Wine-GE-Proton - это вариант Wine, созданный Glorious Eggroll. Это рекомендуемый Wine для использования вне Steam. Эта версия может предоставить полезные логи при устранении неполадок." } } diff --git a/public/locales/sk/translation.json b/public/locales/sk/translation.json index 7464565e2b..5ecbaa2570 100644 --- a/public/locales/sk/translation.json +++ b/public/locales/sk/translation.json @@ -940,7 +940,7 @@ "maximize": "Maximalizovať okno" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton je variant Proton vytvorený spoločnosťou Glorious Eggroll. Je určený na použitie v službe Steam, ale niektoré hry mimo služby Steam môžu s týmto variantom fungovať lepšie. Poskytuje väčšinou zbytočné protokoly na riešenie problémov.", + "proton-ge": "GE-Proton je variant Proton vytvorený spoločnosťou Glorious Eggroll. Je určený na použitie v službe Steam, ale niektoré hry mimo služby Steam môžu s týmto variantom fungovať lepšie. Poskytuje väčšinou zbytočné protokoly na riešenie problémov.", "wine-ge": "Wine-GE-Proton je variant Winu vytvorený spoločnosťou Glorious Eggroll. Je to odporúčaný Wine na použitie mimo služby Steam. To poskytuje užitočné protokoly pri riešení problémov." }, "categories-manager": { diff --git a/public/locales/sv/translation.json b/public/locales/sv/translation.json index 1ad4fec595..70750400df 100644 --- a/public/locales/sv/translation.json +++ b/public/locales/sv/translation.json @@ -941,7 +941,7 @@ "warning": "Varning" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton är en Proton-variant skapad av Glorious Eggroll. Den är tänkt att användas för Steam, men vissa spel utanför Steam kan fungera bättre med denna variant. Den ger mestadels värdelösa loggar för felsökning.", + "proton-ge": "GE-Proton är en Proton-variant skapad av Glorious Eggroll. Den är tänkt att användas för Steam, men vissa spel utanför Steam kan fungera bättre med denna variant. Den ger mestadels värdelösa loggar för felsökning.", "wine-ge": "Wine-GE-Proton är en Wine variant skapad av Glorious Eggroll. Det är den rekommenderade wine som ska användas utanför Steam. Detta ger användbara loggar vid felsökning." }, "emptyLibrary": { diff --git a/public/locales/tr/translation.json b/public/locales/tr/translation.json index c1433ba755..cb43408b96 100644 --- a/public/locales/tr/translation.json +++ b/public/locales/tr/translation.json @@ -951,7 +951,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Proton Glorious Eggroll tarafından yapılmış bir Wine varyasyonudur. Steam dışında kullanılması önerilen Wine'dır. Sorun giderme sırasında kullanışlı hata günlükleri sağlar.", - "proton-ge": "Proton-GE-Proton Glorious Eggroll tarafından yapılmış bir Proton varyasyonudur. Steam'de kullanılmak üzere tasarlanmış olsa da, bazı Steam dışı oyunlar bu varyant ile daha iyi çalışabilir. Sorun giderme için genellikle işe yaramaz hata günlükleri sağlar." + "proton-ge": "GE-Proton Glorious Eggroll tarafından yapılmış bir Proton varyasyonudur. Steam'de kullanılmak üzere tasarlanmış olsa da, bazı Steam dışı oyunlar bu varyant ile daha iyi çalışabilir. Sorun giderme için genellikle işe yaramaz hata günlükleri sağlar." }, "categories-manager": { "add-placeholder": "Yeni kategori ekle", diff --git a/public/locales/uk/translation.json b/public/locales/uk/translation.json index 3f9c71897a..1ed810a56f 100644 --- a/public/locales/uk/translation.json +++ b/public/locales/uk/translation.json @@ -947,7 +947,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Proton – це варіант Wine, створений Glorious Eggroll. Це рекомендований варіант Wine для використання поза Steam. Це забезпечить корисними журналами помилок під час усунення несправностей.", - "proton-ge": "Proton-GE-Proton – це варіант Proton, створений Glorious Eggroll. Він призначений для використання у Steam, але деякі ігри за межами Steam можуть працювати краще з цим варіантом. Він надає переважно марні журнали для пошуку та усунення несправностей." + "proton-ge": "GE-Proton – це варіант Proton, створений Glorious Eggroll. Він призначений для використання у Steam, але деякі ігри за межами Steam можуть працювати краще з цим варіантом. Він надає переважно марні журнали для пошуку та усунення несправностей." }, "adtraction-locked": { "description": "Схоже, що домен track.adtraction.com не може бути завантажений або він заблокований. Завдяки застосунку, будь-яка покупка, яку ви робите в магазині GOG, підтримує команду Heroic фінансово. Розгляньте можливість зняття блокування, якщо ви хочете зробити свій внесок.", diff --git a/public/locales/zh_Hans/translation.json b/public/locales/zh_Hans/translation.json index a53a9e21e2..2429cd3333 100644 --- a/public/locales/zh_Hans/translation.json +++ b/public/locales/zh_Hans/translation.json @@ -943,7 +943,7 @@ }, "wineExplanation": { "wine-ge": "Wine-GE-Protonis 是 Glorious Eggroll 创建的 Wine 变体。它是建议用于 Steam 之外的 Wine 版本，提供对故障排除有用的日志。", - "proton-ge": "Proton-GE-Proton 是 Glorious Eggroll 创建的 Proton 变体。该变体意在用于 Steam 中，但某些 Steam 之外的游戏也许可以和它更好地配合。它提供大多是用于故障排除的无用日志。" + "proton-ge": "GE-Proton 是 Glorious Eggroll 创建的 Proton 变体。该变体意在用于 Steam 中，但某些 Steam 之外的游戏也许可以和它更好地配合。它提供大多是用于故障排除的无用日志。" }, "emptyLibrary": { "noResults": "使用当前筛选器找不到结果。", diff --git a/src/backend/utils.ts b/src/backend/utils.ts index d7950a98c0..453b59ff6f 100644 --- a/src/backend/utils.ts +++ b/src/backend/utils.ts @@ -917,15 +917,15 @@ export async function downloadDefaultWine() { await updateWineVersionInfos(true) // get list of wines on wineDownloaderInfoStore const availableWine = wineDownloaderInfoStore.get('wine-releases', []) - // use Proton-GE type if on Linux and GamePortingToolkit if on Mac - const release = availableWine.filter((version) => { + // use GE-Proton type if on Linux and GamePortingToolkit if on Mac + const release = availableWine.find((version) => { if (isLinux) { - return version.version.includes('Proton-GE-Proton') + return version.type === 'GE-Proton' } else if (isMac) { - return version.version.includes('Game-Porting-Toolkit') + return version.type === 'Game-Porting-Toolkit' } return false - })[0] + }) if (!release) { logError('Could not find default wine version', LogPrefix.Backend) diff --git a/src/backend/wine/manager/downloader/main.ts b/src/backend/wine/manager/downloader/main.ts index 37fe55e5e9..6d54227417 100644 --- a/src/backend/wine/manager/downloader/main.ts +++ b/src/backend/wine/manager/downloader/main.ts @@ -18,7 +18,7 @@ import { WINESTAGINGMACOS_URL, GPTK_URL } from './constants' -import { VersionInfo, Repositorys } from 'common/types' +import { VersionInfo, Repositorys, WineVersionInfo } from 'common/types' import { fetchReleases, getFolderSize, @@ -68,7 +68,7 @@ async function getAvailableVersions({ case Repositorys.PROTONGE: { await fetchReleases({ url: PROTONGE_URL, - type: 'Proton-GE', + type: 'GE-Proton', count: count }) .then((fetchedReleases: VersionInfo[]) => { @@ -163,7 +163,7 @@ async function getAvailableVersions({ } interface installProps { - versionInfo: VersionInfo + versionInfo: WineVersionInfo installDir: string overwrite?: boolean onProgress?: (state: WineManagerStatus) => void @@ -173,7 +173,7 @@ interface installProps { /** * Installs a given version to the given installation directory. * - * @param versionInfo the version to install as {@link VersionInfo} + * @param versionInfo the version to install * @param installDir absolute path to installation directory * @param overwrite allow overwriting existing version installation * @defaultValue false @@ -198,7 +198,8 @@ async function installVersion({ const tarFile = installDir + '/' + versionInfo.download.split('/').slice(-1)[0] - const installSubDir = installDir + '/' + versionInfo.version + const installSubDir = + versionInfo.installDir ?? installDir + '/' + versionInfo.version const sourceChecksum = versionInfo.checksum ? ( await axiosClient.get(versionInfo.checksum, { diff --git a/src/backend/wine/manager/downloader/utilities.ts b/src/backend/wine/manager/downloader/utilities.ts index 4b94498735..703bd11572 100644 --- a/src/backend/wine/manager/downloader/utilities.ts +++ b/src/backend/wine/manager/downloader/utilities.ts @@ -14,10 +14,8 @@ interface fetchProps { function getVersionName(type: string, tag_name: string): string { if (type.includes('Wine')) { return `Wine-${tag_name}` - } else if (type.includes('Toolkit')) { - return `${tag_name}` } else { - return `Proton-${tag_name}` + return tag_name } } diff --git a/src/backend/wine/manager/utils.ts b/src/backend/wine/manager/utils.ts index 55e17f9fc5..ca14e16e93 100644 --- a/src/backend/wine/manager/utils.ts +++ b/src/backend/wine/manager/utils.ts @@ -5,12 +5,7 @@ import { existsSync, mkdirSync, rmSync } from 'graceful-fs' import { logError, logInfo, LogPrefix, logWarning } from '../../logger/logger' -import { - WineVersionInfo, - Repositorys, - VersionInfo, - WineManagerStatus -} from 'common/types' +import { WineVersionInfo, Repositorys, WineManagerStatus } from 'common/types' import { getAvailableVersions, installVersion } from './downloader/main' import { toolsPath, isMac } from '../../constants' @@ -57,6 +52,18 @@ async function updateWineVersionInfos( old_releases.forEach((old) => { const index = releases.findIndex((release) => { + if (release.type === 'GE-Proton') { + // The "Proton" prefix got dropped from the version string. We still + // want to detect old versions though + if (`Proton-${release.version}` === old.version) return true + // -latest is an even more special case, since it got renamed from + // "Proton-GE-latest" to "GE-Proton-latest" + if ( + release.version === 'GE-Proton-latest' && + old.version === 'Proton-GE-latest' + ) + return true + } return release?.version === old?.version }) @@ -130,7 +137,7 @@ async function installWineVersion( try { const response = await installVersion({ - versionInfo: release as VersionInfo, + versionInfo: release, installDir, overwrite: release.hasUpdate, onProgress: onProgress, diff --git a/src/common/types.ts b/src/common/types.ts index 36bcb0f216..f1286f8566 100644 --- a/src/common/types.ts +++ b/src/common/types.ts @@ -683,7 +683,7 @@ export interface WikiInfo { */ export type Type = | 'Wine-GE' - | 'Proton-GE' + | 'GE-Proton' | 'Proton' | 'Wine-Lutris' | 'Wine-Kron4ek' diff --git a/src/frontend/screens/WineManager/index.tsx b/src/frontend/screens/WineManager/index.tsx index cd81c40e7f..22253472e0 100644 --- a/src/frontend/screens/WineManager/index.tsx +++ b/src/frontend/screens/WineManager/index.tsx @@ -46,7 +46,7 @@ export default function WineManager(): JSX.Element | null { const isLinux = platform === 'linux' const protonge: WineManagerUISettings = { - type: 'Proton-GE', + type: 'GE-Proton', value: 'protonge', enabled: isLinux } @@ -117,17 +117,17 @@ export default function WineManager(): JSX.Element | null { {t( 'wineExplanation.wine-ge', - 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of Proton-GE with the UMU launcher.' + 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the UMU launcher.' )} ) - case 'Proton-GE': + case 'GE-Proton': return (
{t( 'wineExplanation.proton-ge', - 'Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).' + 'GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).' )}
) From 891c407b46f0d2fedcce42ee85a4255c60f638fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathis=20Dr=C3=B6ge?= Date: Sun, 5 Jan 2025 16:14:39 +0100 Subject: [PATCH 2/3] "UMU" -> "umu" --- public/locales/be/translation.json | 2 +- public/locales/bg/translation.json | 2 +- public/locales/ca/translation.json | 2 +- public/locales/cs/translation.json | 2 +- public/locales/de/translation.json | 2 +- public/locales/en/translation.json | 6 +++--- public/locales/es/translation.json | 2 +- public/locales/et/translation.json | 2 +- public/locales/fr/translation.json | 2 +- public/locales/hu/translation.json | 2 +- public/locales/it/translation.json | 2 +- public/locales/ja/translation.json | 2 +- public/locales/ko/translation.json | 2 +- public/locales/lt/translation.json | 2 +- public/locales/pl/translation.json | 2 +- public/locales/pt/translation.json | 2 +- public/locales/pt_BR/translation.json | 2 +- public/locales/ru/translation.json | 2 +- public/locales/sk/translation.json | 2 +- public/locales/sv/translation.json | 2 +- public/locales/tr/translation.json | 2 +- public/locales/uk/translation.json | 2 +- public/locales/zh_Hans/translation.json | 2 +- src/frontend/screens/Settings/components/DisableUMU.tsx | 2 +- src/frontend/screens/WineManager/index.tsx | 4 ++-- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/public/locales/be/translation.json b/public/locales/be/translation.json index 97ca50ae87..78cc87d4a3 100644 --- a/public/locales/be/translation.json +++ b/public/locales/be/translation.json @@ -675,7 +675,7 @@ "enableNewDesign": "Новы дызайн", "automaticWinetricksFixes": "Аўтаматычнае ўжыванне вядомых выпраўленняў", "enableHelp": "Кампанент даведкі", - "umuSupport": "Выкарыстоўваць UMU у якасці асяроддзя выканання Proton" + "umuSupport": "Выкарыстоўваць umu у якасці асяроддзя выканання Proton" }, "disablePlaytimeSync": "Адключыць сінхранізацыю часу прайгравання", "frameless-window": { diff --git a/public/locales/bg/translation.json b/public/locales/bg/translation.json index 2d4c7a0e08..db8f9bf58c 100644 --- a/public/locales/bg/translation.json +++ b/public/locales/bg/translation.json @@ -707,7 +707,7 @@ "enableNewDesign": "Нов дизайн", "enableHelp": "Помощен компонент", "automaticWinetricksFixes": "Автоматично прилагане на известните поправки", - "umuSupport": "Използване на UMU като среда за изпълнение на Proton", + "umuSupport": "Използване на umu като среда за изпълнение на Proton", "cometSupport": "Поддръжка на Comet" }, "disablePlaytimeSync": "Изключване на синхронизирането на игралното време", diff --git a/public/locales/ca/translation.json b/public/locales/ca/translation.json index 9cb104d61c..747b8aab62 100644 --- a/public/locales/ca/translation.json +++ b/public/locales/ca/translation.json @@ -711,7 +711,7 @@ "automaticWinetricksFixes": "Aplica les correccions conegudes de manera automàtica", "enableHelp": "Component d'ajuda", "cometSupport": "Suport Comet", - "umuSupport": "Fes servir UMU com a execució Proton" + "umuSupport": "Fes servir umu com a execució Proton" }, "frameless-window": { "confirmation": { diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json index 548dd52ec0..82dc6bb851 100644 --- a/public/locales/cs/translation.json +++ b/public/locales/cs/translation.json @@ -710,7 +710,7 @@ "enableNewDesign": "Nový design", "enableHelp": "Komponenta nápovědy", "automaticWinetricksFixes": "Automaticky použít známé opravy", - "umuSupport": "Použít UMU jako runtime Protonu", + "umuSupport": "Použít umu jako runtime Protonu", "cometSupport": "Podpora Comet" }, "disablePlaytimeSync": "Zakázat synchronizaci času hraní", diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index 085a1f654a..08177fbbdf 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -708,7 +708,7 @@ "enableNewDesign": "Neues Design", "automaticWinetricksFixes": "Bekannte Winetricks Hilfsskripte automatisch anwenden", "enableHelp": "Hilfe aktivieren", - "umuSupport": "UMU als Proton Laufzeit verwenden", + "umuSupport": "umu als Proton Laufzeit verwenden", "cometSupport": "Comet Support" }, "frameless-window": { diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7843e93976..9de10c9c9f 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -605,7 +605,7 @@ "disable_controller": "Disable Heroic navigation using controller", "disable_logs": "Disable Logs", "disablePlaytimeSync": "Disable playtime synchronization", - "disableUMU": "Disable UMU", + "disableUMU": "Disable umu", "discordRPC": "Enable Discord Rich Presence", "download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)", "dxvkfpslimit": "Limit FPS (DX9, 10 and 11)", @@ -911,8 +911,8 @@ "size": "Size" }, "wineExplanation": { - "proton-ge": "GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).", - "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the UMU launcher." + "proton-ge": "GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the umu launcher (default in Heroic).", + "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the umu launcher." }, "winetricks": { "install": "Install", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index 817c0ffc4c..f98bda54de 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -709,7 +709,7 @@ "enableHelp": "Componente de ayuda", "automaticWinetricksFixes": "Aplicar correcciones conocidas automáticamente", "cometSupport": "Soporte para Comet", - "umuSupport": "Usar UMU como entorno de ejecución de Proton" + "umuSupport": "Usar umu como entorno de ejecución de Proton" }, "disablePlaytimeSync": "Desactivar la sincronización del tiempo de juego", "frameless-window": { diff --git a/public/locales/et/translation.json b/public/locales/et/translation.json index 1cf5e170c4..641cbf3794 100644 --- a/public/locales/et/translation.json +++ b/public/locales/et/translation.json @@ -714,7 +714,7 @@ "enableHelp": "Abi komponent", "enableNewDesign": "Uus disain", "automaticWinetricksFixes": "Rakenda teadaolevad parandused automaatselt", - "umuSupport": "Kasuta UMU-d Protoni platvormina", + "umuSupport": "Kasuta umu-d Protoni platvormina", "cometSupport": "Comet tugi" }, "before-launch-script-path": "Vali skript, mida käitada enne mängu käivitamist", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 65c5307474..1e47cdd19f 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -711,7 +711,7 @@ "enableHelp": "Composant d'Aide", "automaticWinetricksFixes": "Appliquer les corrections connues automatiquement", "cometSupport": "Intégration de Comet", - "umuSupport": "Utiliser UMU comme moteur de Proton" + "umuSupport": "Utiliser umu comme moteur de Proton" }, "frameless-window": { "confirmation": { diff --git a/public/locales/hu/translation.json b/public/locales/hu/translation.json index e79ede230a..bfcf4e7335 100644 --- a/public/locales/hu/translation.json +++ b/public/locales/hu/translation.json @@ -722,7 +722,7 @@ "automaticWinetricksFixes": "Ismert javítások automatikus alkalmazása", "enableHelp": "Súgó összetevő", "cometSupport": "Comet támogatás", - "umuSupport": "Az UMU használata Proton futtatókörnyezetként" + "umuSupport": "Az umu használata Proton futtatókörnyezetként" }, "msync": "Az Msync engedélyezése", "allow_installation_broken_anticheat": { diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index b445b0e699..5a5895bfdf 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -708,7 +708,7 @@ "automaticWinetricksFixes": "Applica correzioni note automaticamente", "enableHelp": "Componente aiuto", "cometSupport": "Supporto Comet", - "umuSupport": "Utilizza UMU come runtime Proton" + "umuSupport": "Utilizza umu come runtime Proton" }, "allow_installation_broken_anticheat": { "label": "Permetti l'installazione dei giochi con l'anticheat bloccato o non funzionante", diff --git a/public/locales/ja/translation.json b/public/locales/ja/translation.json index 67f442e2a6..962191bb0a 100644 --- a/public/locales/ja/translation.json +++ b/public/locales/ja/translation.json @@ -688,7 +688,7 @@ "enableHelp": "ヘルプコンポーネント", "automaticWinetricksFixes": "既存の修正を自動的に適用", "cometSupport": "Cometサポート", - "umuSupport": "UMUをProtonのランタイムとして使用" + "umuSupport": "umuをProtonのランタイムとして使用" }, "msync": "Esyncを有効にする", "allow_installation_broken_anticheat": { diff --git a/public/locales/ko/translation.json b/public/locales/ko/translation.json index 1ebbaa9226..800fd98f16 100644 --- a/public/locales/ko/translation.json +++ b/public/locales/ko/translation.json @@ -725,7 +725,7 @@ "enableHelp": "도움말 구성 요소", "automaticWinetricksFixes": "알려진 수정 사항을 자동으로 적용", "cometSupport": "코멧 지원", - "umuSupport": "UMU를 프로톤 런타임으로 사용" + "umuSupport": "umu를 프로톤 런타임으로 사용" }, "gamescope": { "enableUpscaling": "업스케일링 가능", diff --git a/public/locales/lt/translation.json b/public/locales/lt/translation.json index 8b01f6ea63..cb4ed00136 100644 --- a/public/locales/lt/translation.json +++ b/public/locales/lt/translation.json @@ -441,7 +441,7 @@ "enableHelp": "Pagalbos komponentas", "automaticWinetricksFixes": "Automatiškai pritaikyti žinomus sutaisymus", "cometSupport": "„Comet“ palaikymas", - "umuSupport": "Naudoti „UMU“ kaip „Pronton“ vykdantįjį" + "umuSupport": "Naudoti „umu“ kaip „Pronton“ vykdantįjį" }, "crossover-version": "„Crossover“/„Wine“ versija", "default-install-path": "Numatytas įdiegimo kelias", diff --git a/public/locales/pl/translation.json b/public/locales/pl/translation.json index e89266fbad..22d1f7d4b8 100644 --- a/public/locales/pl/translation.json +++ b/public/locales/pl/translation.json @@ -708,7 +708,7 @@ "automaticWinetricksFixes": "Zastosuj znane poprawki automatycznie", "enableHelp": "Element pomocy", "cometSupport": "Wsparcie Comet", - "umuSupport": "Używanie UMU jako środowiska uruchomieniowego Proton" + "umuSupport": "Używanie umu jako środowiska uruchomieniowego Proton" }, "frameless-window": { "confirmation": { diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index 0aaa3f1ea9..fde7395793 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -674,7 +674,7 @@ "enableNewDesign": "Novo design", "enableHelp": "Ajuda de componente", "automaticWinetricksFixes": "Aplicar correções conhecidas automaticamente", - "umuSupport": "Utilize UMU como runtime do Proton", + "umuSupport": "Utilize umu como runtime do Proton", "cometSupport": "Suporte Comet" }, "frameless-window": { diff --git a/public/locales/pt_BR/translation.json b/public/locales/pt_BR/translation.json index b6145e0b4b..5d6f96d5ea 100644 --- a/public/locales/pt_BR/translation.json +++ b/public/locales/pt_BR/translation.json @@ -710,7 +710,7 @@ "enableNewDesign": "Novo design", "automaticWinetricksFixes": "Aplicar correções conhecidas automaticamente", "enableHelp": "Componente de ajuda", - "umuSupport": "Usar UMU como Proton runtime", + "umuSupport": "Usar umu como Proton runtime", "cometSupport": "Suporte ao Comet" }, "disablePlaytimeSync": "Desativar a sincronização do tempo de jogo", diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 99c0419475..ea456e8009 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -709,7 +709,7 @@ "enableHelp": "Компонент Справки", "automaticWinetricksFixes": "Автоматическое применение известных исправлений", "cometSupport": "Поддержка Comet", - "umuSupport": "Использовать UMU как среду Proton" + "umuSupport": "Использовать umu как среду Proton" }, "disablePlaytimeSync": "Отключить синхронизацию времени воспроизведения", "frameless-window": { diff --git a/public/locales/sk/translation.json b/public/locales/sk/translation.json index 5ecbaa2570..9232e8da69 100644 --- a/public/locales/sk/translation.json +++ b/public/locales/sk/translation.json @@ -715,7 +715,7 @@ "enableNewDesign": "Nový Dizajn", "automaticWinetricksFixes": "Automaticky použiť známe opravy", "cometSupport": "Podpora", - "umuSupport": "Použite UMU ako Proton runtime" + "umuSupport": "Použite umu ako Proton runtime" }, "frameless-window": { "confirmation": { diff --git a/public/locales/sv/translation.json b/public/locales/sv/translation.json index 70750400df..bd737e1a9a 100644 --- a/public/locales/sv/translation.json +++ b/public/locales/sv/translation.json @@ -710,7 +710,7 @@ "enableNewDesign": "Ny design", "enableHelp": "Hjälp komponent", "automaticWinetricksFixes": "Tillämpa kända fixar automatiskt", - "umuSupport": "Använd UMU som Proton körtid", + "umuSupport": "Använd umu som Proton körtid", "cometSupport": "Comet stöd" }, "frameless-window": { diff --git a/public/locales/tr/translation.json b/public/locales/tr/translation.json index cb43408b96..6b82fb789e 100644 --- a/public/locales/tr/translation.json +++ b/public/locales/tr/translation.json @@ -711,7 +711,7 @@ "enableHelp": "Yardım bileşeni", "automaticWinetricksFixes": "Bilinen düzeltmeleri kendiliğinden uygula", "cometSupport": "Comet desteği", - "umuSupport": "Proton çalışma zamanı olarak UMU kullan" + "umuSupport": "Proton çalışma zamanı olarak umu kullan" }, "frameless-window": { "confirmation": { diff --git a/public/locales/uk/translation.json b/public/locales/uk/translation.json index 1ed810a56f..2239e3bf11 100644 --- a/public/locales/uk/translation.json +++ b/public/locales/uk/translation.json @@ -711,7 +711,7 @@ "enableHelp": "Компонент допомоги", "automaticWinetricksFixes": "Автоматично застосовувати відомі виправлення", "cometSupport": "Підтримка Comet", - "umuSupport": "Використовувати UMU як середовище виконання Proton" + "umuSupport": "Використовувати umu як середовище виконання Proton" }, "disablePlaytimeSync": "Вимкнути синхронізацію часу відтворення", "frameless-window": { diff --git a/public/locales/zh_Hans/translation.json b/public/locales/zh_Hans/translation.json index 2429cd3333..79ceac546c 100644 --- a/public/locales/zh_Hans/translation.json +++ b/public/locales/zh_Hans/translation.json @@ -710,7 +710,7 @@ "enableNewDesign": "新设计", "enableHelp": "帮助组件", "automaticWinetricksFixes": "自动应用已知的修复", - "umuSupport": "将 UMU 用作 Proton 运行时", + "umuSupport": "将 umu 用作 Proton 运行时", "cometSupport": "Comet 支持" }, "disablePlaytimeSync": "停用游戏时间同步", diff --git a/src/frontend/screens/Settings/components/DisableUMU.tsx b/src/frontend/screens/Settings/components/DisableUMU.tsx index c26ce03178..3dd95ce2a6 100644 --- a/src/frontend/screens/Settings/components/DisableUMU.tsx +++ b/src/frontend/screens/Settings/components/DisableUMU.tsx @@ -23,7 +23,7 @@ const DisableUMU = () => { htmlId="disableUMU" value={disableUMU} handleChange={() => setDisableUMU(!disableUMU)} - title={t('setting.disableUMU', 'Disable UMU')} + title={t('setting.disableUMU', 'Disable umu')} /> ) } diff --git a/src/frontend/screens/WineManager/index.tsx b/src/frontend/screens/WineManager/index.tsx index 22253472e0..e250e78551 100644 --- a/src/frontend/screens/WineManager/index.tsx +++ b/src/frontend/screens/WineManager/index.tsx @@ -117,7 +117,7 @@ export default function WineManager(): JSX.Element | null { {t( 'wineExplanation.wine-ge', - 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the UMU launcher.' + 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the umu launcher.' )} ) @@ -127,7 +127,7 @@ export default function WineManager(): JSX.Element | null { {t( 'wineExplanation.proton-ge', - 'GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).' + 'GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the umu launcher (default in Heroic).' )} ) From 49427a4d30a447ddf6a5bb8175e55b72e3d2da00 Mon Sep 17 00:00:00 2001 From: Ariel Juodziukynas Date: Wed, 15 Jan 2025 00:11:08 -0300 Subject: [PATCH 3/3] Display Wine Selector names as GE-Proton to match Wine Manager, even if stored with the old name. --- .../screens/Settings/components/WineVersionSelector.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/screens/Settings/components/WineVersionSelector.tsx b/src/frontend/screens/Settings/components/WineVersionSelector.tsx index 4a0b67a092..0a474a7cb9 100644 --- a/src/frontend/screens/Settings/components/WineVersionSelector.tsx +++ b/src/frontend/screens/Settings/components/WineVersionSelector.tsx @@ -104,7 +104,9 @@ export default function WineVersionSelector() { } > {altWine.map(({ name }, i) => ( - + ))} )