Merge branch 'development' into 3.2.x-stable
This commit is contained in:
commit
574ba783ad
@ -61,6 +61,10 @@ Name[eu]=Sistema instalatu
|
|||||||
Icon[eu]=calamares
|
Icon[eu]=calamares
|
||||||
GenericName[eu]=Sistema instalatzailea
|
GenericName[eu]=Sistema instalatzailea
|
||||||
Comment[eu]=Calamares - sistema instalatzailea
|
Comment[eu]=Calamares - sistema instalatzailea
|
||||||
|
Name[fa]=نصب سامانه
|
||||||
|
Icon[fa]=کالامارس
|
||||||
|
GenericName[fa]=نصبکنندهٔ سامانه
|
||||||
|
Comment[fa]=کالامارس — نصبکنندهٔ سامانه
|
||||||
Name[es_PR]=Instalar el sistema
|
Name[es_PR]=Instalar el sistema
|
||||||
Name[fr]=Installer le système
|
Name[fr]=Installer le système
|
||||||
Icon[fr]=calamares
|
Icon[fr]=calamares
|
||||||
|
@ -102,7 +102,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/calamares/DebugWindow.ui" line="106"/>
|
<location filename="../src/calamares/DebugWindow.ui" line="106"/>
|
||||||
<source>Reload Stylesheet</source>
|
<source>Reload Stylesheet</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Recargar Hoja de estilo</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/calamares/DebugWindow.ui" line="113"/>
|
<location filename="../src/calamares/DebugWindow.ui" line="113"/>
|
||||||
@ -120,7 +120,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
|
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
|
||||||
<source>Set up</source>
|
<source>Set up</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Instalar</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
|
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
|
||||||
@ -138,7 +138,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/JobExample.cpp" line="40"/>
|
<location filename="../src/libcalamares/JobExample.cpp" line="40"/>
|
||||||
<source>Programmed job failure was explicitly requested.</source>
|
<source>Programmed job failure was explicitly requested.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Se solicitó de manera explícita la falla del trabajo programado.</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -154,7 +154,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/JobExample.cpp" line="27"/>
|
<location filename="../src/libcalamares/JobExample.cpp" line="27"/>
|
||||||
<source>Example job (%1)</source>
|
<source>Example job (%1)</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Ejemplo de trabajo (%1)</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -162,12 +162,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
|
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
|
||||||
<source>Run command '%1' in target system.</source>
|
<source>Run command '%1' in target system.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Ejecutar el comando '% 1' en el sistema de destino.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
|
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
|
||||||
<source> Run command '%1'.</source>
|
<source> Run command '%1'.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Ejecutar el comando '% 1'.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/ProcessJob.cpp" line="59"/>
|
<location filename="../src/libcalamares/ProcessJob.cpp" line="59"/>
|
||||||
@ -213,17 +213,17 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="76"/>
|
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="76"/>
|
||||||
<source>Loading ...</source>
|
<source>Loading ...</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Cargando ...</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="97"/>
|
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="97"/>
|
||||||
<source>QML Step <i>%1</i>.</source>
|
<source>QML Step <i>%1</i>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Paso QML <i>%1</i>.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="261"/>
|
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="261"/>
|
||||||
<source>Loading failed.</source>
|
<source>Loading failed.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>La carga ha fallado.</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -231,9 +231,9 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="164"/>
|
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="164"/>
|
||||||
<source>Waiting for %n module(s).</source>
|
<source>Waiting for %n module(s).</source>
|
||||||
<translation type="unfinished">
|
<translation>
|
||||||
<numerusform/>
|
<numerusform>Esperando %n módulo (s).</numerusform>
|
||||||
<numerusform/>
|
<numerusform>Esperando %n módulo(s).</numerusform>
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
@ -247,7 +247,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="170"/>
|
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="170"/>
|
||||||
<source>System-requirements checking is complete.</source>
|
<source>System-requirements checking is complete.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>La verificación de los requisitos del sistema está completa.</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -255,7 +255,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
|
||||||
<source>Setup Failed</source>
|
<source>Setup Failed</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Configuración Fallida</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
|
||||||
@ -265,7 +265,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="154"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="154"/>
|
||||||
<source>Would you like to paste the install log to the web?</source>
|
<source>Would you like to paste the install log to the web?</source>
|
||||||
<translation type="unfinished"/>
|
<translation>¿Desea pegar el registro de instalación en la web?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/>
|
||||||
@ -292,12 +292,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
|
||||||
<source>Install Log Paste URL</source>
|
<source>Install Log Paste URL</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Pegar URL Registro de Instalación</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="195"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="195"/>
|
||||||
<source>The upload was unsuccessful. No web-paste was done.</source>
|
<source>The upload was unsuccessful. No web-paste was done.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>La carga no tuvo éxito. No se realizó pegado web.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="211"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="211"/>
|
||||||
@ -322,12 +322,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/>
|
||||||
<source>Continue with installation?</source>
|
<source>Continue with installation?</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Continuar con la instalación?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="330"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="330"/>
|
||||||
<source>The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong></source>
|
<source>The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong></source>
|
||||||
<translation type="unfinished"/>
|
<translation>El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</strong></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/>
|
||||||
@ -337,7 +337,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
|
||||||
<source>&Set up now</source>
|
<source>&Set up now</source>
|
||||||
<translation type="unfinished"/>
|
<translation>&Configurar ahora</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
|
||||||
@ -352,7 +352,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
|
||||||
<source>&Set up</source>
|
<source>&Set up</source>
|
||||||
<translation type="unfinished"/>
|
<translation>&Instalar</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
|
||||||
@ -362,7 +362,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
|
||||||
<source>Setup is complete. Close the setup program.</source>
|
<source>Setup is complete. Close the setup program.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>La instalación se ha completado. Cierre el instalador.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1838,7 +1838,7 @@ The installer will quit and all changes will be lost.</source>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/>
|
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/>
|
||||||
<source>Office</source>
|
<source>Office</source>
|
||||||
<translation>辦公室</translation>
|
<translation>辦公</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/>
|
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/>
|
||||||
@ -3619,7 +3619,7 @@ Output:
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/welcome/WelcomePage.ui" line="185"/>
|
<location filename="../src/modules/welcome/WelcomePage.ui" line="185"/>
|
||||||
<source>Open release notes website</source>
|
<source>Open release notes website</source>
|
||||||
<translation>開啟發行手記網站</translation>
|
<translation>開啟發行記事網站</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/welcome/WelcomePage.ui" line="188"/>
|
<location filename="../src/modules/welcome/WelcomePage.ui" line="188"/>
|
||||||
|
Binary file not shown.
@ -9,6 +9,7 @@
|
|||||||
# Guido Grasso <cuquiman97@gmail.com>, 2018
|
# Guido Grasso <cuquiman97@gmail.com>, 2018
|
||||||
# Adolfo Jayme-Barrientos, 2019
|
# Adolfo Jayme-Barrientos, 2019
|
||||||
# Miguel Mayol <mitcoes@gmail.com>, 2020
|
# Miguel Mayol <mitcoes@gmail.com>, 2020
|
||||||
|
# Pier Jose Gotta Perez <piegope@protonmail.com>, 2020
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -17,7 +18,7 @@ msgstr ""
|
|||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
||||||
"Last-Translator: Miguel Mayol <mitcoes@gmail.com>, 2020\n"
|
"Last-Translator: Pier Jose Gotta Perez <piegope@protonmail.com>, 2020\n"
|
||||||
"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
|
"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -100,11 +101,11 @@ msgstr "Falló la sincronización mediante rsync con el código de error {}."
|
|||||||
|
|
||||||
#: src/modules/unpackfs/main.py:302
|
#: src/modules/unpackfs/main.py:302
|
||||||
msgid "Unpacking image {}/{}, file {}/{}"
|
msgid "Unpacking image {}/{}, file {}/{}"
|
||||||
msgstr ""
|
msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:317
|
#: src/modules/unpackfs/main.py:317
|
||||||
msgid "Starting to unpack {}"
|
msgid "Starting to unpack {}"
|
||||||
msgstr ""
|
msgstr "Iniciando el desempaquetado {}"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
|
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
|
||||||
msgid "Failed to unpack image \"{}\""
|
msgid "Failed to unpack image \"{}\""
|
||||||
@ -137,6 +138,8 @@ msgstr "Configuración de \"unsquash\" no válida"
|
|||||||
#: src/modules/unpackfs/main.py:423
|
#: src/modules/unpackfs/main.py:423
|
||||||
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
|
||||||
|
"actual"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:427
|
#: src/modules/unpackfs/main.py:427
|
||||||
msgid "The source filesystem \"{}\" does not exist"
|
msgid "The source filesystem \"{}\" does not exist"
|
||||||
|
Binary file not shown.
@ -3,6 +3,9 @@
|
|||||||
# This file is distributed under the same license as the PACKAGE package.
|
# This file is distributed under the same license as the PACKAGE package.
|
||||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||||
#
|
#
|
||||||
|
# Translators:
|
||||||
|
# Danial Behzadi <dani.behzi@ubuntu.com>, 2020
|
||||||
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -10,6 +13,7 @@ msgstr ""
|
|||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
||||||
|
"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>, 2020\n"
|
||||||
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
|
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -20,30 +24,30 @@ msgstr ""
|
|||||||
#: src/modules/packages/main.py:59 src/modules/packages/main.py:68
|
#: src/modules/packages/main.py:59 src/modules/packages/main.py:68
|
||||||
#: src/modules/packages/main.py:78
|
#: src/modules/packages/main.py:78
|
||||||
msgid "Install packages."
|
msgid "Install packages."
|
||||||
msgstr ""
|
msgstr "نصب بستهها."
|
||||||
|
|
||||||
#: src/modules/packages/main.py:66
|
#: src/modules/packages/main.py:66
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Processing packages (%(count)d / %(total)d)"
|
msgid "Processing packages (%(count)d / %(total)d)"
|
||||||
msgstr ""
|
msgstr "در حال پردازش بستهها (%(count)d/%(total)d)"
|
||||||
|
|
||||||
#: src/modules/packages/main.py:71
|
#: src/modules/packages/main.py:71
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Installing one package."
|
msgid "Installing one package."
|
||||||
msgid_plural "Installing %(num)d packages."
|
msgid_plural "Installing %(num)d packages."
|
||||||
msgstr[0] ""
|
msgstr[0] "در حال نصب یک بسته."
|
||||||
msgstr[1] ""
|
msgstr[1] "در حال نصب %(num)d بسته."
|
||||||
|
|
||||||
#: src/modules/packages/main.py:74
|
#: src/modules/packages/main.py:74
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Removing one package."
|
msgid "Removing one package."
|
||||||
msgid_plural "Removing %(num)d packages."
|
msgid_plural "Removing %(num)d packages."
|
||||||
msgstr[0] ""
|
msgstr[0] "در حال برداشتن یک بسته."
|
||||||
msgstr[1] ""
|
msgstr[1] "در حال برداشتن %(num)d بسته."
|
||||||
|
|
||||||
#: src/modules/networkcfg/main.py:37
|
#: src/modules/networkcfg/main.py:37
|
||||||
msgid "Saving network configuration."
|
msgid "Saving network configuration."
|
||||||
msgstr ""
|
msgstr "در حال ذخیرهٔ پیکربندی شبکه."
|
||||||
|
|
||||||
#: src/modules/networkcfg/main.py:48 src/modules/initcpiocfg/main.py:205
|
#: src/modules/networkcfg/main.py:48 src/modules/initcpiocfg/main.py:205
|
||||||
#: src/modules/initcpiocfg/main.py:209 src/modules/openrcdmcryptcfg/main.py:78
|
#: src/modules/initcpiocfg/main.py:209 src/modules/openrcdmcryptcfg/main.py:78
|
||||||
@ -53,142 +57,146 @@ msgstr ""
|
|||||||
#: src/modules/fstab/main.py:338 src/modules/initramfscfg/main.py:94
|
#: src/modules/fstab/main.py:338 src/modules/initramfscfg/main.py:94
|
||||||
#: src/modules/initramfscfg/main.py:98 src/modules/rawfs/main.py:171
|
#: src/modules/initramfscfg/main.py:98 src/modules/rawfs/main.py:171
|
||||||
msgid "Configuration Error"
|
msgid "Configuration Error"
|
||||||
msgstr ""
|
msgstr "خطای پیکربندی"
|
||||||
|
|
||||||
#: src/modules/networkcfg/main.py:49 src/modules/initcpiocfg/main.py:210
|
#: src/modules/networkcfg/main.py:49 src/modules/initcpiocfg/main.py:210
|
||||||
#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/localecfg/main.py:145
|
#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/localecfg/main.py:145
|
||||||
#: src/modules/luksopenswaphookcfg/main.py:100 src/modules/fstab/main.py:339
|
#: src/modules/luksopenswaphookcfg/main.py:100 src/modules/fstab/main.py:339
|
||||||
#: src/modules/initramfscfg/main.py:99
|
#: src/modules/initramfscfg/main.py:99
|
||||||
msgid "No root mount point is given for <pre>{!s}</pre> to use."
|
msgid "No root mount point is given for <pre>{!s}</pre> to use."
|
||||||
msgstr ""
|
msgstr "هیچ نقطهٔ اتّصال ریشهای برای استفادهٔ <pre>{!s}</pre> داده نشده."
|
||||||
|
|
||||||
#: src/modules/umount/main.py:40
|
#: src/modules/umount/main.py:40
|
||||||
msgid "Unmount file systems."
|
msgid "Unmount file systems."
|
||||||
msgstr ""
|
msgstr "پیاده کردن سامانههای پرونده."
|
||||||
|
|
||||||
#: src/modules/initcpiocfg/main.py:37
|
#: src/modules/initcpiocfg/main.py:37
|
||||||
msgid "Configuring mkinitcpio."
|
msgid "Configuring mkinitcpio."
|
||||||
msgstr ""
|
msgstr "پیکربندی mkinitcpio."
|
||||||
|
|
||||||
#: src/modules/initcpiocfg/main.py:206 src/modules/openrcdmcryptcfg/main.py:79
|
#: src/modules/initcpiocfg/main.py:206 src/modules/openrcdmcryptcfg/main.py:79
|
||||||
#: src/modules/mount/main.py:146 src/modules/luksopenswaphookcfg/main.py:96
|
#: src/modules/mount/main.py:146 src/modules/luksopenswaphookcfg/main.py:96
|
||||||
#: src/modules/fstab/main.py:333 src/modules/initramfscfg/main.py:95
|
#: src/modules/fstab/main.py:333 src/modules/initramfscfg/main.py:95
|
||||||
#: src/modules/rawfs/main.py:172
|
#: src/modules/rawfs/main.py:172
|
||||||
msgid "No partitions are defined for <pre>{!s}</pre> to use."
|
msgid "No partitions are defined for <pre>{!s}</pre> to use."
|
||||||
msgstr ""
|
msgstr "هیچ افرازی برای استفادهٔ <pre>{!s}</pre> تعریف نشده."
|
||||||
|
|
||||||
#: src/modules/openrcdmcryptcfg/main.py:34
|
#: src/modules/openrcdmcryptcfg/main.py:34
|
||||||
msgid "Configuring OpenRC dmcrypt service."
|
msgid "Configuring OpenRC dmcrypt service."
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:44
|
#: src/modules/unpackfs/main.py:44
|
||||||
msgid "Filling up filesystems."
|
msgid "Filling up filesystems."
|
||||||
msgstr ""
|
msgstr "در حال پر کردن سامانهپروندهها."
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:257
|
#: src/modules/unpackfs/main.py:257
|
||||||
msgid "rsync failed with error code {}."
|
msgid "rsync failed with error code {}."
|
||||||
msgstr ""
|
msgstr "آرسینک با رمز خطای {} شکست خورد."
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:302
|
#: src/modules/unpackfs/main.py:302
|
||||||
msgid "Unpacking image {}/{}, file {}/{}"
|
msgid "Unpacking image {}/{}, file {}/{}"
|
||||||
msgstr ""
|
msgstr "در حال بستهگشایی تصویر {}/{}، پروندهٔ {}/{}"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:317
|
#: src/modules/unpackfs/main.py:317
|
||||||
msgid "Starting to unpack {}"
|
msgid "Starting to unpack {}"
|
||||||
msgstr ""
|
msgstr "در حال شروع بستهگشایی {}"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
|
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
|
||||||
msgid "Failed to unpack image \"{}\""
|
msgid "Failed to unpack image \"{}\""
|
||||||
msgstr ""
|
msgstr "شکست در بستهگشایی تصویر {}"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:399
|
#: src/modules/unpackfs/main.py:399
|
||||||
msgid "No mount point for root partition"
|
msgid "No mount point for root partition"
|
||||||
msgstr ""
|
msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:400
|
#: src/modules/unpackfs/main.py:400
|
||||||
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
|
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
|
||||||
msgstr ""
|
msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمیشود"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:405
|
#: src/modules/unpackfs/main.py:405
|
||||||
msgid "Bad mount point for root partition"
|
msgid "Bad mount point for root partition"
|
||||||
msgstr ""
|
msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:406
|
#: src/modules/unpackfs/main.py:406
|
||||||
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
|
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
|
||||||
msgstr ""
|
msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمیشود"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:422 src/modules/unpackfs/main.py:426
|
#: src/modules/unpackfs/main.py:422 src/modules/unpackfs/main.py:426
|
||||||
#: src/modules/unpackfs/main.py:446
|
#: src/modules/unpackfs/main.py:446
|
||||||
msgid "Bad unsquash configuration"
|
msgid "Bad unsquash configuration"
|
||||||
msgstr ""
|
msgstr "پیکربندی بد unsquash"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:423
|
#: src/modules/unpackfs/main.py:423
|
||||||
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
||||||
msgstr ""
|
msgstr "کرنل کنونیتان از سامانهپروندهٔ {} ({}) پشتیبانی نمیکند"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:427
|
#: src/modules/unpackfs/main.py:427
|
||||||
msgid "The source filesystem \"{}\" does not exist"
|
msgid "The source filesystem \"{}\" does not exist"
|
||||||
msgstr ""
|
msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:433
|
#: src/modules/unpackfs/main.py:433
|
||||||
msgid ""
|
msgid ""
|
||||||
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
|
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
|
||||||
"installed"
|
"installed"
|
||||||
msgstr ""
|
msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:447
|
#: src/modules/unpackfs/main.py:447
|
||||||
msgid "The destination \"{}\" in the target system is not a directory"
|
msgid "The destination \"{}\" in the target system is not a directory"
|
||||||
msgstr ""
|
msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:35
|
#: src/modules/services-systemd/main.py:35
|
||||||
msgid "Configure systemd services"
|
msgid "Configure systemd services"
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی خدمات سیستمدی"
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:68
|
#: src/modules/services-systemd/main.py:68
|
||||||
#: src/modules/services-openrc/main.py:102
|
#: src/modules/services-openrc/main.py:102
|
||||||
msgid "Cannot modify service"
|
msgid "Cannot modify service"
|
||||||
msgstr ""
|
msgstr "نمیتوان خدمت را دستکاری کرد"
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:69
|
#: src/modules/services-systemd/main.py:69
|
||||||
msgid ""
|
msgid ""
|
||||||
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
|
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"فراخوانی <code>systemctl {arg!s}</code> در chroot رمز خطای {num!s} را "
|
||||||
|
"برگرداند."
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:72
|
#: src/modules/services-systemd/main.py:72
|
||||||
#: src/modules/services-systemd/main.py:76
|
#: src/modules/services-systemd/main.py:76
|
||||||
msgid "Cannot enable systemd service <code>{name!s}</code>."
|
msgid "Cannot enable systemd service <code>{name!s}</code>."
|
||||||
msgstr ""
|
msgstr "نمیتوان خدمت سیستمدی <code>{name!s}</code> را به کار انداخت."
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:74
|
#: src/modules/services-systemd/main.py:74
|
||||||
msgid "Cannot enable systemd target <code>{name!s}</code>."
|
msgid "Cannot enable systemd target <code>{name!s}</code>."
|
||||||
msgstr ""
|
msgstr "نمیتوان هدف سیستمدی <code>{name!s}</code> را به کار انداخت."
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:78
|
#: src/modules/services-systemd/main.py:78
|
||||||
msgid "Cannot disable systemd target <code>{name!s}</code>."
|
msgid "Cannot disable systemd target <code>{name!s}</code>."
|
||||||
msgstr ""
|
msgstr "نمیتوان خدمت سیستمدی <code>{name!s}</code> را از کار انداخت."
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:80
|
#: src/modules/services-systemd/main.py:80
|
||||||
msgid "Cannot mask systemd unit <code>{name!s}</code>."
|
msgid "Cannot mask systemd unit <code>{name!s}</code>."
|
||||||
msgstr ""
|
msgstr "نمیتوان واحد سیستمدی <code>{name!s}</code> را پوشاند."
|
||||||
|
|
||||||
#: src/modules/services-systemd/main.py:82
|
#: src/modules/services-systemd/main.py:82
|
||||||
msgid ""
|
msgid ""
|
||||||
"Unknown systemd commands <code>{command!s}</code> and "
|
"Unknown systemd commands <code>{command!s}</code> and "
|
||||||
"<code>{suffix!s}</code> for unit {name!s}."
|
"<code>{suffix!s}</code> for unit {name!s}."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"دستورات ناشناختهٔ سیستمدی <code>{command!s}</code> و "
|
||||||
|
"<code>{suffix!s}</code> برای واحد {name!s}."
|
||||||
|
|
||||||
#: src/modules/dummypython/main.py:44
|
#: src/modules/dummypython/main.py:44
|
||||||
msgid "Dummy python job."
|
msgid "Dummy python job."
|
||||||
msgstr ""
|
msgstr "کار پایتونی الکی."
|
||||||
|
|
||||||
#: src/modules/dummypython/main.py:46 src/modules/dummypython/main.py:102
|
#: src/modules/dummypython/main.py:46 src/modules/dummypython/main.py:102
|
||||||
#: src/modules/dummypython/main.py:103
|
#: src/modules/dummypython/main.py:103
|
||||||
msgid "Dummy python step {}"
|
msgid "Dummy python step {}"
|
||||||
msgstr ""
|
msgstr "گام پایتونی الکی {}"
|
||||||
|
|
||||||
#: src/modules/bootloader/main.py:51
|
#: src/modules/bootloader/main.py:51
|
||||||
msgid "Install bootloader."
|
msgid "Install bootloader."
|
||||||
msgstr ""
|
msgstr "نصب بارکنندهٔ راهاندازی."
|
||||||
|
|
||||||
#: src/modules/localecfg/main.py:39
|
#: src/modules/localecfg/main.py:39
|
||||||
msgid "Configuring locales."
|
msgid "Configuring locales."
|
||||||
@ -196,31 +204,31 @@ msgstr ""
|
|||||||
|
|
||||||
#: src/modules/mount/main.py:38
|
#: src/modules/mount/main.py:38
|
||||||
msgid "Mounting partitions."
|
msgid "Mounting partitions."
|
||||||
msgstr ""
|
msgstr "در حال سوار کردن افرازها."
|
||||||
|
|
||||||
#: src/modules/plymouthcfg/main.py:36
|
#: src/modules/plymouthcfg/main.py:36
|
||||||
msgid "Configure Plymouth theme"
|
msgid "Configure Plymouth theme"
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی زمینهٔ پلیموث"
|
||||||
|
|
||||||
#: src/modules/luksopenswaphookcfg/main.py:35
|
#: src/modules/luksopenswaphookcfg/main.py:35
|
||||||
msgid "Configuring encrypted swap."
|
msgid "Configuring encrypted swap."
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی مبادلهٔ رمزشده."
|
||||||
|
|
||||||
#: src/modules/fstab/main.py:38
|
#: src/modules/fstab/main.py:38
|
||||||
msgid "Writing fstab."
|
msgid "Writing fstab."
|
||||||
msgstr ""
|
msgstr "در حال نوشتن fstab."
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:38
|
#: src/modules/services-openrc/main.py:38
|
||||||
msgid "Configure OpenRC services"
|
msgid "Configure OpenRC services"
|
||||||
msgstr ""
|
msgstr "پیکربندی خدمات OpenRC"
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:66
|
#: src/modules/services-openrc/main.py:66
|
||||||
msgid "Cannot add service {name!s} to run-level {level!s}."
|
msgid "Cannot add service {name!s} to run-level {level!s}."
|
||||||
msgstr ""
|
msgstr "نمیتوان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:68
|
#: src/modules/services-openrc/main.py:68
|
||||||
msgid "Cannot remove service {name!s} from run-level {level!s}."
|
msgid "Cannot remove service {name!s} from run-level {level!s}."
|
||||||
msgstr ""
|
msgstr "نمیتوان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:70
|
#: src/modules/services-openrc/main.py:70
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -235,7 +243,7 @@ msgstr ""
|
|||||||
|
|
||||||
#: src/modules/services-openrc/main.py:110
|
#: src/modules/services-openrc/main.py:110
|
||||||
msgid "Target runlevel does not exist"
|
msgid "Target runlevel does not exist"
|
||||||
msgstr ""
|
msgstr "سطح اجرایی هدف وجود ندارد."
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:111
|
#: src/modules/services-openrc/main.py:111
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -245,7 +253,7 @@ msgstr ""
|
|||||||
|
|
||||||
#: src/modules/services-openrc/main.py:119
|
#: src/modules/services-openrc/main.py:119
|
||||||
msgid "Target service does not exist"
|
msgid "Target service does not exist"
|
||||||
msgstr ""
|
msgstr "خدمت هدف وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/services-openrc/main.py:120
|
#: src/modules/services-openrc/main.py:120
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -255,82 +263,84 @@ msgstr ""
|
|||||||
|
|
||||||
#: src/modules/dracut/main.py:36
|
#: src/modules/dracut/main.py:36
|
||||||
msgid "Creating initramfs with dracut."
|
msgid "Creating initramfs with dracut."
|
||||||
msgstr ""
|
msgstr "در حال ایجاد initramfs با dracut."
|
||||||
|
|
||||||
#: src/modules/dracut/main.py:58
|
#: src/modules/dracut/main.py:58
|
||||||
msgid "Failed to run dracut on the target"
|
msgid "Failed to run dracut on the target"
|
||||||
msgstr ""
|
msgstr "شکست در اجرای dracut روی هدف"
|
||||||
|
|
||||||
#: src/modules/dracut/main.py:59
|
#: src/modules/dracut/main.py:59
|
||||||
msgid "The exit code was {}"
|
msgid "The exit code was {}"
|
||||||
msgstr ""
|
msgstr "رمز خروج {} بود"
|
||||||
|
|
||||||
#: src/modules/grubcfg/main.py:37
|
#: src/modules/grubcfg/main.py:37
|
||||||
msgid "Configure GRUB."
|
msgid "Configure GRUB."
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی گراب."
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:515
|
#: src/modules/displaymanager/main.py:515
|
||||||
msgid "Cannot write KDM configuration file"
|
msgid "Cannot write KDM configuration file"
|
||||||
msgstr ""
|
msgstr "نمیتوان پروندهٔ پیکربندی KDM را نوشت"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:516
|
#: src/modules/displaymanager/main.py:516
|
||||||
msgid "KDM config file {!s} does not exist"
|
msgid "KDM config file {!s} does not exist"
|
||||||
msgstr ""
|
msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:577
|
#: src/modules/displaymanager/main.py:577
|
||||||
msgid "Cannot write LXDM configuration file"
|
msgid "Cannot write LXDM configuration file"
|
||||||
msgstr ""
|
msgstr "نمیتوان پروندهٔ پیکربندی LXDM را نوشت"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:578
|
#: src/modules/displaymanager/main.py:578
|
||||||
msgid "LXDM config file {!s} does not exist"
|
msgid "LXDM config file {!s} does not exist"
|
||||||
msgstr ""
|
msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:661
|
#: src/modules/displaymanager/main.py:661
|
||||||
msgid "Cannot write LightDM configuration file"
|
msgid "Cannot write LightDM configuration file"
|
||||||
msgstr ""
|
msgstr "نمیتوان پروندهٔ پیکربندی LightDM را نوشت"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:662
|
#: src/modules/displaymanager/main.py:662
|
||||||
msgid "LightDM config file {!s} does not exist"
|
msgid "LightDM config file {!s} does not exist"
|
||||||
msgstr ""
|
msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:736
|
#: src/modules/displaymanager/main.py:736
|
||||||
msgid "Cannot configure LightDM"
|
msgid "Cannot configure LightDM"
|
||||||
msgstr ""
|
msgstr "نمیتوان LightDM را پیکربندی کرد"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:737
|
#: src/modules/displaymanager/main.py:737
|
||||||
msgid "No LightDM greeter installed."
|
msgid "No LightDM greeter installed."
|
||||||
msgstr ""
|
msgstr "هیچ خوشآمدگوی LightDMای نصب نشده."
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:768
|
#: src/modules/displaymanager/main.py:768
|
||||||
msgid "Cannot write SLIM configuration file"
|
msgid "Cannot write SLIM configuration file"
|
||||||
msgstr ""
|
msgstr "نمیتوان پروندهٔ پیکربندی LightDM را نوشت"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:769
|
#: src/modules/displaymanager/main.py:769
|
||||||
msgid "SLIM config file {!s} does not exist"
|
msgid "SLIM config file {!s} does not exist"
|
||||||
msgstr ""
|
msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:895
|
#: src/modules/displaymanager/main.py:895
|
||||||
msgid "No display managers selected for the displaymanager module."
|
msgid "No display managers selected for the displaymanager module."
|
||||||
msgstr ""
|
msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:896
|
#: src/modules/displaymanager/main.py:896
|
||||||
msgid ""
|
msgid ""
|
||||||
"The displaymanagers list is empty or undefined in bothglobalstorage and "
|
"The displaymanagers list is empty or undefined in bothglobalstorage and "
|
||||||
"displaymanager.conf."
|
"displaymanager.conf."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"فهرست displaymanagers خالی بوده یا در bothglobalstorage و "
|
||||||
|
"displaymanager.conf تعریف نشده."
|
||||||
|
|
||||||
#: src/modules/displaymanager/main.py:978
|
#: src/modules/displaymanager/main.py:978
|
||||||
msgid "Display manager configuration was incomplete"
|
msgid "Display manager configuration was incomplete"
|
||||||
msgstr ""
|
msgstr "پیکربندی مدیر نمایش کامل نبود"
|
||||||
|
|
||||||
#: src/modules/initramfscfg/main.py:41
|
#: src/modules/initramfscfg/main.py:41
|
||||||
msgid "Configuring initramfs."
|
msgid "Configuring initramfs."
|
||||||
msgstr ""
|
msgstr "در حال پیکربندی initramfs."
|
||||||
|
|
||||||
#: src/modules/hwclock/main.py:35
|
#: src/modules/hwclock/main.py:35
|
||||||
msgid "Setting hardware clock."
|
msgid "Setting hardware clock."
|
||||||
msgstr ""
|
msgstr "در حال تنظیم ساعت سختافزاری."
|
||||||
|
|
||||||
#: src/modules/rawfs/main.py:35
|
#: src/modules/rawfs/main.py:35
|
||||||
msgid "Installing data."
|
msgid "Installing data."
|
||||||
msgstr ""
|
msgstr "دادههای نصب"
|
||||||
|
Binary file not shown.
@ -6,7 +6,7 @@
|
|||||||
# Translators:
|
# Translators:
|
||||||
# Choiril Abdul, 2018
|
# Choiril Abdul, 2018
|
||||||
# Harry Suryapambagya <harsxv@gmail.com>, 2018
|
# Harry Suryapambagya <harsxv@gmail.com>, 2018
|
||||||
# Wantoyo <wantoyek@gmail.com>, 2018
|
# Wantoyèk <wantoyek@gmail.com>, 2018
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -15,7 +15,7 @@ msgstr ""
|
|||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
||||||
"Last-Translator: Wantoyo <wantoyek@gmail.com>, 2018\n"
|
"Last-Translator: Wantoyèk <wantoyek@gmail.com>, 2018\n"
|
||||||
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
|
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
Binary file not shown.
@ -5,6 +5,7 @@
|
|||||||
#
|
#
|
||||||
# Translators:
|
# Translators:
|
||||||
# 黃柏諺 <s8321414@gmail.com>, 2020
|
# 黃柏諺 <s8321414@gmail.com>, 2020
|
||||||
|
# Walter Cheuk <wwycheuk@gmail.com>, 2020
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -13,7 +14,7 @@ msgstr ""
|
|||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
|
||||||
"Last-Translator: 黃柏諺 <s8321414@gmail.com>, 2020\n"
|
"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>, 2020\n"
|
||||||
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
|
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -126,7 +127,7 @@ msgstr "錯誤的 unsquash 設定"
|
|||||||
|
|
||||||
#: src/modules/unpackfs/main.py:423
|
#: src/modules/unpackfs/main.py:423
|
||||||
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
|
||||||
msgstr "\"{}\" ({}) 的檔案系統不被您目前的核心所支援"
|
msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:427
|
#: src/modules/unpackfs/main.py:427
|
||||||
msgid "The source filesystem \"{}\" does not exist"
|
msgid "The source filesystem \"{}\" does not exist"
|
||||||
@ -136,7 +137,7 @@ msgstr "來源檔案系統 \"{}\" 不存在"
|
|||||||
msgid ""
|
msgid ""
|
||||||
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
|
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
|
||||||
"installed"
|
"installed"
|
||||||
msgstr "找不到 unsquashfs,請確定您已安裝 squashfs-tools 軟體包"
|
msgstr "找不到 unsquashfs,請確定已安裝 squashfs-tools 軟體包"
|
||||||
|
|
||||||
#: src/modules/unpackfs/main.py:447
|
#: src/modules/unpackfs/main.py:447
|
||||||
msgid "The destination \"{}\" in the target system is not a directory"
|
msgid "The destination \"{}\" in the target system is not a directory"
|
||||||
|
@ -78,6 +78,19 @@ images:
|
|||||||
# installer is actually writing to disk and doing other slow things).
|
# installer is actually writing to disk and doing other slow things).
|
||||||
slideshow: "show.qml"
|
slideshow: "show.qml"
|
||||||
|
|
||||||
|
# There are two available APIs for a QML slideshow:
|
||||||
|
# - 1 (the default) loads the entire slideshow when the installation-
|
||||||
|
# slideshow page is shown and starts the QML then. The QML
|
||||||
|
# is never stopped (after installation is done, times etc.
|
||||||
|
# continue to fire).
|
||||||
|
# - 2 loads the slideshow on startup and calls onActivate() and
|
||||||
|
# onLeave() in the root object. After the installation is done,
|
||||||
|
# the show is stopped (first by calling onLeave(), then destroying
|
||||||
|
# the QML components).
|
||||||
|
#
|
||||||
|
# An image slideshow does not need to have the API defined.
|
||||||
|
slideshowAPI: 1
|
||||||
|
|
||||||
# Colors for text and background components.
|
# Colors for text and background components.
|
||||||
#
|
#
|
||||||
# - sidebarBackground is the background of the sidebar
|
# - sidebarBackground is the background of the sidebar
|
||||||
|
@ -32,6 +32,9 @@
|
|||||||
#include "utils/CalamaresUtilsSystem.h"
|
#include "utils/CalamaresUtilsSystem.h"
|
||||||
#include "utils/Dirs.h"
|
#include "utils/Dirs.h"
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
|
#ifdef WITH_QML
|
||||||
|
#include "utils/Qml.h"
|
||||||
|
#endif
|
||||||
#include "utils/Retranslator.h"
|
#include "utils/Retranslator.h"
|
||||||
#include "viewpages/ViewStep.h"
|
#include "viewpages/ViewStep.h"
|
||||||
|
|
||||||
@ -117,34 +120,6 @@ CalamaresApplication::mainWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static QStringList
|
|
||||||
qmlDirCandidates( bool assumeBuilddir )
|
|
||||||
{
|
|
||||||
static const char QML[] = "qml";
|
|
||||||
|
|
||||||
QStringList qmlDirs;
|
|
||||||
if ( CalamaresUtils::isAppDataDirOverridden() )
|
|
||||||
{
|
|
||||||
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( assumeBuilddir )
|
|
||||||
{
|
|
||||||
qmlDirs << QDir::current().absoluteFilePath( "src/qml" ); // In build-dir
|
|
||||||
}
|
|
||||||
if ( CalamaresUtils::haveExtraDirs() )
|
|
||||||
for ( auto s : CalamaresUtils::extraDataDirs() )
|
|
||||||
{
|
|
||||||
qmlDirs << ( s + QML );
|
|
||||||
}
|
|
||||||
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
|
|
||||||
}
|
|
||||||
|
|
||||||
return qmlDirs;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static QStringList
|
static QStringList
|
||||||
brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
|
brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
|
||||||
{
|
{
|
||||||
@ -175,38 +150,12 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
|
|||||||
void
|
void
|
||||||
CalamaresApplication::initQmlPath()
|
CalamaresApplication::initQmlPath()
|
||||||
{
|
{
|
||||||
QDir importPath; // Right now, current-dir
|
#ifdef WITH_QML
|
||||||
QStringList qmlDirCandidatesByPriority = qmlDirCandidates( isDebug() );
|
if ( !CalamaresUtils::initQmlModulesDir() )
|
||||||
bool found = false;
|
|
||||||
|
|
||||||
foreach ( const QString& path, qmlDirCandidatesByPriority )
|
|
||||||
{
|
{
|
||||||
QDir dir( path );
|
|
||||||
if ( dir.exists() && dir.isReadable() )
|
|
||||||
{
|
|
||||||
importPath = dir;
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !found || !importPath.exists() || !importPath.isReadable() )
|
|
||||||
{
|
|
||||||
cError() << "Cowardly refusing to continue startup without a QML directory."
|
|
||||||
<< Logger::DebugList( qmlDirCandidatesByPriority );
|
|
||||||
if ( CalamaresUtils::isAppDataDirOverridden() )
|
|
||||||
{
|
|
||||||
cError() << "FATAL: explicitly configured application data directory is missing qml/";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cError() << "FATAL: none of the expected QML paths exist.";
|
|
||||||
}
|
|
||||||
::exit( EXIT_FAILURE );
|
::exit( EXIT_FAILURE );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
cDebug() << "Using Calamares QML directory" << importPath.absolutePath();
|
|
||||||
CalamaresUtils::setQmlModulesDir( importPath );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -208,7 +208,7 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent )
|
|||||||
QWidget*
|
QWidget*
|
||||||
CalamaresWindow::getQmlSidebar( QWidget* parent, int )
|
CalamaresWindow::getQmlSidebar( QWidget* parent, int )
|
||||||
{
|
{
|
||||||
CalamaresUtils::registerCalamaresModels();
|
CalamaresUtils::registerQmlModels();
|
||||||
QQuickWidget* w = new QQuickWidget( parent );
|
QQuickWidget* w = new QQuickWidget( parent );
|
||||||
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
||||||
w->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
w->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
||||||
@ -220,7 +220,7 @@ CalamaresWindow::getQmlSidebar( QWidget* parent, int )
|
|||||||
QWidget*
|
QWidget*
|
||||||
CalamaresWindow::getQmlNavigation( QWidget* parent )
|
CalamaresWindow::getQmlNavigation( QWidget* parent )
|
||||||
{
|
{
|
||||||
CalamaresUtils::registerCalamaresModels();
|
CalamaresUtils::registerQmlModels();
|
||||||
QQuickWidget* w = new QQuickWidget( parent );
|
QQuickWidget* w = new QQuickWidget( parent );
|
||||||
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
||||||
w->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
w->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
||||||
|
@ -22,18 +22,22 @@
|
|||||||
* bindings.
|
* bindings.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "modulesystem/Module.h"
|
|
||||||
#include "utils/Logger.h"
|
|
||||||
#include "utils/Yaml.h"
|
|
||||||
|
|
||||||
#include "Branding.h"
|
#include "Branding.h"
|
||||||
|
#include "CppJob.h"
|
||||||
#include "GlobalStorage.h"
|
#include "GlobalStorage.h"
|
||||||
#include "Job.h"
|
#include "Job.h"
|
||||||
#include "JobQueue.h"
|
#include "JobQueue.h"
|
||||||
#include "Settings.h"
|
#include "Settings.h"
|
||||||
#include "ViewManager.h"
|
#include "ViewManager.h"
|
||||||
|
#include "modulesystem/Module.h"
|
||||||
#include "modulesystem/ModuleManager.h"
|
#include "modulesystem/ModuleManager.h"
|
||||||
|
#include "modulesystem/ViewModule.h"
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
#ifdef WITH_QML
|
||||||
|
#include "utils/Qml.h"
|
||||||
|
#endif
|
||||||
|
#include "utils/Yaml.h"
|
||||||
|
#include "viewpages/ExecutionViewStep.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QCommandLineOption>
|
#include <QCommandLineOption>
|
||||||
@ -42,6 +46,7 @@
|
|||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@ -80,6 +85,8 @@ handle_args( QCoreApplication& a )
|
|||||||
"src/branding/default/branding.desc" );
|
"src/branding/default/branding.desc" );
|
||||||
QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ),
|
QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ),
|
||||||
QStringLiteral( "Enable UI" ) );
|
QStringLiteral( "Enable UI" ) );
|
||||||
|
QCommandLineOption slideshowOption( QStringList() << QStringLiteral( "s" ) << QStringLiteral( "slideshow" ),
|
||||||
|
QStringLiteral( "Run slideshow module" ) );
|
||||||
|
|
||||||
QCommandLineParser parser;
|
QCommandLineParser parser;
|
||||||
parser.setApplicationDescription( "Calamares module tester" );
|
parser.setApplicationDescription( "Calamares module tester" );
|
||||||
@ -92,13 +99,14 @@ handle_args( QCoreApplication& a )
|
|||||||
parser.addOption( langOption );
|
parser.addOption( langOption );
|
||||||
parser.addOption( brandOption );
|
parser.addOption( brandOption );
|
||||||
parser.addOption( uiOption );
|
parser.addOption( uiOption );
|
||||||
|
parser.addOption( slideshowOption );
|
||||||
parser.addPositionalArgument( "module", "Path or name of module to run." );
|
parser.addPositionalArgument( "module", "Path or name of module to run." );
|
||||||
parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" );
|
parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" );
|
||||||
|
|
||||||
parser.process( a );
|
parser.process( a );
|
||||||
|
|
||||||
const QStringList args = parser.positionalArguments();
|
const QStringList args = parser.positionalArguments();
|
||||||
if ( args.isEmpty() )
|
if ( args.isEmpty() && !parser.isSet( slideshowOption ) )
|
||||||
{
|
{
|
||||||
cError() << "Missing <module> path.\n";
|
cError() << "Missing <module> path.\n";
|
||||||
parser.showHelp();
|
parser.showHelp();
|
||||||
@ -116,20 +124,161 @@ handle_args( QCoreApplication& a )
|
|||||||
jobSettings = args.at( 1 );
|
jobSettings = args.at( 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return ModuleConfig { args.first(),
|
return ModuleConfig { parser.isSet( slideshowOption ) ? QStringLiteral( "-" ) : args.first(),
|
||||||
jobSettings,
|
jobSettings,
|
||||||
parser.value( globalOption ),
|
parser.value( globalOption ),
|
||||||
parser.value( langOption ),
|
parser.value( langOption ),
|
||||||
parser.value( brandOption ),
|
parser.value( brandOption ),
|
||||||
parser.isSet( uiOption ) };
|
parser.isSet( slideshowOption ) || parser.isSet( uiOption ) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @brief Bogus Job for --slideshow option
|
||||||
|
*
|
||||||
|
* Generally one would use DummyCppJob for this kind of dummy
|
||||||
|
* job, but that class lives in a module so isn't available
|
||||||
|
* in this test application.
|
||||||
|
*
|
||||||
|
* This bogus job just sleeps for 3.
|
||||||
|
*/
|
||||||
|
class ExecViewJob : public Calamares::CppJob
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit ExecViewJob( const QString& name, unsigned long t = 3 )
|
||||||
|
: m_name( name )
|
||||||
|
, m_delay( t )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
virtual ~ExecViewJob() override;
|
||||||
|
|
||||||
|
QString prettyName() const override { return m_name; }
|
||||||
|
|
||||||
|
Calamares::JobResult exec() override
|
||||||
|
{
|
||||||
|
QThread::sleep( m_delay );
|
||||||
|
return Calamares::JobResult::ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
void setConfigurationMap( const QVariantMap& ) override {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
QString m_name;
|
||||||
|
unsigned long m_delay;
|
||||||
|
};
|
||||||
|
|
||||||
|
ExecViewJob::~ExecViewJob() {}
|
||||||
|
|
||||||
|
/** @brief Bogus module for --slideshow option
|
||||||
|
*
|
||||||
|
* Normally the slideshow -- displayed by ExecutionViewStep -- is not
|
||||||
|
* associated with any particular module in the Calamares configuration.
|
||||||
|
* It is added internally by the module manager. For the module-loader
|
||||||
|
* testing application, we need something that pretends to be the
|
||||||
|
* module for the ExecutionViewStep.
|
||||||
|
*/
|
||||||
|
class ExecViewModule : public Calamares::Module
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
ExecViewModule();
|
||||||
|
~ExecViewModule() override;
|
||||||
|
|
||||||
|
void loadSelf() override;
|
||||||
|
|
||||||
|
virtual Type type() const override;
|
||||||
|
virtual Interface interface() const override;
|
||||||
|
|
||||||
|
virtual Calamares::JobList jobs() const override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void initFrom( const QVariantMap& ) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
ExecViewModule::ExecViewModule()
|
||||||
|
: Calamares::Module()
|
||||||
|
{
|
||||||
|
// Normally the module-loader gives the module an instance key
|
||||||
|
// (out of the settings file, or the descriptor of the module).
|
||||||
|
// We don't have one, so build one -- this gives us "x@x".
|
||||||
|
QVariantMap m;
|
||||||
|
m.insert( "name", "x" );
|
||||||
|
Calamares::Module::initFrom( m, "x" );
|
||||||
|
}
|
||||||
|
|
||||||
|
ExecViewModule::~ExecViewModule() {}
|
||||||
|
|
||||||
|
void
|
||||||
|
ExecViewModule::initFrom( const QVariantMap& )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ExecViewModule::loadSelf()
|
||||||
|
{
|
||||||
|
auto* viewStep = new Calamares::ExecutionViewStep();
|
||||||
|
viewStep->setModuleInstanceKey( instanceKey() );
|
||||||
|
viewStep->setConfigurationMap( m_configurationMap );
|
||||||
|
viewStep->appendJobModuleInstanceKey( instanceKey().toString() );
|
||||||
|
Calamares::ViewManager::instance()->addViewStep( viewStep );
|
||||||
|
m_loaded = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Calamares::Module::Type
|
||||||
|
ExecViewModule::type() const
|
||||||
|
{
|
||||||
|
return Module::Type::View;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Calamares::Module::Interface
|
||||||
|
ExecViewModule::interface() const
|
||||||
|
{
|
||||||
|
return Module::Interface::QtPlugin;
|
||||||
|
}
|
||||||
|
|
||||||
|
Calamares::JobList
|
||||||
|
ExecViewModule::jobs() const
|
||||||
|
{
|
||||||
|
Calamares::JobList l;
|
||||||
|
const auto* gs = Calamares::JobQueue::instance()->globalStorage();
|
||||||
|
if ( gs && gs->contains( "jobs" ) )
|
||||||
|
{
|
||||||
|
QVariantList joblist = gs->value( "jobs" ).toList();
|
||||||
|
for ( const auto& jd : joblist )
|
||||||
|
{
|
||||||
|
QVariantMap jobdescription = jd.toMap();
|
||||||
|
if ( jobdescription.contains( "name" ) && jobdescription.contains( "delay" ) )
|
||||||
|
{
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( jobdescription.value( "name" ).toString(),
|
||||||
|
jobdescription.value( "delay" ).toULongLong() ) ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ( l.count() > 0 )
|
||||||
|
{
|
||||||
|
return l;
|
||||||
|
}
|
||||||
|
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "step 1" ) ) ) );
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "step two" ) ) ) );
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "locking mutexes" ), 20 ) ) );
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "unlocking mutexes" ), 1 ) ) );
|
||||||
|
for ( const QString& s : QStringList { "Harder", "Better", "Faster", "Stronger" } )
|
||||||
|
{
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( s, 0 ) ) );
|
||||||
|
}
|
||||||
|
l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "cleaning up" ), 20 ) ) );
|
||||||
|
return l;
|
||||||
|
}
|
||||||
|
|
||||||
static Calamares::Module*
|
static Calamares::Module*
|
||||||
load_module( const ModuleConfig& moduleConfig )
|
load_module( const ModuleConfig& moduleConfig )
|
||||||
{
|
{
|
||||||
QString moduleName = moduleConfig.moduleName();
|
QString moduleName = moduleConfig.moduleName();
|
||||||
|
if ( moduleName == "-" )
|
||||||
|
{
|
||||||
|
return new ExecViewModule;
|
||||||
|
}
|
||||||
|
|
||||||
QFileInfo fi;
|
QFileInfo fi;
|
||||||
|
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
@ -188,6 +337,18 @@ load_module( const ModuleConfig& moduleConfig )
|
|||||||
return module;
|
return module;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
is_ui_option( const char* s )
|
||||||
|
{
|
||||||
|
return !qstrcmp( s, "--ui" ) || !qstrcmp( s, "-U" );
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
is_slideshow_option( const char* s )
|
||||||
|
{
|
||||||
|
return !qstrcmp( s, "--slideshow" ) || !qstrcmp( s, "-s" );
|
||||||
|
}
|
||||||
|
|
||||||
/** @brief Create the right kind of QApplication
|
/** @brief Create the right kind of QApplication
|
||||||
*
|
*
|
||||||
* Does primitive parsing of argv[] to find the --ui option and returns
|
* Does primitive parsing of argv[] to find the --ui option and returns
|
||||||
@ -202,7 +363,7 @@ createApplication( int& argc, char* argv[] )
|
|||||||
{
|
{
|
||||||
for ( int i = 1; i < argc; ++i )
|
for ( int i = 1; i < argc; ++i )
|
||||||
{
|
{
|
||||||
if ( !qstrcmp( argv[ i ], "--ui" ) || !qstrcmp( argv[ i ], "-U" ) )
|
if ( is_slideshow_option( argv[ i ] ) || is_ui_option( argv[ i ] ) )
|
||||||
{
|
{
|
||||||
auto* aw = new QApplication( argc, argv );
|
auto* aw = new QApplication( argc, argv );
|
||||||
aw->setQuitOnLastWindowClosed( true );
|
aw->setQuitOnLastWindowClosed( true );
|
||||||
@ -241,6 +402,10 @@ main( int argc, char* argv[] )
|
|||||||
gs->insert( "localeConf", vm );
|
gs->insert( "localeConf", vm );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef WITH_QML
|
||||||
|
CalamaresUtils::initQmlModulesDir(); // don't care if failed
|
||||||
|
#endif
|
||||||
|
|
||||||
cDebug() << "Calamares module-loader testing" << module.moduleName();
|
cDebug() << "Calamares module-loader testing" << module.moduleName();
|
||||||
Calamares::Module* m = load_module( module );
|
Calamares::Module* m = load_module( module );
|
||||||
if ( !m )
|
if ( !m )
|
||||||
@ -252,7 +417,11 @@ main( int argc, char* argv[] )
|
|||||||
cDebug() << " .. got" << m->name() << m->typeString() << m->interfaceString();
|
cDebug() << " .. got" << m->name() << m->typeString() << m->interfaceString();
|
||||||
if ( m->type() == Calamares::Module::Type::View )
|
if ( m->type() == Calamares::Module::Type::View )
|
||||||
{
|
{
|
||||||
if ( !qobject_cast< QApplication* >(aw) )
|
// If we forgot the --ui, any ViewModule will core dump as it
|
||||||
|
// tries to create the widget **which won't be used anyway**.
|
||||||
|
//
|
||||||
|
// To avoid that crash, re-create the QApplication, now with GUI
|
||||||
|
if ( !qobject_cast< QApplication* >( aw ) )
|
||||||
{
|
{
|
||||||
auto* replace_app = new QApplication( argc, argv );
|
auto* replace_app = new QApplication( argc, argv );
|
||||||
replace_app->setQuitOnLastWindowClosed( true );
|
replace_app->setQuitOnLastWindowClosed( true );
|
||||||
@ -261,8 +430,9 @@ main( int argc, char* argv[] )
|
|||||||
mw = module.m_ui ? new QMainWindow() : nullptr;
|
mw = module.m_ui ? new QMainWindow() : nullptr;
|
||||||
|
|
||||||
(void)new Calamares::Branding( module.m_branding );
|
(void)new Calamares::Branding( module.m_branding );
|
||||||
(void)new Calamares::ModuleManager( QStringList(), nullptr );
|
auto* modulemanager = new Calamares::ModuleManager( QStringList(), nullptr );
|
||||||
(void)Calamares::ViewManager::instance( mw );
|
(void)Calamares::ViewManager::instance( mw );
|
||||||
|
modulemanager->addModule( m );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !m->isLoaded() )
|
if ( !m->isLoaded() )
|
||||||
|
@ -42,7 +42,6 @@ namespace CalamaresUtils
|
|||||||
{
|
{
|
||||||
|
|
||||||
static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR );
|
static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR );
|
||||||
static QDir s_qmlModulesDir( QString( CMAKE_INSTALL_FULL_DATADIR ) + "/qml" );
|
|
||||||
static bool s_isAppDataDirOverridden = false;
|
static bool s_isAppDataDirOverridden = false;
|
||||||
|
|
||||||
static bool s_haveExtraDirs = false;
|
static bool s_haveExtraDirs = false;
|
||||||
@ -79,13 +78,6 @@ isWritableDir( const QDir& dir )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QDir
|
|
||||||
qmlModulesDir()
|
|
||||||
{
|
|
||||||
return s_qmlModulesDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
setAppDataDir( const QDir& dir )
|
setAppDataDir( const QDir& dir )
|
||||||
{
|
{
|
||||||
@ -200,11 +192,4 @@ appLogDir()
|
|||||||
return QDir::temp();
|
return QDir::temp();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
setQmlModulesDir( const QDir& dir )
|
|
||||||
{
|
|
||||||
s_qmlModulesDir = dir;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace CalamaresUtils
|
} // namespace CalamaresUtils
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
|
|
||||||
namespace CalamaresUtils
|
namespace CalamaresUtils
|
||||||
{
|
{
|
||||||
DLLEXPORT QDir qmlModulesDir();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief appDataDir returns the directory with common application data.
|
* @brief appDataDir returns the directory with common application data.
|
||||||
* Defaults to CMAKE_INSTALL_FULL_DATADIR (usually /usr/share/calamares).
|
* Defaults to CMAKE_INSTALL_FULL_DATADIR (usually /usr/share/calamares).
|
||||||
@ -57,8 +55,6 @@ DLLEXPORT QDir systemLibDir();
|
|||||||
DLLEXPORT void setAppDataDir( const QDir& dir );
|
DLLEXPORT void setAppDataDir( const QDir& dir );
|
||||||
DLLEXPORT bool isAppDataDirOverridden();
|
DLLEXPORT bool isAppDataDirOverridden();
|
||||||
|
|
||||||
DLLEXPORT void setQmlModulesDir( const QDir& dir );
|
|
||||||
|
|
||||||
/** @brief Setup extra config and data dirs from the XDG variables.
|
/** @brief Setup extra config and data dirs from the XDG variables.
|
||||||
*/
|
*/
|
||||||
DLLEXPORT void setXdgDirs();
|
DLLEXPORT void setXdgDirs();
|
||||||
|
@ -52,14 +52,14 @@ CppJobModule::loadSelf()
|
|||||||
CalamaresPluginFactory* pf = qobject_cast< CalamaresPluginFactory* >( m_loader->instance() );
|
CalamaresPluginFactory* pf = qobject_cast< CalamaresPluginFactory* >( m_loader->instance() );
|
||||||
if ( !pf )
|
if ( !pf )
|
||||||
{
|
{
|
||||||
cDebug() << Q_FUNC_INFO << m_loader->errorString();
|
cDebug() << "Could not load module:" << m_loader->errorString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CppJob* cppJob = pf->create< Calamares::CppJob >();
|
CppJob* cppJob = pf->create< Calamares::CppJob >();
|
||||||
if ( !cppJob )
|
if ( !cppJob )
|
||||||
{
|
{
|
||||||
cDebug() << Q_FUNC_INFO << m_loader->errorString();
|
cDebug() << "Could not load module:" << m_loader->errorString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// cDebug() << "CppJobModule loading self for instance" << instanceKey()
|
// cDebug() << "CppJobModule loading self for instance" << instanceKey()
|
||||||
|
@ -300,22 +300,12 @@ ModuleManager::loadModules()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !checkModuleDependencies( *thisModule ) )
|
if ( !addModule( thisModule ) )
|
||||||
{
|
{
|
||||||
// Error message is already printed
|
// Error message is already printed
|
||||||
failedModules.append( instanceKey.toString() );
|
failedModules.append( instanceKey.toString() );
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If it's a ViewModule, it also appends the ViewStep to the ViewManager.
|
|
||||||
thisModule->loadSelf();
|
|
||||||
m_loadedModulesByInstanceKey.insert( instanceKey, thisModule );
|
|
||||||
if ( !thisModule->isLoaded() )
|
|
||||||
{
|
|
||||||
cError() << "Module" << instanceKey.toString() << "loading FAILED.";
|
|
||||||
failedModules.append( instanceKey.toString() );
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// At this point we most certainly have a pointer to a loaded module in
|
// At this point we most certainly have a pointer to a loaded module in
|
||||||
@ -345,6 +335,40 @@ ModuleManager::loadModules()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
ModuleManager::addModule( Module *module )
|
||||||
|
{
|
||||||
|
if ( !module )
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ( !module->instanceKey().isValid() )
|
||||||
|
{
|
||||||
|
cWarning() << "Module" << module->location() << '@' << (void*)module << "has invalid instance key.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ( !checkModuleDependencies( *module ) )
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !module->isLoaded() )
|
||||||
|
{
|
||||||
|
module->loadSelf();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Even if the load failed, we keep the module, so that if it tried to
|
||||||
|
// get loaded **again**, we already know.
|
||||||
|
m_loadedModulesByInstanceKey.insert( module->instanceKey(), module );
|
||||||
|
if ( !module->isLoaded() )
|
||||||
|
{
|
||||||
|
cError() << "Module" << module->instanceKey().toString() << "loading FAILED.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ModuleManager::checkRequirements()
|
ModuleManager::checkRequirements()
|
||||||
{
|
{
|
||||||
@ -414,6 +438,12 @@ ModuleManager::checkDependencies()
|
|||||||
bool
|
bool
|
||||||
ModuleManager::checkModuleDependencies( const Module& m )
|
ModuleManager::checkModuleDependencies( const Module& m )
|
||||||
{
|
{
|
||||||
|
if ( !m_availableDescriptorsByModuleName.contains( m.name() ) )
|
||||||
|
{
|
||||||
|
cWarning() << "Module" << m.name() << "loaded externally, no dependency information.";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool allRequirementsFound = true;
|
bool allRequirementsFound = true;
|
||||||
QStringList requiredModules
|
QStringList requiredModules
|
||||||
= m_availableDescriptorsByModuleName[ m.name() ].value( "requiredModules" ).toStringList();
|
= m_availableDescriptorsByModuleName[ m.name() ].value( "requiredModules" ).toStringList();
|
||||||
|
@ -85,6 +85,14 @@ public:
|
|||||||
*/
|
*/
|
||||||
void loadModules();
|
void loadModules();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Adds a single module (loaded by some other means)
|
||||||
|
*
|
||||||
|
* Returns @c true on success (that is, the module's dependencies
|
||||||
|
* are satisfied, it wasn't already loaded, ...).
|
||||||
|
*/
|
||||||
|
bool addModule( Module* );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Starts asynchronous requirements checking for each module.
|
* @brief Starts asynchronous requirements checking for each module.
|
||||||
* When this is done, the signal requirementsComplete is emitted.
|
* When this is done, the signal requirementsComplete is emitted.
|
||||||
|
@ -53,14 +53,14 @@ ViewModule::loadSelf()
|
|||||||
CalamaresPluginFactory* pf = qobject_cast< CalamaresPluginFactory* >( m_loader->instance() );
|
CalamaresPluginFactory* pf = qobject_cast< CalamaresPluginFactory* >( m_loader->instance() );
|
||||||
if ( !pf )
|
if ( !pf )
|
||||||
{
|
{
|
||||||
cWarning() << Q_FUNC_INFO << "No factory:" << m_loader->errorString();
|
cWarning() << "No factory:" << m_loader->errorString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_viewStep = pf->create< Calamares::ViewStep >();
|
m_viewStep = pf->create< Calamares::ViewStep >();
|
||||||
if ( !m_viewStep )
|
if ( !m_viewStep )
|
||||||
{
|
{
|
||||||
cWarning() << Q_FUNC_INFO << "create() failed" << m_loader->errorString();
|
cWarning() << "create() failed" << m_loader->errorString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -76,7 +76,7 @@ ViewModule::loadSelf()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cWarning() << Q_FUNC_INFO << "No view step was created";
|
cWarning() << "No view step was created";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,6 +207,10 @@ unmarginLayout( QLayout* layout )
|
|||||||
int
|
int
|
||||||
defaultFontSize()
|
defaultFontSize()
|
||||||
{
|
{
|
||||||
|
if ( s_defaultFontSize <= 0 )
|
||||||
|
{
|
||||||
|
s_defaultFontSize = QFont().pointSize();
|
||||||
|
}
|
||||||
return s_defaultFontSize;
|
return s_defaultFontSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,7 +21,9 @@
|
|||||||
#include "Branding.h"
|
#include "Branding.h"
|
||||||
#include "GlobalStorage.h"
|
#include "GlobalStorage.h"
|
||||||
#include "JobQueue.h"
|
#include "JobQueue.h"
|
||||||
|
#include "Settings.h"
|
||||||
#include "ViewManager.h"
|
#include "ViewManager.h"
|
||||||
|
#include "utils/Dirs.h"
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
@ -30,11 +32,81 @@
|
|||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
|
|
||||||
|
static QDir s_qmlModulesDir( QString( CMAKE_INSTALL_FULL_DATADIR ) + "/qml" );
|
||||||
|
|
||||||
namespace CalamaresUtils
|
namespace CalamaresUtils
|
||||||
{
|
{
|
||||||
|
QDir
|
||||||
|
qmlModulesDir()
|
||||||
|
{
|
||||||
|
return s_qmlModulesDir;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
callQMLFunction( QQuickItem* qmlObject, const char* method )
|
setQmlModulesDir( const QDir& dir )
|
||||||
|
{
|
||||||
|
s_qmlModulesDir = dir;
|
||||||
|
}
|
||||||
|
|
||||||
|
static QStringList
|
||||||
|
qmlDirCandidates( bool assumeBuilddir )
|
||||||
|
{
|
||||||
|
static const char QML[] = "qml";
|
||||||
|
|
||||||
|
QStringList qmlDirs;
|
||||||
|
if ( CalamaresUtils::isAppDataDirOverridden() )
|
||||||
|
{
|
||||||
|
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if ( assumeBuilddir )
|
||||||
|
{
|
||||||
|
qmlDirs << QDir::current().absoluteFilePath( "src/qml" ); // In build-dir
|
||||||
|
}
|
||||||
|
if ( CalamaresUtils::haveExtraDirs() )
|
||||||
|
for ( auto s : CalamaresUtils::extraDataDirs() )
|
||||||
|
{
|
||||||
|
qmlDirs << ( s + QML );
|
||||||
|
}
|
||||||
|
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
|
||||||
|
}
|
||||||
|
|
||||||
|
return qmlDirs;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
initQmlModulesDir()
|
||||||
|
{
|
||||||
|
QStringList qmlDirCandidatesByPriority
|
||||||
|
= qmlDirCandidates( Calamares::Settings::instance() && Calamares::Settings::instance()->debugMode() );
|
||||||
|
|
||||||
|
for ( const QString& path : qmlDirCandidatesByPriority )
|
||||||
|
{
|
||||||
|
QDir dir( path );
|
||||||
|
if ( dir.exists() && dir.isReadable() )
|
||||||
|
{
|
||||||
|
cDebug() << "Using Calamares QML directory" << dir.absolutePath();
|
||||||
|
CalamaresUtils::setQmlModulesDir( dir );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cError() << "Cowardly refusing to continue startup without a QML directory."
|
||||||
|
<< Logger::DebugList( qmlDirCandidatesByPriority );
|
||||||
|
if ( CalamaresUtils::isAppDataDirOverridden() )
|
||||||
|
{
|
||||||
|
cError() << "FATAL: explicitly configured application data directory is missing qml/";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cError() << "FATAL: none of the expected QML paths exist.";
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
callQmlFunction( QQuickItem* qmlObject, const char* method )
|
||||||
{
|
{
|
||||||
QByteArray methodSignature( method );
|
QByteArray methodSignature( method );
|
||||||
methodSignature.append( "()" );
|
methodSignature.append( "()" );
|
||||||
@ -71,14 +143,14 @@ addExpansions( QmlSearch method, QStringList& candidates, const QStringList& nam
|
|||||||
std::transform( names.constBegin(),
|
std::transform( names.constBegin(),
|
||||||
names.constEnd(),
|
names.constEnd(),
|
||||||
std::back_inserter( candidates ),
|
std::back_inserter( candidates ),
|
||||||
[ & ]( const QString& s ) { return s.isEmpty() ? QString() : bPath.arg( brandDir, s ); } );
|
[&]( const QString& s ) { return s.isEmpty() ? QString() : bPath.arg( brandDir, s ); } );
|
||||||
}
|
}
|
||||||
if ( ( method == QmlSearch::Both ) || ( method == QmlSearch::QrcOnly ) )
|
if ( ( method == QmlSearch::Both ) || ( method == QmlSearch::QrcOnly ) )
|
||||||
{
|
{
|
||||||
std::transform( names.constBegin(),
|
std::transform( names.constBegin(),
|
||||||
names.constEnd(),
|
names.constEnd(),
|
||||||
std::back_inserter( candidates ),
|
std::back_inserter( candidates ),
|
||||||
[ & ]( const QString& s ) { return s.isEmpty() ? QString() : qrPath.arg( s ); } );
|
[&]( const QString& s ) { return s.isEmpty() ? QString() : qrPath.arg( s ); } );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,7 +221,7 @@ qmlSearchNames()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
registerCalamaresModels()
|
registerQmlModels()
|
||||||
{
|
{
|
||||||
static bool done = false;
|
static bool done = false;
|
||||||
if ( !done )
|
if ( !done )
|
||||||
|
@ -24,10 +24,25 @@
|
|||||||
#include "modulesystem/InstanceKey.h"
|
#include "modulesystem/InstanceKey.h"
|
||||||
#include "utils/NamedEnum.h"
|
#include "utils/NamedEnum.h"
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
class QQuickItem;
|
class QQuickItem;
|
||||||
|
|
||||||
namespace CalamaresUtils
|
namespace CalamaresUtils
|
||||||
{
|
{
|
||||||
|
/// @brief the extra directory where Calamares searches for QML files
|
||||||
|
UIDLLEXPORT QDir qmlModulesDir();
|
||||||
|
/// @brief sets specific directory for searching for QML files
|
||||||
|
UIDLLEXPORT void setQmlModulesDir( const QDir& dir );
|
||||||
|
|
||||||
|
/** @brief initialize QML search path with branding directories
|
||||||
|
*
|
||||||
|
* Picks a suitable branding directory (from the build-dir in debug mode,
|
||||||
|
* otherwise based on the branding directory) and adds it to the
|
||||||
|
* QML modules directory; returns @c false if none is found.
|
||||||
|
*/
|
||||||
|
UIDLLEXPORT bool initQmlModulesDir();
|
||||||
|
|
||||||
/** @brief Sets up global Calamares models for QML
|
/** @brief Sets up global Calamares models for QML
|
||||||
*
|
*
|
||||||
* This needs to be called at least once to make the global Calamares
|
* This needs to be called at least once to make the global Calamares
|
||||||
@ -40,7 +55,7 @@ namespace CalamaresUtils
|
|||||||
* Additionally, modules based on QmlViewStep have a context
|
* Additionally, modules based on QmlViewStep have a context
|
||||||
* property `config` referring to that module's configuration (if any).
|
* property `config` referring to that module's configuration (if any).
|
||||||
*/
|
*/
|
||||||
UIDLLEXPORT void registerCalamaresModels();
|
UIDLLEXPORT void registerQmlModels();
|
||||||
|
|
||||||
/** @brief Calls the QML method @p method on @p qmlObject
|
/** @brief Calls the QML method @p method on @p qmlObject
|
||||||
*
|
*
|
||||||
@ -50,7 +65,7 @@ UIDLLEXPORT void registerCalamaresModels();
|
|||||||
*
|
*
|
||||||
* If there is a return value from the QML method, it is logged (but not otherwise used).
|
* If there is a return value from the QML method, it is logged (but not otherwise used).
|
||||||
*/
|
*/
|
||||||
UIDLLEXPORT void callQMLFunction( QQuickItem* qmlObject, const char* method );
|
UIDLLEXPORT void callQmlFunction( QQuickItem* qmlObject, const char* method );
|
||||||
|
|
||||||
/** @brief Search modes for loading Qml files.
|
/** @brief Search modes for loading Qml files.
|
||||||
*
|
*
|
||||||
@ -66,7 +81,7 @@ enum class QmlSearch
|
|||||||
Both
|
Both
|
||||||
};
|
};
|
||||||
|
|
||||||
///@brief Names for the search terms (in config files)
|
/// @brief Names for the search terms (in config files)
|
||||||
UIDLLEXPORT const NamedEnumTable< QmlSearch >& qmlSearchNames();
|
UIDLLEXPORT const NamedEnumTable< QmlSearch >& qmlSearchNames();
|
||||||
|
|
||||||
/** @brief Find a suitable QML file, given the search method and name hints
|
/** @brief Find a suitable QML file, given the search method and name hints
|
||||||
|
@ -58,7 +58,7 @@ changeQMLState( QMLAction action, QQuickItem* item )
|
|||||||
static const char propertyName[] = "activatedInCalamares";
|
static const char propertyName[] = "activatedInCalamares";
|
||||||
|
|
||||||
bool activate = action == QMLAction::Start;
|
bool activate = action == QMLAction::Start;
|
||||||
CalamaresUtils::callQMLFunction( item, activate ? "onActivate" : "onLeave" );
|
CalamaresUtils::callQmlFunction( item, activate ? "onActivate" : "onLeave" );
|
||||||
|
|
||||||
auto property = item->property( propertyName );
|
auto property = item->property( propertyName );
|
||||||
if ( property.isValid() && ( property.type() == QVariant::Bool ) && ( property.toBool() != activate ) )
|
if ( property.isValid() && ( property.type() == QVariant::Bool ) && ( property.toBool() != activate ) )
|
||||||
@ -76,7 +76,7 @@ QmlViewStep::QmlViewStep( QObject* parent )
|
|||||||
, m_spinner( new WaitingWidget( tr( "Loading ..." ) ) )
|
, m_spinner( new WaitingWidget( tr( "Loading ..." ) ) )
|
||||||
, m_qmlWidget( new QQuickWidget )
|
, m_qmlWidget( new QQuickWidget )
|
||||||
{
|
{
|
||||||
CalamaresUtils::registerCalamaresModels();
|
CalamaresUtils::registerQmlModels();
|
||||||
|
|
||||||
QVBoxLayout* layout = new QVBoxLayout( m_widget );
|
QVBoxLayout* layout = new QVBoxLayout( m_widget );
|
||||||
layout->addWidget( m_spinner );
|
layout->addWidget( m_spinner );
|
||||||
|
@ -23,7 +23,9 @@
|
|||||||
#include "Branding.h"
|
#include "Branding.h"
|
||||||
#include "utils/Dirs.h"
|
#include "utils/Dirs.h"
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
|
#ifdef WITH_QML
|
||||||
#include "utils/Qml.h"
|
#include "utils/Qml.h"
|
||||||
|
#endif
|
||||||
#include "utils/Retranslator.h"
|
#include "utils/Retranslator.h"
|
||||||
|
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
@ -50,6 +52,8 @@ SlideshowQML::SlideshowQML( QWidget* parent )
|
|||||||
, m_qmlComponent( nullptr )
|
, m_qmlComponent( nullptr )
|
||||||
, m_qmlObject( nullptr )
|
, m_qmlObject( nullptr )
|
||||||
{
|
{
|
||||||
|
CalamaresUtils::registerQmlModels();
|
||||||
|
|
||||||
m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
||||||
m_qmlShow->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
m_qmlShow->setResizeMode( QQuickWidget::SizeRootObjectToView );
|
||||||
m_qmlShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() );
|
m_qmlShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() );
|
||||||
@ -121,11 +125,30 @@ SlideshowQML::loadQmlV2Complete()
|
|||||||
if ( isActive() )
|
if ( isActive() )
|
||||||
{
|
{
|
||||||
// We're alreay visible! Must have been slow QML loading, and we
|
// We're alreay visible! Must have been slow QML loading, and we
|
||||||
// passed onActivate already.
|
// passed onActivate already. changeSlideShowState() locks
|
||||||
|
// the same mutex: we could set up a workaround to call
|
||||||
|
// changeSlideShowState() later after destruction of l.
|
||||||
|
//
|
||||||
|
l.unlock();
|
||||||
changeSlideShowState( Slideshow::Start );
|
changeSlideShowState( Slideshow::Start );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if ( m_qmlObject )
|
||||||
|
{
|
||||||
|
cWarning() << "QML object already created";
|
||||||
|
}
|
||||||
|
else if ( !m_qmlComponent )
|
||||||
|
{
|
||||||
|
cWarning() << "QML component does not exist";
|
||||||
|
}
|
||||||
|
else if ( m_qmlComponent && !m_qmlComponent->isReady() )
|
||||||
|
{
|
||||||
|
cWarning() << "QML component not ready:" << m_qmlComponent->errors();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -144,7 +167,7 @@ SlideshowQML::changeSlideShowState( Action state )
|
|||||||
if ( Branding::instance()->slideshowAPI() == 2 )
|
if ( Branding::instance()->slideshowAPI() == 2 )
|
||||||
{
|
{
|
||||||
// The QML was already loaded in the constructor, need to start it
|
// The QML was already loaded in the constructor, need to start it
|
||||||
CalamaresUtils::callQMLFunction( m_qmlObject, activate ? "onActivate" : "onLeave" );
|
CalamaresUtils::callQmlFunction( m_qmlObject, activate ? "onActivate" : "onLeave" );
|
||||||
}
|
}
|
||||||
else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() )
|
else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() )
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
@ -3,13 +3,17 @@
|
|||||||
# This file is distributed under the same license as the PACKAGE package.
|
# This file is distributed under the same license as the PACKAGE package.
|
||||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||||
#
|
#
|
||||||
|
# Translators:
|
||||||
|
# Danial Behzadi <dani.behzi@ubuntu.com>, 2020
|
||||||
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2018-10-05 11:34-0400\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2016-12-16 12:18+0000\n"
|
"PO-Revision-Date: 2016-12-16 12:18+0000\n"
|
||||||
|
"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>, 2020\n"
|
||||||
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
|
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -19,24 +23,24 @@ msgstr ""
|
|||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:84
|
#: src/modules/dummypythonqt/main.py:84
|
||||||
msgid "Click me!"
|
msgid "Click me!"
|
||||||
msgstr ""
|
msgstr "کلیکم کنید!"
|
||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:94
|
#: src/modules/dummypythonqt/main.py:94
|
||||||
msgid "A new QLabel."
|
msgid "A new QLabel."
|
||||||
msgstr ""
|
msgstr "یک QLabel جدید."
|
||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:97
|
#: src/modules/dummypythonqt/main.py:97
|
||||||
msgid "Dummy PythonQt ViewStep"
|
msgid "Dummy PythonQt ViewStep"
|
||||||
msgstr ""
|
msgstr "گام نمایش PythonQt الکی"
|
||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:183
|
#: src/modules/dummypythonqt/main.py:183
|
||||||
msgid "The Dummy PythonQt Job"
|
msgid "The Dummy PythonQt Job"
|
||||||
msgstr ""
|
msgstr "کار PythonQt الکی"
|
||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:186
|
#: src/modules/dummypythonqt/main.py:186
|
||||||
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
|
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
|
||||||
msgstr ""
|
msgstr "این کار PythonQt الکی است. کار الکی میگوید: {}"
|
||||||
|
|
||||||
#: src/modules/dummypythonqt/main.py:190
|
#: src/modules/dummypythonqt/main.py:190
|
||||||
msgid "A status message for Dummy PythonQt Job."
|
msgid "A status message for Dummy PythonQt Job."
|
||||||
msgstr ""
|
msgstr "پیام وضعیتی برای کار PythonQt الکی."
|
||||||
|
Binary file not shown.
@ -5,16 +5,16 @@
|
|||||||
#
|
#
|
||||||
# Translators:
|
# Translators:
|
||||||
# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016
|
# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016
|
||||||
# Wantoyo <wantoyek@gmail.com>, 2017
|
# Wantoyèk <wantoyek@gmail.com>, 2017
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2018-10-05 11:34-0400\n"
|
"POT-Creation-Date: 2020-04-30 23:13+0200\n"
|
||||||
"PO-Revision-Date: 2016-12-16 12:18+0000\n"
|
"PO-Revision-Date: 2016-12-16 12:18+0000\n"
|
||||||
"Last-Translator: Wantoyo <wantoyek@gmail.com>, 2017\n"
|
"Last-Translator: Wantoyèk <wantoyek@gmail.com>, 2017\n"
|
||||||
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
|
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
@ -98,11 +98,6 @@ void
|
|||||||
doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions o )
|
doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions o )
|
||||||
{
|
{
|
||||||
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
|
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
|
||||||
QString defaultFsType = o.defaultFsType;
|
|
||||||
if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
|
|
||||||
{
|
|
||||||
defaultFsType = "ext4";
|
|
||||||
}
|
|
||||||
|
|
||||||
bool isEfi = PartUtils::isEfiSystem();
|
bool isEfi = PartUtils::isEfiSystem();
|
||||||
|
|
||||||
@ -227,12 +222,6 @@ doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition
|
|||||||
|
|
||||||
cDebug() << "doReplacePartition for device" << partition->partitionPath();
|
cDebug() << "doReplacePartition for device" << partition->partitionPath();
|
||||||
|
|
||||||
QString defaultFsType = o.defaultFsType;
|
|
||||||
if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
|
|
||||||
{
|
|
||||||
defaultFsType = "ext4";
|
|
||||||
}
|
|
||||||
|
|
||||||
PartitionRole newRoles( partition->roles() );
|
PartitionRole newRoles( partition->roles() );
|
||||||
if ( partition->roles().has( PartitionRole::Extended ) )
|
if ( partition->roles().has( PartitionRole::Extended ) )
|
||||||
{
|
{
|
||||||
|
@ -560,7 +560,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
|
|||||||
Partition* part = modl->partitionForIndex( current );
|
Partition* part = modl->partitionForIndex( current );
|
||||||
if ( !part )
|
if ( !part )
|
||||||
{
|
{
|
||||||
cDebug() << Q_FUNC_INFO << "Partition not found for index" << current;
|
cDebug() << "Partition not found for index" << current;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,10 +120,10 @@ PartitionSplitterWidget::setSplitPartition( const QString& path,
|
|||||||
qint64 maxSize,
|
qint64 maxSize,
|
||||||
qint64 preferredSize )
|
qint64 preferredSize )
|
||||||
{
|
{
|
||||||
cDebug() << Q_FUNC_INFO << "path:" << path
|
cDebug() << "path:" << path
|
||||||
<< "\nminSize:" << minSize
|
<< Logger::Continuation << "minSize:" << minSize
|
||||||
<< "\nmaxSize:" << maxSize
|
<< Logger::Continuation << "maxSize:" << maxSize
|
||||||
<< "\nprfSize:" << preferredSize;
|
<< Logger::Continuation << "prfSize:" << preferredSize;
|
||||||
|
|
||||||
if ( m_itemToResize && m_itemToResizeNext )
|
if ( m_itemToResize && m_itemToResizeNext )
|
||||||
{
|
{
|
||||||
|
@ -98,6 +98,7 @@ class ConfigController:
|
|||||||
|
|
||||||
# Remove calamares
|
# Remove calamares
|
||||||
self.remove_pkg("calamares", "usr/bin/calamares")
|
self.remove_pkg("calamares", "usr/bin/calamares")
|
||||||
|
self.remove_pkg("calamares-git", "usr/bin/calamares")
|
||||||
|
|
||||||
# Copy skel to root
|
# Copy skel to root
|
||||||
self.copy_folder('etc/skel', 'root')
|
self.copy_folder('etc/skel', 'root')
|
||||||
|
@ -96,7 +96,7 @@ class RawFSItem:
|
|||||||
count = 0
|
count = 0
|
||||||
|
|
||||||
libcalamares.utils.debug("Copying {} to {}".format(self.source, self.destination))
|
libcalamares.utils.debug("Copying {} to {}".format(self.source, self.destination))
|
||||||
if libcalamares.job.configuration["bogus"]:
|
if libcalamares.job.configuration.get("bogus", False):
|
||||||
return
|
return
|
||||||
|
|
||||||
srcsize, srcblksize = get_device_size(self.source)
|
srcsize, srcblksize = get_device_size(self.source)
|
||||||
|
Loading…
Reference in New Issue
Block a user