[merge] upstream code

This commit is contained in:
Philip Müller 2021-09-17 21:18:36 +02:00
commit 52ef084c31
24 changed files with 129 additions and 101 deletions

17
CHANGES
View File

@ -7,16 +7,25 @@ contributors are listed. Note that Calamares does not have a historical
changelog -- this log starts with version 3.2.0. The release notes on the
website will have to do for older versions.
# 3.2.43 (unreleased) #
# 3.2.43 (2021-09-17) #
This release contains contributions from (alphabetically by first name):
- No external contributors yet
- Anke Boersma
- Joe Kamprad
## Core ##
- No core changes yet
- Translations have been made more consistent. In particular, some *OK*,
*Yes*, *No* and *Cancel* buttons that were previously untranslated
or "stuck" in the language that Calamares started in, are now
changed to the current language as selected in the welcome page.
- Documentation improvements from Joe Kamprad. A *sizeLimit* of zero
(which is the default if nothing is set in the branding configuration)
disables log uploads.
## Modules ##
- No module changes yet
- The *keyboardq* module (QML-based UI for keyboard-layout-selection)
now features an interactive keyboard preview and has the
layout adjusted. (Thanks Anke)
# 3.2.42 (2021-09-06) #

View File

@ -45,7 +45,7 @@ project( CALAMARES
LANGUAGES C CXX
)
set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
### OPTIONS
#
@ -133,14 +133,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
# `txstats.py -e`. See also
#
# Total 79 languages
set( _tx_complete az az_AZ ca de fi_FI he hi hr ja ko lt pt_BR sq
sv uk zh_TW )
set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl pt_PT
ru sk tg tr_TR vi zh_CN )
set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
is mr nb pl ro si sl sr sr@latin th )
set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
ne ne_NP ru_RU te ur uz )
set( _tx_complete az az_AZ ca fi_FI he hi ja ko lt pt_PT sq sv uk
zh_CN zh_TW )
set( _tx_good as be ca@valencia cs_CZ da de fr fur hr it_IT ml nl
pt_BR ru sk tg tr_TR vi )
set( _tx_ok ar ast bg bn el en_GB es es_MX et eu fa gl hu id is mr
nb pl ro si sl sr sr@latin th )
set( _tx_incomplete eo es_PE es_PR fr_CH gu id_ID ie kk kn ko_KR lo
lv mk ne ne_NP ru_RU te ur uz zh zh_HK )
### Required versions
#

View File

@ -949,12 +949,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="177"/>
<source>Install option: &lt;strong&gt;%1&lt;/strong&gt;</source>
<translation type="unfinished"/>
<translation> ि : &lt;strong&gt;%1&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="177"/>
<source>None</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="82"/>
@ -2805,37 +2805,37 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="534"/>
<source>EFI system partition configured incorrectly</source>
<translation type="unfinished"/>
<translation>EFI ि ि ि ि </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="539"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a suitable filesystem.</source>
<translation type="unfinished"/>
<translation>%1 EFI ि ि &lt;br/&gt;&lt;br/&gt; EFI ि ि ि , ि </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="550"/>
<source>The filesystem must be mounted on &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation> ि &lt;strong&gt;%1&lt;/strong&gt; </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="556"/>
<source>The filesystem must have type FAT32.</source>
<translation type="unfinished"/>
<translation> ि FAT32 </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="562"/>
<source>The filesystem must be at least %1 MiB in size.</source>
<translation type="unfinished"/>
<translation> ि -- %1 </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="569"/>
<source>The filesystem must have flag &lt;strong&gt;%1&lt;/strong&gt; set.</source>
<translation type="unfinished"/>
<translation> ि &lt;strong&gt;%1&lt;/strong&gt; </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="575"/>
<source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
<translation type="unfinished"/>
<translation> ि EFI ि ि ि ि </translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="592"/>
@ -4099,7 +4099,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>To activate keyboard preview, select a layout.</source>
<translation type="unfinished"/>
<translation> ि ि </translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>
@ -4114,7 +4114,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="263"/>
<source>Type here to test your keyboard</source>
<translation> ि </translation>
<translation> ि </translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="179"/>
@ -4146,37 +4146,38 @@ Output:
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
<source>LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.&lt;br/&gt;
Default option.</source>
<translation type="unfinished"/>
<translation>ि-ि ि ि ि ि िि ि ि ि &lt;br/&gt;
ि ि</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
<source>LibreOffice</source>
<translation type="unfinished"/>
<translation>ि-ि</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
<source>If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.</source>
<translation type="unfinished"/>
<translation>ि ि , ि ि ि ि ( ि) </translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
<source>No Office Suite</source>
<translation type="unfinished"/>
<translation> ि </translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
<source>Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser.</source>
<translation type="unfinished"/>
<translation> ि , िि ि ि ि , ि , ि ि , , , - </translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
<source>Minimal Install</source>
<translation type="unfinished"/>
<translation>ि </translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
<source>Please select an option for your install, or use the default: LibreOffice included.</source>
<translation type="unfinished"/>
<translation> ि ि ि करें : इसमें ि-ि िि </translation>
</message>
</context>
<context>

