diff --git a/CHANGES b/CHANGES
index e0a44f40f..535a8e57b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4ac77946..1c2e6fdf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
#
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 4e7a9b330..a7ce01d65 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -949,12 +949,12 @@ The installer will quit and all changes will be lost.
Install option: <strong>%1</strong>
-
+ इंस्टॉल विकल्प : <strong>%1</strong>None
-
+ कोई नहीं
@@ -2805,37 +2805,37 @@ The installer will quit and all changes will be lost.
EFI system partition configured incorrectly
-
+ EFI सिस्टम विभाजन उचित रूप से विन्यस्त नहीं हैAn EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-
+ %1 आरंभ करने हेतु EFI सिस्टम विभाजन आवश्यक है। <br/><br/> EFI सिस्टम विभाजन विन्यस्त करने हेतु, वापस जाएँ व एक उपयुक्त फाइल सिस्टम चुनें या बनाएँ।The filesystem must be mounted on <strong>%1</strong>.
-
+ फाइल सिस्टम का <strong>%1</strong> पर माउंट होना आवश्यक है।The filesystem must have type FAT32.
-
+ फाइल सिस्टम का प्रकार FAT32 होना आवश्यक है।The filesystem must be at least %1 MiB in size.
-
+ फाइल सिस्टम का आकार कम-से-कम %1 एमबी होना आवश्यक है।The filesystem must have flag <strong>%1</strong> set.
-
+ फाइल सिस्टम पर <strong>%1</strong> फ्लैग सेट होना आवश्यक है।You can continue without setting up an EFI system partition but your system may fail to start.
-
+ आप बिना EFI सिस्टम विभाजन सेट करें भी प्रक्रिया जारी रख सकते हैं परन्तु सम्भवतः ऐसा करने से आपका सिस्टम आरंभ नहीं होगा।
@@ -4099,7 +4099,7 @@ Output:
To activate keyboard preview, select a layout.
-
+ कुंजीपटल पूर्वावलोकन सक्रिय करने हेतु एक अभिन्यास चुनें।
@@ -4114,7 +4114,7 @@ Output:
Type here to test your keyboard
- अपना कुंजीपटल जाँचने के लिए यहां टाइप करें
+ अपना कुंजीपटल जाँचने के लिए यहाँ टाइप करें
@@ -4146,37 +4146,38 @@ Output:
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.<br/>
Default option.
-
+ लिब्रे-ऑफिस एक सशक्त और निःशुल्क ऑफिस सॉफ्टवेयर है जिसका उपयोग दुनिया भर के लाखों लोग करते हैं। इसमें कई अनुप्रयोग सम्मिलित हैं जो इसे उपलब्ध विकल्पों में सबसे बहुमुखी निःशुल्क व मुक्त स्रोत ऑफिस सॉफ्टवेयर बनाते हैं।<br/>
+डिफ़ॉल्ट विकल्प।LibreOffice
-
+ लिब्रे-ऑफिस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.
-
+ यदि आप ऑफिस सॉफ्टवेयर इंस्टॉल नहीं करना चाहते हैं, तो कोई ऑफिस सॉफ्टवेयर नहीं का विकल्प चुनें। आप आवश्यकता अनुसार बाद में अपने इंस्टॉल किए गए सिस्टम पर एक (या अधिक) ऐसे सॉफ्टवेयर जोड़ सकते हैं।No Office Suite
-
+ कोई ऑफिस सॉफ्टवेयर नहीं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.
-
+ एक संक्षिप्त डेस्कटॉप इंस्टॉल का सृजन करें, सभी अतिरिक्त अनुप्रयोग हटाएँ एवं इंस्टॉल उपरांत तय करें कि आप सिस्टम में कौन से सॉफ्टवेयर जोड़ना चाहते हैं। इस प्रकार के इंस्टॉल में उदाहरण के तौर पर कोई ऑफिस सॉफ्टवेयर, कोई मीडिया प्लेयर, कोई चित्र प्रदर्शक या प्रिंटर समर्थन नहीं होगा। इसमें केवल एक डेस्कटॉप, फाइल प्रबंधक, पैकेज प्रबंधक, लेख संपादक व सरल वेब-ब्राउज़र होगा।Minimal Install
-
+ संक्षिप्त इंस्टॉलPlease select an option for your install, or use the default: LibreOffice included.
-
+ कृपया अपने इंस्टॉल हेतु एक विकल्प चुनें या फिर डिफ़ॉल्ट ही उपयोग करें : इसमें लिब्रे-ऑफिस सम्मिलित है।
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 624f56969..bed076938 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -2825,17 +2825,17 @@ O instalador será encerrado e todas as alterações serão perdidas.
The filesystem must be at least %1 MiB in size.
-
+ O sistema de ficheiros deve ter pelo menos %1 MiB de tamanho.The filesystem must have flag <strong>%1</strong> set.
-
+ O sistema de ficheiros deve ter a "flag" %1 definida.You can continue without setting up an EFI system partition but your system may fail to start.
-
+ Pode continuar sem configurar uma partição do sistema EFI, mas o seu sistema pode não arrancar.
@@ -4099,7 +4099,7 @@ Saída de Dados:
To activate keyboard preview, select a layout.
-
+ Para ativar a pré-visualização do teclado, selecione um esquema.
@@ -4146,7 +4146,8 @@ Saída de Dados:
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.<br/>
Default option.
-
+ 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.<br/>
+ Opção predefinida.
@@ -4156,27 +4157,27 @@ Saída de Dados:
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.
-
+ 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.No Office Suite
-
+ Sem programa de produtividadeCreate 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.
-
+ 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.Minimal Install
-
+ Instalação MínimaPlease select an option for your install, or use the default: LibreOffice included.
-
+ Selecione uma opção para a sua instalação, ou utilize o predefinido: LibreOffice incluído.
@@ -4332,7 +4333,7 @@ Saída de Dados:
Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-
+ Apenas são permitidas letras, números, sublinhado e hífen, mínimo de dois caracteres.
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 605ad0538..43f7cca88 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -4099,7 +4099,7 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
To activate keyboard preview, select a layout.
-
+ Välj en layout för att aktivera förhandsgranskning av tangentbord.
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 145dbfd45..d0124ad06 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -341,6 +341,8 @@ msgid ""
"The package manager could not make changes to the installed system. The "
"command
{!s}
returned error code {!s}."
msgstr ""
+"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
+"comando
{!s}
devolveu o código de erro {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index 938d9eeb2..b8757411f 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -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
diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index 9190fcf5c..519dc0133 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -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;
}
diff --git a/src/modules/keyboardq/data/Key.qml b/src/modules/keyboardq/data/Key.qml
index e85b44f08..e5c766e41 100644
--- a/src/modules/keyboardq/data/Key.qml
+++ b/src/modules/keyboardq/data/Key.qml
@@ -1,6 +1,7 @@
-/* === This file is part of Calamares - ===
+/* === This file is part of Calamares - ===
*
- * Copyright 2021, Anke Boersma
+ * SPDX-FileCopyrightText: 2021 Anke Boersma
+ * SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
diff --git a/src/modules/keyboardq/data/Keyboard.qml b/src/modules/keyboardq/data/Keyboard.qml
index a804ca9f4..5d1356a82 100644
--- a/src/modules/keyboardq/data/Keyboard.qml
+++ b/src/modules/keyboardq/data/Keyboard.qml
@@ -1,6 +1,7 @@
-/* === This file is part of Calamares - ===
+/* === This file is part of Calamares - ===
*
- * Copyright 2021, Anke Boersma
+ * SPDX-FileCopyrightText: 2021 Anke Boersma
+ * SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
diff --git a/src/modules/keyboardq/data/afgani.xml b/src/modules/keyboardq/data/afgani.xml
index 356e393f7..8b445b2eb 100644
--- a/src/modules/keyboardq/data/afgani.xml
+++ b/src/modules/keyboardq/data/afgani.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/ar.xml b/src/modules/keyboardq/data/ar.xml
index 07bd9b087..a0e5ad0c6 100644
--- a/src/modules/keyboardq/data/ar.xml
+++ b/src/modules/keyboardq/data/ar.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/de.xml b/src/modules/keyboardq/data/de.xml
index 55513157e..883d4dddf 100644
--- a/src/modules/keyboardq/data/de.xml
+++ b/src/modules/keyboardq/data/de.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/empty.xml b/src/modules/keyboardq/data/empty.xml
index 74e913a07..a8afccb11 100644
--- a/src/modules/keyboardq/data/empty.xml
+++ b/src/modules/keyboardq/data/empty.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/en.xml b/src/modules/keyboardq/data/en.xml
index 2ab9a344d..3602f1d94 100644
--- a/src/modules/keyboardq/data/en.xml
+++ b/src/modules/keyboardq/data/en.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/es.xml b/src/modules/keyboardq/data/es.xml
index 6f69c9cbe..3cac9be1c 100644
--- a/src/modules/keyboardq/data/es.xml
+++ b/src/modules/keyboardq/data/es.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/fr.xml b/src/modules/keyboardq/data/fr.xml
index 0f77c3f06..5328c49a7 100644
--- a/src/modules/keyboardq/data/fr.xml
+++ b/src/modules/keyboardq/data/fr.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/generic.xml b/src/modules/keyboardq/data/generic.xml
index 7304626c4..1be4ec4c8 100644
--- a/src/modules/keyboardq/data/generic.xml
+++ b/src/modules/keyboardq/data/generic.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/generic_qz.xml b/src/modules/keyboardq/data/generic_qz.xml
index c896f59ff..b8e36cd79 100644
--- a/src/modules/keyboardq/data/generic_qz.xml
+++ b/src/modules/keyboardq/data/generic_qz.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/pt.xml b/src/modules/keyboardq/data/pt.xml
index 0142260ee..fa883f04d 100644
--- a/src/modules/keyboardq/data/pt.xml
+++ b/src/modules/keyboardq/data/pt.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/ru.xml b/src/modules/keyboardq/data/ru.xml
index 38f2b6836..729ff6971 100644
--- a/src/modules/keyboardq/data/ru.xml
+++ b/src/modules/keyboardq/data/ru.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/scan.xml b/src/modules/keyboardq/data/scan.xml
index 76981f3c1..efdb01de0 100644
--- a/src/modules/keyboardq/data/scan.xml
+++ b/src/modules/keyboardq/data/scan.xml
@@ -1,10 +1,10 @@
-
-
-
diff --git a/src/modules/keyboardq/data/shift.license b/src/modules/keyboardq/data/shift.svg.license
similarity index 100%
rename from src/modules/keyboardq/data/shift.license
rename to src/modules/keyboardq/data/shift.svg.license
diff --git a/src/modules/shellprocess/shellprocess.conf b/src/modules/shellprocess/shellprocess.conf
index 8501d9844..07947f38f 100644
--- a/src/modules/shellprocess/shellprocess.conf
+++ b/src/modules/shellprocess/shellprocess.conf
@@ -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: