Merge branch 'hotfix-38' into calamares
This commit is contained in:
commit
46f7e6c131
12
CHANGES
12
CHANGES
@ -23,6 +23,18 @@ This release contains contributions from (alphabetically by first name):
|
|||||||
`mount.conf` file.
|
`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) #
|
# 3.2.38 (2021-03-14) #
|
||||||
|
|
||||||
This release contains contributions from (alphabetically by first name):
|
This release contains contributions from (alphabetically by first name):
|
||||||
|
@ -5,7 +5,7 @@ Name=Install System
|
|||||||
GenericName=System Installer
|
GenericName=System Installer
|
||||||
Keywords=calamares;system;installer;
|
Keywords=calamares;system;installer;
|
||||||
TryExec=calamares
|
TryExec=calamares
|
||||||
Exec=pkexec /usr/bin/calamares
|
Exec=sh -c "pkexec calamares"
|
||||||
Comment=Calamares — System Installer
|
Comment=Calamares — System Installer
|
||||||
Icon=calamares
|
Icon=calamares
|
||||||
Terminal=false
|
Terminal=false
|
||||||
|
@ -5,7 +5,7 @@ Name=Install System
|
|||||||
GenericName=System Installer
|
GenericName=System Installer
|
||||||
Keywords=calamares;system;installer;
|
Keywords=calamares;system;installer;
|
||||||
TryExec=calamares
|
TryExec=calamares
|
||||||
Exec=pkexec /usr/bin/calamares
|
Exec=sh -c "pkexec calamares"
|
||||||
Comment=Calamares — System Installer
|
Comment=Calamares — System Installer
|
||||||
Icon=calamares
|
Icon=calamares
|
||||||
Terminal=false
|
Terminal=false
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
||||||
<source>Manage auto-mount settings</source>
|
<source>Manage auto-mount settings</source>
|
||||||
<translation type="unfinished"/>
|
<translation>자동 마운트 설정 관리</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -316,7 +316,11 @@
|
|||||||
%1
|
%1
|
||||||
|
|
||||||
Link copied to clipboard</source>
|
Link copied to clipboard</source>
|
||||||
<translation type="unfinished"/>
|
<translation>게시한 로그를 설치합니다.
|
||||||
|
|
||||||
|
%1
|
||||||
|
|
||||||
|
링크가 클립보드에 복사되었습니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
||||||
@ -852,12 +856,12 @@ The installer will quit and all changes will be lost.</source>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
||||||
<source>The setup of %1 did not complete successfully.</source>
|
<source>The setup of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1 설정이 제대로 완료되지 않았습니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
||||||
<source>The installation of %1 did not complete successfully.</source>
|
<source>The installation of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1 설치가 제대로 완료되지 않았습니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="150"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%4 항목이 있는 %3(%2)에 새 %1MiB 파티션을 만듭니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2).</source>
|
<source>Create new %1MiB partition on %3 (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%3(%2)에 새 %1MiB 파티션을 만듭니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation><em>%4</em> 항목이 있는 <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation><strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
||||||
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
||||||
<translation type="unfinished"/>
|
<translation><em>%3</em> 기능이 있는 <strong>새</strong> %2 시스템 파티션에 %1을(를) 설치합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>마운트 지점 <strong>%1</strong> 및 기능 <em>%3</em>(으)로 <strong>새</strong> %2 파티션을 설정합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>마운트 지점 <strong>%1</strong>%3(으)로 <strong>새</strong> %2 파티션을 설정합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
||||||
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation><em>%4</em> 기능이 있는 %3 시스템 파티션 <strong>%1</strong>에 %2을(를) 설치합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>마운트 지점 <strong>%2</strong> 및 기능 <em>%4</em>(으)로 %3 파티션 <strong>%1</strong>을(를) 설정합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>마운트 지점 <strong>%2</strong>%4으로 %3 파티션 <strong>%1</strong>을(를) 설정합니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
||||||
@ -3950,29 +3954,31 @@ Output:
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
||||||
<source>Installation Completed</source>
|
<source>Installation Completed</source>
|
||||||
<translation type="unfinished"/>
|
<translation>설치 완료</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
||||||
<source>%1 has been installed on your computer.<br/>
|
<source>%1 has been installed on your computer.<br/>
|
||||||
You may now restart into your new system, or continue using the Live environment.</source>
|
You may now restart into your new system, or continue using the Live environment.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1이(가) 컴퓨터에 설치되었습니다.<br/>
|
||||||
|
이제 새 시스템으로 다시 시작하거나 라이브 환경을 계속 사용할 수 있습니다.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
||||||
<source>Close Installer</source>
|
<source>Close Installer</source>
|
||||||
<translation type="unfinished"/>
|
<translation>설치 관리자 닫기</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
||||||
<source>Restart System</source>
|
<source>Restart System</source>
|
||||||
<translation type="unfinished"/>
|
<translation>시스템 재시작</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
||||||
<source><p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
|
<source><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></source>
|
This log is copied to /var/log/installation.log of the target system.</p></source>
|
||||||
<translation type="unfinished"/>
|
<translation><p>설치의 전체 로그는 라이브 사용자의 홈 디렉토리에 installation.log로 제공됩니다.<br/>
|
||||||
|
이 로그는 대상 시스템의 /var/log/installation.log에 복사됩니다.</p></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
||||||
<source>Manage auto-mount settings</source>
|
<source>Manage auto-mount settings</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Керування параметрами автомонтування</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -322,7 +322,11 @@
|
|||||||
%1
|
%1
|
||||||
|
|
||||||
Link copied to clipboard</source>
|
Link copied to clipboard</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Журнал встановлення записано до
|
||||||
|
|
||||||
|
%1
|
||||||
|
|
||||||
|
Посилання скопійовано до буфера обміну</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
||||||
@ -858,12 +862,12 @@ The installer will quit and all changes will be lost.</source>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
||||||
<source>The setup of %1 did not complete successfully.</source>
|
<source>The setup of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Налаштування %1 не завершено успішно.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
||||||
<source>The installation of %1 did not complete successfully.</source>
|
<source>The installation of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Встановлення %1 не завершено успішно.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="150"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Створити розділ %1МіБ на %3 (%2) із записами %4.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2).</source>
|
<source>Create new %1MiB partition on %3 (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Створити розділ %1МіБ на %3 (%2).</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2) із записами <em>%4</em>.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2).</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
||||||
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
||||||
<translation type="unfinished"/>
|
<translation>Встановити %1 на <strong>новий</strong> системний розділ %2 із можливостями <em>%3</em></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Налаштувати <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong> і можливостями <em>%3</em>.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Налаштувати <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong>%3.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
||||||
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Встановити %2 на системний розділ %3 <strong>%1</strong> із можливостями <em>%4</em>.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong> і можливостями <em>%4</em>.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong>%4.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
||||||
@ -3983,29 +3987,31 @@ Output:
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
||||||
<source>Installation Completed</source>
|
<source>Installation Completed</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Встановлення завершено</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
||||||
<source>%1 has been installed on your computer.<br/>
|
<source>%1 has been installed on your computer.<br/>
|
||||||
You may now restart into your new system, or continue using the Live environment.</source>
|
You may now restart into your new system, or continue using the Live environment.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>На ваш комп'ютер встановлено %1.<br/>
|
||||||
|
Тепер ви можете перезапустити вашу нову систему або продовжити користуватися середовищем портативної системи.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
||||||
<source>Close Installer</source>
|
<source>Close Installer</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Закрити засіб встановлення</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
||||||
<source>Restart System</source>
|
<source>Restart System</source>
|
||||||
<translation type="unfinished"/>
|
<translation>Перезапустити систему</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
||||||
<source><p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
|
<source><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></source>
|
This log is copied to /var/log/installation.log of the target system.</p></source>
|
||||||
<translation type="unfinished"/>
|
<translation><p>Повний журнал встановлення записано до файла installation.log у домашньому каталозі користувача портативної системи.<br/>
|
||||||
|
Цей журнал скопійовано до /var/log/installation.log системи призначення.</p></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
|
||||||
<source>Manage auto-mount settings</source>
|
<source>Manage auto-mount settings</source>
|
||||||
<translation type="unfinished"/>
|
<translation>管理自動掛載設定</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
@ -316,7 +316,11 @@
|
|||||||
%1
|
%1
|
||||||
|
|
||||||
Link copied to clipboard</source>
|
Link copied to clipboard</source>
|
||||||
<translation type="unfinished"/>
|
<translation>安裝紀錄檔已張貼到:
|
||||||
|
|
||||||
|
%1
|
||||||
|
|
||||||
|
連結已複製到剪貼簿</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
|
||||||
@ -852,12 +856,12 @@ The installer will quit and all changes will be lost.</source>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
<location filename="../src/modules/finished/Config.cpp" line="145"/>
|
||||||
<source>The setup of %1 did not complete successfully.</source>
|
<source>The setup of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1 的設定並未成功完成。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
<location filename="../src/modules/finished/Config.cpp" line="146"/>
|
||||||
<source>The installation of %1 did not complete successfully.</source>
|
<source>The installation of %1 did not complete successfully.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1 的安裝並未成功完成。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finished/Config.cpp" line="150"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>在 %3 (%2) 上使用項目 %4 建立新的 %1MiB 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
|
||||||
<source>Create new %1MiB partition on %3 (%2).</source>
|
<source>Create new %1MiB partition on %3 (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation>在 %3 (%2) 上建立新的 %1MiB 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>在 <strong>%3</strong> (%2) 上使用項目 <em>%4</em> 建立新的 <strong>%1MiB</strong> 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
|
||||||
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
|
||||||
<translation type="unfinished"/>
|
<translation>在 <strong>%3</strong> (%2) 上建立新的 <strong>%1MiB</strong> 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
|
||||||
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
|
||||||
<translation type="unfinished"/>
|
<translation>在有 <em>%3</em> 功能的<strong>新</strong> %2 系統分割區上安裝 %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
|
<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>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>設定有掛載點 <strong>%1</strong> 與 <em>%3</em> 的<strong>新</strong> %2 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
|
||||||
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>設定有掛載點 <strong>%1</strong> %3 的<strong>新</strong> %2 分割區。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
|
||||||
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>在有功能 <em>%4</em> 的 %3 系統分割區 <strong>%1</strong> 上安裝 %2。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong> 與功能 <em>%4</em>。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
|
||||||
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong> %4。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
|
||||||
@ -3950,29 +3954,31 @@ Output:
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
|
||||||
<source>Installation Completed</source>
|
<source>Installation Completed</source>
|
||||||
<translation type="unfinished"/>
|
<translation>安裝完成</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
|
||||||
<source>%1 has been installed on your computer.<br/>
|
<source>%1 has been installed on your computer.<br/>
|
||||||
You may now restart into your new system, or continue using the Live environment.</source>
|
You may now restart into your new system, or continue using the Live environment.</source>
|
||||||
<translation type="unfinished"/>
|
<translation>%1 已安裝到您的電腦上。<br/>
|
||||||
|
現在,您可以重新啟動到您的新系統,或繼續使用 Live 環境。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
|
||||||
<source>Close Installer</source>
|
<source>Close Installer</source>
|
||||||
<translation type="unfinished"/>
|
<translation>關閉安裝程式</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
|
||||||
<source>Restart System</source>
|
<source>Restart System</source>
|
||||||
<translation type="unfinished"/>
|
<translation>重新啟動系統</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
|
||||||
<source><p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
|
<source><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></source>
|
This log is copied to /var/log/installation.log of the target system.</p></source>
|
||||||
<translation type="unfinished"/>
|
<translation><p>完整安裝紀錄檔可在 Live 使用者的家目錄中以 installation.log 的名稱取得。<br/>
|
||||||
|
此紀錄檔已複製到目標系統的 /var/log/installation.log。</p></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -105,6 +105,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent )
|
|||||||
connect( ui->textBoxFullName, &QLineEdit::textEdited, config, &Config::setFullName );
|
connect( ui->textBoxFullName, &QLineEdit::textEdited, config, &Config::setFullName );
|
||||||
connect( config, &Config::fullNameChanged, this, &UsersPage::onFullNameTextEdited );
|
connect( config, &Config::fullNameChanged, this, &UsersPage::onFullNameTextEdited );
|
||||||
|
|
||||||
|
ui->textBoxHostName->setText( config->hostName() );
|
||||||
connect( ui->textBoxHostName, &QLineEdit::textEdited, config, &Config::setHostName );
|
connect( ui->textBoxHostName, &QLineEdit::textEdited, config, &Config::setHostName );
|
||||||
connect( config, &Config::hostNameChanged, ui->textBoxHostName, &QLineEdit::setText );
|
connect( config, &Config::hostNameChanged, ui->textBoxHostName, &QLineEdit::setText );
|
||||||
connect( config, &Config::hostNameStatusChanged, this, &UsersPage::reportHostNameStatus );
|
connect( config, &Config::hostNameStatusChanged, this, &UsersPage::reportHostNameStatus );
|
||||||
@ -144,9 +145,12 @@ UsersPage::UsersPage( Config* config, QWidget* parent )
|
|||||||
onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() );
|
onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() );
|
||||||
onFullNameTextEdited( m_config->fullName() );
|
onFullNameTextEdited( m_config->fullName() );
|
||||||
reportLoginNameStatus( m_config->loginNameStatus() );
|
reportLoginNameStatus( m_config->loginNameStatus() );
|
||||||
|
reportHostNameStatus( m_config->hostNameStatus() );
|
||||||
|
|
||||||
ui->textBoxLoginName->setEnabled( m_config->isEditable( "loginName" ) );
|
ui->textBoxLoginName->setEnabled( m_config->isEditable( "loginName" ) );
|
||||||
ui->textBoxFullName->setEnabled( m_config->isEditable( "fullName" ) );
|
ui->textBoxFullName->setEnabled( m_config->isEditable( "fullName" ) );
|
||||||
|
|
||||||
|
retranslate();
|
||||||
}
|
}
|
||||||
|
|
||||||
UsersPage::~UsersPage()
|
UsersPage::~UsersPage()
|
||||||
|
Loading…
Reference in New Issue
Block a user