View File

@ -2825,17 +2825,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="562"/>
<source>The filesystem must be at least %1 MiB in size.</source>
<translation type="unfinished"/>
<translation>O sistema de ficheiros deve ter pelo menos %1 MiB de tamanho.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="569"/>
<source>The filesystem must have flag &lt;strong&gt;%1&lt;/strong&gt; set.</source>
<translation type="unfinished"/>
<translation>O sistema de ficheiros deve ter a "flag" %1 definida.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="575"/>
<source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
<translation type="unfinished"/>
<translation>Pode continuar sem configurar uma partição do sistema EFI, mas o seu sistema pode não arrancar.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="592"/>
@ -4099,7 +4099,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>To activate keyboard preview, select a layout.</source>
<translation type="unfinished"/>
<translation>Para ativar a pré-visualização do teclado, selecione um esquema.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>
@ -4146,7 +4146,8 @@ Saída de Dados:
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
<source>LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.&lt;br/&gt;
Default option.</source>
<translation type="unfinished"/>
<translation>O LibreOffice é um programa de produtividade poderoso e gratuito, utilizado por milhões de pessoas em todo o mundo. Inclui várias aplicações que o tornam o mais versátil programa de produtividade Livre e de Código Aberto do mercado.&lt;br/&gt;
Opção predefinida.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
@ -4156,27 +4157,27 @@ Saída de Dados:
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
<source>If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.</source>
<translation type="unfinished"/>
<translation>Se não quiser instalar um programa de produtividade, basta selecionar Sem programa de produtividade. Pode sempre adicionar uma (ou mais) mais tarde no sistema instalado, à medida que houver a necessidade.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
<source>No Office Suite</source>
<translation type="unfinished"/>
<translation>Sem programa de produtividade</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
<source>Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser.</source>
<translation type="unfinished"/>
<translation>Crie uma instalação mínima do Ambiente de trabalho, remova todas as aplicações extra e decida mais tarde o que gostaria de adicionar ao sistema. Exemplos do que não estará em tal instalação, não haverá nenhum programa de produtividade, nenhum reprodutor multimédia, nenhum visualizador de imagens ou suporte de impressão. Será apenas um ambiente de trabalho, navegador de ficheiros, gestor de pacotes, editor de texto e um simples navegador da web.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
<source>Minimal Install</source>
<translation type="unfinished"/>
<translation>Instalação Mínima</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
<source>Please select an option for your install, or use the default: LibreOffice included.</source>
<translation type="unfinished"/>
<translation>Selecione uma opção para a sua instalação, ou utilize o predefinido: LibreOffice incluído.</translation>
</message>
</context>
<context>
@ -4332,7 +4333,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="190"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Apenas são permitidas letras, números, sublinhado e hífen, mínimo de dois caracteres.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="293"/>

