diff --git a/calamares/etc/calamares/branding/openmamba/desktop-gnome-300x225.jpg b/calamares/etc/calamares/branding/openmamba/desktop-gnome-300x225.jpg deleted file mode 100644 index 130aa32..0000000 Binary files a/calamares/etc/calamares/branding/openmamba/desktop-gnome-300x225.jpg and /dev/null differ diff --git a/calamares/etc/calamares/branding/openmamba/desktop-kde-300x225.jpg b/calamares/etc/calamares/branding/openmamba/desktop-kde-300x225.jpg deleted file mode 100644 index 5ffee90..0000000 Binary files a/calamares/etc/calamares/branding/openmamba/desktop-kde-300x225.jpg and /dev/null differ diff --git a/calamares/etc/calamares/branding/openmamba/desktop-kde.png b/calamares/etc/calamares/branding/openmamba/desktop-kde.png new file mode 100644 index 0000000..5f428c0 Binary files /dev/null and b/calamares/etc/calamares/branding/openmamba/desktop-kde.png differ diff --git a/calamares/etc/calamares/branding/openmamba/desktop-lxde-300x225.jpg b/calamares/etc/calamares/branding/openmamba/desktop-lxde-300x225.jpg deleted file mode 100644 index dd0f4a7..0000000 Binary files a/calamares/etc/calamares/branding/openmamba/desktop-lxde-300x225.jpg and /dev/null differ diff --git a/calamares/etc/calamares/branding/openmamba/desktop-lxqt.png b/calamares/etc/calamares/branding/openmamba/desktop-lxqt.png new file mode 100644 index 0000000..efc6a6d Binary files /dev/null and b/calamares/etc/calamares/branding/openmamba/desktop-lxqt.png differ diff --git a/calamares/etc/calamares/branding/openmamba/lang/calamares-openmamba_it.ts b/calamares/etc/calamares/branding/openmamba/lang/calamares-openmamba_it.ts index 1642917..b092460 100644 --- a/calamares/etc/calamares/branding/openmamba/lang/calamares-openmamba_it.ts +++ b/calamares/etc/calamares/branding/openmamba/lang/calamares-openmamba_it.ts @@ -1,6 +1,6 @@ - + show @@ -26,18 +26,18 @@ - openmamba with LXDE - openmamba con LXDE + openmamba with LXQt + openmamba con LXQt - openmamba system with a simple and light desktop. - Il sistema openmamba con un desktop semplice e leggero. + openmamba with a lightweight desktop environment. + openmamba con un ambiente desktop leggero. - For server installation or desktop on obsolete PC, embedded systems, tablet, single-board PC. - Per installazioni di server o di desktop su PC obsoleti, sistemi embedded, tablet e computer single-board. + For server installations or desktop on old PCs, embedded systems, tablet, single-board PC. + Per installazioni di server o di desktop su PC datati, sistemi embedded, tablets e PC single-board. diff --git a/calamares/etc/calamares/branding/openmamba/show.qml b/calamares/etc/calamares/branding/openmamba/show.qml index 2c4d391..39da3f6 100644 --- a/calamares/etc/calamares/branding/openmamba/show.qml +++ b/calamares/etc/calamares/branding/openmamba/show.qml @@ -32,67 +32,75 @@ Presentation Slide { Image { - id: background01 + id: background1 source: "background.jpg" width: 1920; height: 1200 fillMode: Image.PreserveAspectFit anchors.centerIn: parent } - Image { - id: background1 - source: "desktop-kde-300x225.jpg" - width: 300; height: 225 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: parent.top + id: text1 + anchors.horizontalCenter: parent.horizontalCenter + y: -80 text: "

" + qsTr("Thanks for choosing openmamba!") + "



" wrapMode: Text.WordWrap horizontalAlignment: Text.Center } + Image { + id: image1 + source: "desktop-kde.png" + width: 500 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: text1.bottom + } Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: background1.bottom + width:650 + anchors.horizontalCenter: image1.horizontalCenter + anchors.top: image1.bottom text: "
" + qsTr("openmamba with KDE Plasma") + "

" + qsTr("The most evolved and complete desktop system of openmamba, KDE Plasma based.") + "
"+ qsTr("For every user who wants a modern, multimedia and productive desktop.") + "
" wrapMode: Text.WordWrap horizontalAlignment: Text.Center + font.pointSize: 10 } } Slide { Image { - id: background02 + id: background2 source: "background.jpg" width: 1920; height: 1200 fillMode: Image.PreserveAspectFit anchors.centerIn: parent } - Image { - id: background2 - source: "desktop-lxde-300x225.jpg" - width: 300; height: 225 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } Text { - anchors.horizontalCenter: background2.horizontalCenter - anchors.top: parent.top + id: text2 + anchors.horizontalCenter: parent.horizontalCenter + y: -80 text: "

" + qsTr("Thanks for choosing openmamba!") + "



" wrapMode: Text.WordWrap horizontalAlignment: Text.Center } + Image { + id: image2 + source: "desktop-lxqt.png" + width: 500 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: text2.bottom + } Text { - anchors.horizontalCenter: background2.horizontalCenter - anchors.top: background2.bottom - text: "
" + qsTr("openmamba with LXDE") + "

" + - qsTr("openmamba system with a simple and light desktop.") + "
" + - qsTr("For server installation or desktop on obsolete PC, embedded systems, tablet, single-board PC.") + "
" + width:650 + anchors.horizontalCenter: image2.horizontalCenter + anchors.top: image2.bottom + text: "
" + qsTr("openmamba with LXQt") + "

" + + qsTr("openmamba with a lightweight desktop environment.") + "
" + + qsTr("For server installations or desktop on old PCs, embedded systems, tablet, single-board PC.") + "
" wrapMode: Text.WordWrap horizontalAlignment: Text.Center + font.pointSize: 10 } } diff --git a/update-ts.sh b/update-ts.sh new file mode 100755 index 0000000..82b607c --- /dev/null +++ b/update-ts.sh @@ -0,0 +1,6 @@ +#!/bin/bash +LANGS="it" + +for lang in $LANGS; do +lupdate-qt5 -no-obsolete calamares -target-language ${lang} -ts calamares/etc/calamares/branding/openmamba/lang/calamares-openmamba_${lang}.ts +done