From 1143ac8e69f18ba565e74528fc9e7dd4f1e1520d Mon Sep 17 00:00:00 2001 From: Nippy Date: Fri, 25 Sep 2026 17:47:46 +0200 Subject: update szep.25 calamares fix --- raveos-calamares-theme/PKGBUILD | 10 +++- .../etc/calamares/branding/raveos/finishedq.qml | 30 +++--------- .../branding/raveos/lang/calamares-raveos_de.ts | 55 ++++++++++++++++++++++ .../branding/raveos/lang/calamares-raveos_en.ts | 55 ++++++++++++++++++++++ .../branding/raveos/lang/calamares-raveos_hu.ts | 55 ++++++++++++++++++++++ 5 files changed, 181 insertions(+), 24 deletions(-) create mode 100644 raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_de.ts create mode 100644 raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_en.ts create mode 100644 raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_hu.ts (limited to 'raveos-calamares-theme') diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD index e30ae5a..b08218d 100644 --- a/raveos-calamares-theme/PKGBUILD +++ b/raveos-calamares-theme/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: nippy pkgname=raveos-calamares-theme pkgver=2.0.0 -pkgrel=62 +pkgrel=64 pkgdesc="RaveOS Calamares Theme" arch=('any') url="https://git.rp1.hu/RaveOS" @@ -27,4 +27,12 @@ package() { install -Dm755 "${startdir}/etc/calamares/modules/raveos-chown-homes.sh" \ "${pkgdir}/etc/calamares/modules/raveos-chown-homes.sh" + + # Branding fordítások: .ts -> .qm (lrelease) + local lrelease_bin + lrelease_bin="$(command -v lrelease6 || command -v lrelease || echo /usr/lib/qt6/bin/lrelease)" + for ts in "${startdir}"/etc/calamares/branding/raveos/lang/calamares-raveos_*.ts; do + [ -e "$ts" ] || continue + "${lrelease_bin}" "$ts" -qm "${pkgdir}/etc/calamares/branding/raveos/lang/$(basename "${ts%.ts}").qm" + done } diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml b/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml index 7032bad..256edb2 100644 --- a/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml +++ b/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml @@ -5,7 +5,8 @@ * Sok nev eseten automatikusan lapoz (4s). A lista: supporters.js (import). * Ha nincs nev, a teljes tamogatoi panel el van rejtve. * - * Nyelvek: hu / de / en (Qt.locale() alapjan). + * Nyelvek: hu / de / en. A szovegek qsTr()-rel mennek, a branding + * calamares-raveos_.qm fordításokat a RaveWelcome tolti be. */ import io.calamares.core 1.0 @@ -26,19 +27,6 @@ Item { readonly property bool hasSupporters: Supporters.names.length > 0 readonly property int supportersPageCount: Math.max(1, Math.ceil(Supporters.names.length / supportersPerPage)) - // Aktualis nyelv: hu / de / en - readonly property string uiLang: { - var n = Qt.locale().name; - if (n.indexOf("hu") === 0) return "hu"; - if (n.indexOf("de") === 0) return "de"; - return "en"; - } - - // Forditas: t(hu, de, en) - function t(hu, de, en) { - return uiLang === "hu" ? hu : (uiLang === "de" ? de : en); - } - property int supportersPage: 0 // Az aktualis oldal szovege: soronkent 3 nev, kozepre igazitva @@ -85,7 +73,7 @@ Item { font.family: "Ubuntu" font.pixelSize: 26 font.bold: true - text: finishedRoot.t("A telepítés befejeződött", "Installation abgeschlossen", "Installation complete") + text: qsTr("Installation complete") } Text { @@ -95,15 +83,13 @@ Item { font.family: "Ubuntu" font.pixelSize: 15 wrapMode: Text.WordWrap - text: finishedRoot.t("Indítsd újra a rendszert a %1 használatához.".arg(Branding.string(Branding.ProductName)), - "Starten Sie das System neu, um %1 zu verwenden.".arg(Branding.string(Branding.ProductName)), - "Restart the system to start using %1.".arg(Branding.string(Branding.ProductName))) + text: qsTr("Restart the system to start using %1.").arg(Branding.string(Branding.ProductName)) } Button { id: restartButton Layout.alignment: Qt.AlignHCenter - text: finishedRoot.t("Újraindítás most", "Jetzt neu starten", "Restart now") + text: qsTr("Restart now") hoverEnabled: true onClicked: config.doRestart(true) @@ -152,7 +138,7 @@ Item { font.family: "Ubuntu" font.pixelSize: 15 font.bold: true - text: finishedRoot.t("RaveOS támogatók", "RaveOS-Unterstützer", "RaveOS Supporters") + text: qsTr("RaveOS Supporters") } Text { @@ -187,9 +173,7 @@ Item { font.pixelSize: 13 font.italic: true wrapMode: Text.WordWrap - text: finishedRoot.t("Köszönjük a támogatást, a csapat minden tagja nevében!", - "Vielen Dank für die Unterstützung, im Namen aller Teammitglieder!", - "Thank you for your support, from every member of the team!") + text: qsTr("Thank you for your support, from every member of the team!") } } } diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_de.ts b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_de.ts new file mode 100644 index 0000000..1d68d57 --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_de.ts @@ -0,0 +1,55 @@ + + + + + finishedq + + Installation complete + Installation abgeschlossen + + + Restart the system to start using %1. + Starten Sie das System neu, um %1 zu verwenden. + + + Restart now + Jetzt neu starten + + + RaveOS Supporters + RaveOS-Unterstützer + + + Thank you for your support, from every member of the team! + Vielen Dank für die Unterstützung, im Namen aller Teammitglieder! + + + + CalamaresWindow + + &Restart + @button + &Neu starten + + + Restart the computer + @tooltip + Den Computer neu starten + + + + raveos + + Restart the computer? + Computer neu starten? + + + Restart + Neu starten + + + Cancel + Abbrechen + + + diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_en.ts b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_en.ts new file mode 100644 index 0000000..cb44e1c --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_en.ts @@ -0,0 +1,55 @@ + + + + + finishedq + + Installation complete + Installation complete + + + Restart the system to start using %1. + Restart the system to start using %1. + + + Restart now + Restart now + + + RaveOS Supporters + RaveOS Supporters + + + Thank you for your support, from every member of the team! + Thank you for your support, from every member of the team! + + + + CalamaresWindow + + &Restart + @button + &Restart + + + Restart the computer + @tooltip + Restart the computer + + + + raveos + + Restart the computer? + Restart the computer? + + + Restart + Restart + + + Cancel + Cancel + + + diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_hu.ts b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_hu.ts new file mode 100644 index 0000000..27eddfa --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/branding/raveos/lang/calamares-raveos_hu.ts @@ -0,0 +1,55 @@ + + + + + finishedq + + Installation complete + A telepítés befejeződött + + + Restart the system to start using %1. + Indítsd újra a rendszert a %1 használatához. + + + Restart now + Újraindítás most + + + RaveOS Supporters + RaveOS támogatók + + + Thank you for your support, from every member of the team! + Köszönjük a támogatást, a csapat minden tagja nevében! + + + + CalamaresWindow + + &Restart + @button + &Újraindítás + + + Restart the computer + @tooltip + A számítógép újraindítása + + + + raveos + + Restart the computer? + Újraindítod a számítógépet? + + + Restart + Újraindítás + + + Cancel + Mégse + + + -- cgit v1.3