Commit 9a4475d7 authored by Philip Müller's avatar Philip Müller

Merge branch 'master' of https://github.com/calamares/calamares into development

parents 49c17942 689a65e1
......@@ -61,6 +61,10 @@ Name[eu]=Sistema instalatu
Icon[eu]=calamares
GenericName[eu]=Sistema instalatzailea
Comment[eu]=Calamares - sistema instalatzailea
Name[fa]=نصب سامانه
Icon[fa]=کالامارس
GenericName[fa]=نصب‌کنندهٔ سامانه
Comment[fa]=کالامارس — نصب‌کنندهٔ سامانه
Name[es_PR]=Instalar el sistema
Name[fr]=Installer le système
Icon[fr]=calamares
......
......@@ -102,7 +102,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/calamares/DebugWindow.ui" line="106"/>
<source>Reload Stylesheet</source>
<translation type="unfinished"/>
<translation>Recargar Hoja de estilo</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
<source>Set up</source>
<translation type="unfinished"/>
<translation>Instalar</translation>
</message>
<message>
<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>
<location filename="../src/libcalamares/JobExample.cpp" line="40"/>
<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>
</context>
<context>
......@@ -154,7 +154,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source>
<translation type="unfinished"/>
<translation>Ejemplo de trabajo (%1)</translation>
</message>
</context>
<context>
......@@ -162,12 +162,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source>Run command '%1' in target system.</source>
<translation type="unfinished"/>
<translation>Ejecutar el comando '% 1' en el sistema de destino.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source> Run command '%1'.</source>
<translation type="unfinished"/>
<translation>Ejecutar el comando '% 1'.</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="76"/>
<source>Loading ...</source>
<translation type="unfinished"/>
<translation>Cargando ...</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="97"/>
<source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
<translation>Paso QML &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="261"/>
<source>Loading failed.</source>
<translation type="unfinished"/>
<translation>La carga ha fallado.</translation>
</message>
</context>
<context>
......@@ -231,9 +231,9 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="164"/>
<source>Waiting for %n module(s).</source>
<translation type="unfinished">
<numerusform/>
<numerusform/>
<translation>
<numerusform>Esperando %n módulo (s).</numerusform>
<numerusform>Esperando %n módulo(s).</numerusform>
</translation>
</message>
<message numerus="yes">
......@@ -247,7 +247,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="170"/>
<source>System-requirements checking is complete.</source>
<translation type="unfinished"/>
<translation>La verificación de los requisitos del sistema está completa.</translation>
</message>
</context>
<context>
......@@ -255,7 +255,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
<source>Setup Failed</source>
<translation type="unfinished"/>
<translation>Configuración Fallida</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="154"/>
<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>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
<source>Install Log Paste URL</source>
<translation type="unfinished"/>
<translation>Pegar URL Registro de Instalación</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="195"/>
<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>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/>
<source>Continue with installation?</source>
<translation type="unfinished"/>
<translation>Continuar con la instalación?</translation>
</message>
<message>
<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.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</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.&lt;br/&gt;&lt;strong&gt;No podrá deshacer estos cambios.&lt;/strong&gt;</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
<source>&amp;Set up now</source>
<translation type="unfinished"/>
<translation>&amp;Configurar ahora</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
<source>&amp;Set up</source>
<translation type="unfinished"/>
<translation>&amp;Instalar</translation>
</message>
<message>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
<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>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1838,7 +1838,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/>
<source>Office</source>
<translation>辦公</translation>
<translation>辦公</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/>
......@@ -3619,7 +3619,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="185"/>
<source>Open release notes website</source>
<translation>開啟發行手記網站</translation>
<translation>開啟發行記事網站</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="188"/>
......
......@@ -9,6 +9,7 @@
# Guido Grasso <cuquiman97@gmail.com>, 2018
# Adolfo Jayme-Barrientos, 2019
# Miguel Mayol <mitcoes@gmail.com>, 2020
# Pier Jose Gotta Perez <piegope@protonmail.com>, 2020
#
#, fuzzy
msgid ""
......@@ -17,7 +18,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-30 23:13+0200\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"
"MIME-Version: 1.0\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
msgid "Unpacking image {}/{}, file {}/{}"
msgstr ""
msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
#: src/modules/unpackfs/main.py:317
msgid "Starting to unpack {}"
msgstr ""
msgstr "Iniciando el desempaquetado {}"
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
msgid "Failed to unpack image \"{}\""
......@@ -137,6 +138,8 @@ msgstr "Configuración de \"unsquash\" no válida"
#: src/modules/unpackfs/main.py:423
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr ""
"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
"actual"
#: src/modules/unpackfs/main.py:427
msgid "The source filesystem \"{}\" does not exist"
......
This diff is collapsed.
......@@ -6,7 +6,7 @@
# Translators:
# Choiril Abdul, 2018
# Harry Suryapambagya <harsxv@gmail.com>, 2018
# Wantoyo <wantoyek@gmail.com>, 2018
# Wantoyèk <wantoyek@gmail.com>, 2018
#
#, fuzzy
msgid ""
......@@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-30 23:13+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......
......@@ -5,6 +5,7 @@
#
# Translators:
# 黃柏諺 <s8321414@gmail.com>, 2020
# Walter Cheuk <wwycheuk@gmail.com>, 2020
#
#, fuzzy
msgid ""
......@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-30 23:13+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -126,7 +127,7 @@ msgstr "錯誤的 unsquash 設定"
#: src/modules/unpackfs/main.py:423
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr "\"{}\" ({}) 的檔案系統不被您目前的核心所支援"
msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
#: src/modules/unpackfs/main.py:427
msgid "The source filesystem \"{}\" does not exist"
......@@ -136,7 +137,7 @@ msgstr "來源檔案系統 \"{}\" 不存在"
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
msgstr "找不到 unsquashfs,請確定已安裝 squashfs-tools 軟體包"
msgstr "找不到 unsquashfs,請確定已安裝 squashfs-tools 軟體包"
#: src/modules/unpackfs/main.py:447
msgid "The destination \"{}\" in the target system is not a directory"
......
......@@ -3,13 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Danial Behzadi <dani.behzi@ubuntu.com>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>, 2020\n"
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -19,24 +23,24 @@ msgstr ""
#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
msgstr "کلیکم کنید!"
#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
msgstr "یک QLabel جدید."
#: src/modules/dummypythonqt/main.py:97
msgid "Dummy PythonQt ViewStep"
msgstr ""
msgstr "گام نمایش PythonQt الکی"
#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
msgstr "کار PythonQt الکی"
#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
msgstr "این کار PythonQt الکی است. کار الکی می‌گوید: {}"
#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
msgstr "پیام وضعیتی برای کار PythonQt الکی."
......@@ -5,16 +5,16 @@
#
# Translators:
# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016
# Wantoyo <wantoyek@gmail.com>, 2017
# Wantoyèk <wantoyek@gmail.com>, 2017
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......
......@@ -98,11 +98,6 @@ void
doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions o )
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QString defaultFsType = o.defaultFsType;
if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
{
defaultFsType = "ext4";
}
bool isEfi = PartUtils::isEfiSystem();
......@@ -227,12 +222,6 @@ doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition
cDebug() << "doReplacePartition for device" << partition->partitionPath();
QString defaultFsType = o.defaultFsType;
if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
{
defaultFsType = "ext4";
}
PartitionRole newRoles( partition->roles() );
if ( partition->roles().has( PartitionRole::Extended ) )
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment