From b9ad701a5c1047d5c18c2a3f98a84c7d1865a765 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 15:56:22 +0100 Subject: [PATCH 1/6] [calamares] Change .desktop invocation FIXES #1653 --- calamares.desktop | 3 ++- calamares.desktop.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100644 new mode 100755 index 834c4a518..cd8a353c9 --- a/calamares.desktop +++ b/calamares.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 @@ -5,7 +6,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sh -c "pkexec calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false diff --git a/calamares.desktop.in b/calamares.desktop.in index 9bfbf8fd9..ed1d4def8 100644 --- a/calamares.desktop.in +++ b/calamares.desktop.in @@ -5,7 +5,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sh -c "pkexec calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false From 1c8a72dcac7266129c94615ec02795e59989775c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 10:28:57 +0100 Subject: [PATCH 2/6] Changes: pre-release housekeeping --- CHANGES | 11 +++++++++++ CMakeLists.txt | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 99a59ef19..98300be64 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,17 @@ 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.38.1 (2021-03-15) # + +This hotfix release is for this item in the release notes of 3.2.38: + - The .desktop file for Calamares now makes a longer trip, calling + `sh -c "pkexec calamares"`; distributions may still need to adjust. +The change had been lost while updating other files. It has been +restored in `calamares.desktop` and `calamares.desktop.in`. There is +no other difference in this release. (Reported by Erik) + + + # 3.2.38 (2021-03-14) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c46be69c8..a98eec1e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.38 + VERSION 3.2.38.1 LANGUAGES C CXX ) From f02cb1a8ea07063705e60c7bd826097324b446ec Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 15 Mar 2021 10:34:25 +0100 Subject: [PATCH 3/6] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ko.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_uk.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_zh_TW.ts | 44 +++++++++++++++++++++++------------------ 3 files changed, 75 insertions(+), 57 deletions(-) diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 3ba725891..812068eba 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 자동 마운트 설정 관리 @@ -316,7 +316,11 @@ %1 Link copied to clipboard - + 게시한 로그를 설치합니다. + +%1 + +링크가 클립보드에 복사되었습니다. @@ -852,12 +856,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + %1 설정이 제대로 완료되지 않았습니다. The installation of %1 did not complete successfully. - + %1 설치가 제대로 완료되지 않았습니다. @@ -971,12 +975,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %4 항목이 있는 %3(%2)에 새 %1MiB 파티션을 만듭니다. Create new %1MiB partition on %3 (%2). - + %3(%2)에 새 %1MiB 파티션을 만듭니다. @@ -986,12 +990,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <em>%4</em> 항목이 있는 <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다. @@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <em>%3</em> 기능이 있는 <strong>새</strong> %2 시스템 파티션에 %1을(를) 설치합니다. @@ -1349,27 +1353,27 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + 마운트 지점 <strong>%1</strong> 및 기능 <em>%3</em>(으)로 <strong>새</strong> %2 파티션을 설정합니다. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + 마운트 지점 <strong>%1</strong>%3(으)로 <strong>새</strong> %2 파티션을 설정합니다. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + <em>%4</em> 기능이 있는 %3 시스템 파티션 <strong>%1</strong>에 %2을(를) 설치합니다. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + 마운트 지점 <strong>%2</strong> 및 기능 <em>%4</em>(으)로 %3 파티션 <strong>%1</strong>을(를) 설정합니다. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + 마운트 지점 <strong>%2</strong>%4으로 %3 파티션 <strong>%1</strong>을(를) 설정합니다. @@ -3950,29 +3954,31 @@ Output: Installation Completed - + 설치 완료 %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1이(가) 컴퓨터에 설치되었습니다.<br/> + 이제 새 시스템으로 다시 시작하거나 라이브 환경을 계속 사용할 수 있습니다. Close Installer - + 설치 관리자 닫기 Restart System - + 시스템 재시작 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>설치의 전체 로그는 라이브 사용자의 홈 디렉토리에 installation.log로 제공됩니다.<br/> + 이 로그는 대상 시스템의 /var/log/installation.log에 복사됩니다.</p> diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 9748c6f25..db4b54756 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Керування параметрами автомонтування @@ -322,7 +322,11 @@ %1 Link copied to clipboard - + Журнал встановлення записано до + +%1 + +Посилання скопійовано до буфера обміну @@ -858,12 +862,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + Налаштування %1 не завершено успішно. The installation of %1 did not complete successfully. - + Встановлення %1 не завершено успішно. @@ -977,12 +981,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + Створити розділ %1МіБ на %3 (%2) із записами %4. Create new %1MiB partition on %3 (%2). - + Створити розділ %1МіБ на %3 (%2). @@ -992,12 +996,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2) із записами <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2). @@ -1345,7 +1349,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Встановити %1 на <strong>новий</strong> системний розділ %2 із можливостями <em>%3</em> @@ -1355,27 +1359,27 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Налаштувати <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong> і можливостями <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Налаштувати <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Встановити %2 на системний розділ %3 <strong>%1</strong> із можливостями <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong> і можливостями <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong>%4. @@ -3983,29 +3987,31 @@ Output: Installation Completed - + Встановлення завершено %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + На ваш комп'ютер встановлено %1.<br/> + Тепер ви можете перезапустити вашу нову систему або продовжити користуватися середовищем портативної системи. Close Installer - + Закрити засіб встановлення Restart System - + Перезапустити систему <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Повний журнал встановлення записано до файла installation.log у домашньому каталозі користувача портативної системи.<br/> + Цей журнал скопійовано до /var/log/installation.log системи призначення.</p> diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 0c0883d18..975387456 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 管理自動掛載設定 @@ -316,7 +316,11 @@ %1 Link copied to clipboard - + 安裝紀錄檔已張貼到： + +%1 + +連結已複製到剪貼簿 @@ -852,12 +856,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + %1 的設定並未成功完成。 The installation of %1 did not complete successfully. - + %1 的安裝並未成功完成。 @@ -971,12 +975,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + 在 %3 (%2) 上使用項目 %4 建立新的 %1MiB 分割區。 Create new %1MiB partition on %3 (%2). - + 在 %3 (%2) 上建立新的 %1MiB 分割區。 @@ -986,12 +990,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + 在 <strong>%3</strong> (%2) 上使用項目 <em>%4</em> 建立新的 <strong>%1MiB</strong> 分割區。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + 在 <strong>%3</strong> (%2) 上建立新的 <strong>%1MiB</strong> 分割區。 @@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + 在有 <em>%3</em> 功能的<strong>新</strong> %2 系統分割區上安裝 %1 @@ -1349,27 +1353,27 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + 設定有掛載點 <strong>%1</strong> 與 <em>%3</em> 的<strong>新</strong> %2 分割區。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + 設定有掛載點 <strong>%1</strong> %3 的<strong>新</strong> %2 分割區。 Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + 在有功能 <em>%4</em> 的 %3 系統分割區 <strong>%1</strong> 上安裝 %2。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + 為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong> 與功能 <em>%4</em>。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + 為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong> %4。 @@ -3950,29 +3954,31 @@ Output: Installation Completed - + 安裝完成 %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 已安裝到您的電腦上。<br/> + 現在，您可以重新啟動到您的新系統，或繼續使用 Live 環境。 Close Installer - + 關閉安裝程式 Restart System - + 重新啟動系統 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>完整安裝紀錄檔可在 Live 使用者的家目錄中以 installation.log 的名稱取得。<br/> + 此紀錄檔已複製到目標系統的 /var/log/installation.log。</p> From df67f2bb5969c72c11beb9190be180bcbcf929c6 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 15 Mar 2021 10:34:25 +0100 Subject: [PATCH 4/6] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 1 - 1 file changed, 1 deletion(-) mode change 100755 => 100644 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100755 new mode 100644 index cd8a353c9..1f25c1f10 --- a/calamares.desktop +++ b/calamares.desktop @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 From d2c0c8d638856dbf2a71d2e30e097a02825183f1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 11:53:14 +0100 Subject: [PATCH 5/6] [users] Grab hostname from config on creation --- src/modules/users/UsersPage.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index be9e63498..0e86931c1 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -105,6 +105,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) connect( ui->textBoxFullName, &QLineEdit::textEdited, config, &Config::setFullName ); connect( config, &Config::fullNameChanged, this, &UsersPage::onFullNameTextEdited ); + ui->textBoxHostName->setText( config->hostName() ); connect( ui->textBoxHostName, &QLineEdit::textEdited, config, &Config::setHostName ); connect( config, &Config::hostNameChanged, ui->textBoxHostName, &QLineEdit::setText ); connect( config, &Config::hostNameStatusChanged, this, &UsersPage::reportHostNameStatus ); @@ -144,9 +145,12 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() ); onFullNameTextEdited( m_config->fullName() ); reportLoginNameStatus( m_config->loginNameStatus() ); + reportHostNameStatus( m_config->hostNameStatus() ); ui->textBoxLoginName->setEnabled( m_config->isEditable( "loginName" ) ); ui->textBoxFullName->setEnabled( m_config->isEditable( "fullName" ) ); + + retranslate(); } UsersPage::~UsersPage() From 202fe46182b458aa85a9756ed2dc044b792a53e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 12:02:45 +0100 Subject: [PATCH 6/6] Changes: describe other fixes as well --- CHANGES | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 98300be64..de8d180c3 100644 --- a/CHANGES +++ b/CHANGES @@ -12,10 +12,11 @@ website will have to do for older versions. This hotfix release is for this item in the release notes of 3.2.38: - The .desktop file for Calamares now makes a longer trip, calling `sh -c "pkexec calamares"`; distributions may still need to adjust. -The change had been lost while updating other files. It has been -restored in `calamares.desktop` and `calamares.desktop.in`. There is -no other difference in this release. (Reported by Erik) - +The change had been lost while updating other files. It has been restored +in `calamares.desktop` and `calamares.desktop.in`. (Reported by Erik) +Other minor changes and fixes: + - presets in the *users* module show the hostname, too, + - translations update for Korean, Ukranian and Chinese (zh_TW). # 3.2.38 (2021-03-14) #