Merge branch 'hotfix-38' into calamares

main
Adriaan de Groot 4 years ago
commit 46f7e6c131

@ -23,6 +23,18 @@ This release contains contributions from (alphabetically by first name):
`mount.conf` file.
# 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`. (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) #
This release contains contributions from (alphabetically by first name):

@ -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

@ -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

@ -6,7 +6,7 @@
<message>
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
<source>Manage auto-mount settings</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
</context>
<context>
@ -316,7 +316,11 @@
%1
Link copied to clipboard</source>
<translation type="unfinished"/>
<translation> .
%1
.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
@ -852,12 +856,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
<source>The setup of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1 .</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="146"/>
<source>The installation of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1 .</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="150"/>
@ -971,12 +975,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
<translation type="unfinished"/>
<translation>%4 %3(%2) %1MiB .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation>%3(%2) %1MiB .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
@ -986,12 +990,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;em&gt;%4&lt;/em&gt; &lt;strong&gt;%3&lt;/strong&gt;(%2) &lt;strong&gt;%1MiB&lt;/strong&gt; .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;%3&lt;/strong&gt;(%2) &lt;strong&gt;%1MiB&lt;/strong&gt; .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
<source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition with features &lt;em&gt;%3&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>&lt;em&gt;%3&lt;/em&gt; &lt;strong&gt;&lt;/strong&gt; %2 %1() .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
@ -1349,27 +1353,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt; and features &lt;em&gt;%3&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; &lt;em&gt;%3&lt;/em&gt;() &lt;strong&gt;&lt;/strong&gt; %2 .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt;%3() &lt;strong&gt;&lt;/strong&gt; %2 .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
<source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;em&gt;%4&lt;/em&gt; %3 &lt;strong&gt;%1&lt;/strong&gt; %2() .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt; and features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%2&lt;/strong&gt; &lt;em&gt;%4&lt;/em&gt;() %3 &lt;strong&gt;%1&lt;/strong&gt;() .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%2&lt;/strong&gt;%4 %3 &lt;strong&gt;%1&lt;/strong&gt;() .</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
@ -3950,29 +3954,31 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.&lt;br/&gt;
You may now restart into your new system, or continue using the Live environment.</source>
<translation type="unfinished"/>
<translation>%1() .&lt;br/&gt;
.</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
<source>&lt;p&gt;A full log of the install is available as installation.log in the home directory of the Live user.&lt;br/&gt;
This log is copied to /var/log/installation.log of the target system.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt; installation.log .&lt;br/&gt;
/var/log/installation.log .&lt;/p&gt;</translation>
</message>
</context>
<context>

@ -6,7 +6,7 @@
<message>
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
<source>Manage auto-mount settings</source>
<translation type="unfinished"/>
<translation>Керування параметрами автомонтування</translation>
</message>
</context>
<context>
@ -322,7 +322,11 @@
%1
Link copied to clipboard</source>
<translation type="unfinished"/>
<translation>Журнал встановлення записано до
%1
Посилання скопійовано до буфера обміну</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
@ -858,12 +862,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
<source>The setup of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>Налаштування %1 не завершено успішно.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="146"/>
<source>The installation of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>Встановлення %1 не завершено успішно.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="150"/>
@ -977,12 +981,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
<translation type="unfinished"/>
<translation>Створити розділ %1МіБ на %3 (%2) із записами %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation>Створити розділ %1МіБ на %3 (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
@ -992,12 +996,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>Створити розділ &lt;strong&gt;%1МіБ&lt;/strong&gt; на &lt;strong&gt;%3&lt;/strong&gt; (%2) із записами &lt;em&gt;%4&lt;/em&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation>Створити розділ &lt;strong&gt;%1МіБ&lt;/strong&gt; на &lt;strong&gt;%3&lt;/strong&gt; (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
@ -1345,7 +1349,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
<source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition with features &lt;em&gt;%3&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>Встановити %1 на &lt;strong&gt;новий&lt;/strong&gt; системний розділ %2 із можливостями &lt;em&gt;%3&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
@ -1355,27 +1359,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt; and features &lt;em&gt;%3&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>Налаштувати &lt;strong&gt;новий&lt;/strong&gt; розділ %2 із точкою монтування &lt;strong&gt;%1&lt;/strong&gt; і можливостями &lt;em&gt;%3&lt;/em&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
<translation type="unfinished"/>
<translation>Налаштувати &lt;strong&gt;новий&lt;/strong&gt; розділ %2 із точкою монтування &lt;strong&gt;%1&lt;/strong&gt;%3.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
<source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>Встановити %2 на системний розділ %3 &lt;strong&gt;%1&lt;/strong&gt; із можливостями &lt;em&gt;%4&lt;/em&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt; and features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>Налаштувати розділ %3 &lt;strong&gt;%1&lt;/strong&gt; із точкою монтування &lt;strong&gt;%2&lt;/strong&gt; і можливостями &lt;em&gt;%4&lt;/em&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
<translation type="unfinished"/>
<translation>Налаштувати розділ %3 &lt;strong&gt;%1&lt;/strong&gt; із точкою монтування &lt;strong&gt;%2&lt;/strong&gt;%4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
@ -3983,29 +3987,31 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation>Встановлення завершено</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.&lt;br/&gt;
You may now restart into your new system, or continue using the Live environment.</source>
<translation type="unfinished"/>
<translation>На ваш комп'ютер встановлено %1.&lt;br/&gt;
Тепер ви можете перезапустити вашу нову систему або продовжити користуватися середовищем портативної системи.</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation>Закрити засіб встановлення</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
<translation type="unfinished"/>
<translation>Перезапустити систему</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
<source>&lt;p&gt;A full log of the install is available as installation.log in the home directory of the Live user.&lt;br/&gt;
This log is copied to /var/log/installation.log of the target system.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Повний журнал встановлення записано до файла installation.log у домашньому каталозі користувача портативної системи.&lt;br/&gt;
Цей журнал скопійовано до /var/log/installation.log системи призначення.&lt;/p&gt;</translation>
</message>
</context>
<context>

@ -6,7 +6,7 @@
<message>
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
<source>Manage auto-mount settings</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -316,7 +316,11 @@
%1
Link copied to clipboard</source>
<translation type="unfinished"/>
<translation>
%1
簿</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
@ -852,12 +856,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
<source>The setup of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="146"/>
<source>The installation of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="150"/>
@ -971,12 +975,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
<translation type="unfinished"/>
<translation> %3 (%2) 使 %4 %1MiB </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation> %3 (%2) %1MiB </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
@ -986,12 +990,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%3&lt;/strong&gt; (%2) 使 &lt;em&gt;%4&lt;/em&gt; &lt;strong&gt;%1MiB&lt;/strong&gt; </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%3&lt;/strong&gt; (%2) &lt;strong&gt;%1MiB&lt;/strong&gt; </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
<source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition with features &lt;em&gt;%3&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation> &lt;em&gt;%3&lt;/em&gt; &lt;strong&gt;&lt;/strong&gt; %2 %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
@ -1349,27 +1353,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt; and features &lt;em&gt;%3&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; &lt;em&gt;%3&lt;/em&gt; &lt;strong&gt;&lt;/strong&gt; %2 </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; %3 &lt;strong&gt;&lt;/strong&gt; %2 </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
<source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;em&gt;%4&lt;/em&gt; %3 &lt;strong&gt;%1&lt;/strong&gt; %2</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt; and features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation> %3 &lt;strong&gt;%1&lt;/strong&gt; &lt;strong&gt;%2&lt;/strong&gt; &lt;em&gt;%4&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
<translation type="unfinished"/>
<translation> %3 &lt;strong&gt;%1&lt;/strong&gt; &lt;strong&gt;%2&lt;/strong&gt; %4</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
@ -3950,29 +3954,31 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.&lt;br/&gt;
You may now restart into your new system, or continue using the Live environment.</source>
<translation type="unfinished"/>
<translation>%1 &lt;br/&gt;
使 Live </translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
<source>&lt;p&gt;A full log of the install is available as installation.log in the home directory of the Live user.&lt;br/&gt;
This log is copied to /var/log/installation.log of the target system.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt; Live 使 installation.log &lt;br/&gt;
/var/log/installation.log&lt;/p&gt;</translation>
</message>
</context>
<context>

@ -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()

Loading…
Cancel
Save