View File

@ -4099,7 +4099,7 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>To activate keyboard preview, select a layout.</source>
<translation type="unfinished"/>
<translation>Välj en layout för att aktivera förhandsgranskning av tangentbord.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>

View File

@ -341,6 +341,8 @@ msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
"comando <pre>{!s}</pre>devolveu o código de erro {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."

View File

@ -228,6 +228,7 @@ slideshowAPI: 2
# Takes string as input. Important bits are the host and port,
# the scheme is not used.
# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted.
# The option must be set, to have the log option work.
# Takes integer as input. If < 0, no limit will be forced,
# else only last (approximately) 'n' KiB of log file will be pasted.
# Please note that upload size may be slightly over the limit (due

View File

@ -33,10 +33,16 @@ using namespace CalamaresUtils::Units;
STATICTEST QByteArray
logFileContents( const qint64 sizeLimitBytes )
{
if ( sizeLimitBytes != -1 )
if ( sizeLimitBytes > 0 )
{
cDebug() << "Log upload size limit was limited to" << sizeLimitBytes << "bytes";
}
if ( sizeLimitBytes == 0 )
{
cDebug() << "Log upload size is 0, upload disabled.";
return QByteArray();
}
const QString name = Logger::logFile();
QFile pasteSourceFile( name );
if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
@ -44,7 +50,7 @@ logFileContents( const qint64 sizeLimitBytes )
cWarning() << "Could not open log file" << name;
return QByteArray();
}
if ( sizeLimitBytes == -1 )
if ( sizeLimitBytes < 0 )
{
return pasteSourceFile.readAll();
}
@ -52,7 +58,7 @@ logFileContents( const qint64 sizeLimitBytes )
if ( fi.size() > sizeLimitBytes )
{
cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded";
fi.refresh();
fi.refresh(); // Because we just wrote to the file with that cDebug() ^^
pasteSourceFile.seek( fi.size() - sizeLimitBytes );
}
return pasteSourceFile.read( sizeLimitBytes );
@ -115,7 +121,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
if ( !serverUrl.isValid() )
{
cWarning() << "Upload configure with invalid URL";
cWarning() << "Upload configured with invalid URL";
return QString();
}
if ( type == Calamares::Branding::UploadServerType::None )
@ -123,6 +129,12 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
// Early return to avoid reading the log file
return QString();
}
if ( sizeLimitBytes == 0 )
{
// Suggests that it is un-set in the config file
cWarning() << "Upload configured to send 0 bytes";
return QString();
}
QByteArray pasteData = logFileContents( sizeLimitBytes );
if ( pasteData.isEmpty() )
@ -181,5 +193,5 @@ bool
CalamaresUtils::Paste::isEnabled()
{
auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
return type != Calamares::Branding::UploadServerType::None;
return type != Calamares::Branding::UploadServerType::None && sizeLimitBytes != 0;
}

View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
/* === This file is part of Calamares - <https://calamares.io> ===
*
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*

View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
/* === This file is part of Calamares - <https://calamares.io> ===
*
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".6"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".6"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".6"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".6"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -1,10 +1,10 @@
<!-- === This file is part of Calamares - <https://github.com/calamares> ===
<?xml version="1.0" encoding="UTF-8"?>
<!-- === This file is part of Calamares - <https://calamares.io> ===
* Copyright 2021, Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above. -->
<?xml version="1.0" encoding="UTF-8"?>
<Keyboard>
<Row>
<Key labels = " |" ratio = ".8"/>

View File

@ -68,7 +68,7 @@ dontChroot: false
# - "/bin/ls"
# - "/usr/bin/true"
# Script may be a lit of items (if the touch command fails, it is
# Script may be a list of items (if the touch command fails, it is
# ignored; the slowloris command has a different timeout from the
# other commands in the list):
script: