Merge branch 'master' of https://github.com/calamares/calamares into development
This commit is contained in:
Philip
commit
c1aff3631f
@ -1,18 +1,20 @@
|
||||
<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.1" language="en">
|
||||
<context>
|
||||
<name>BootInfoWidget</name>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="69"/>
|
||||
<source>The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.</source>
|
||||
<translation>The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="75"/>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
|
||||
<source>This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
|
||||
<translation>This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="87"/>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
|
||||
<source>This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
|
||||
<translation>This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</translation>
|
||||
</message>
|
||||
@ -591,27 +593,27 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<translation>Si&ze:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="66"/>
|
||||
<source>En&crypt</source>
|
||||
<translation>En&crypt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="161"/>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="162"/>
|
||||
<source>Logical</source>
|
||||
<translation>Logical</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="166"/>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="167"/>
|
||||
<source>Primary</source>
|
||||
<translation>Primary</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="183"/>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="184"/>
|
||||
<source>GPT</source>
|
||||
<translation>GPT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="269"/>
|
||||
<source>Mountpoint already in use. Please select another one.</source>
|
||||
<translation>Mountpoint already in use. Please select another one.</translation>
|
||||
</message>
|
||||
@ -824,7 +826,7 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<context>
|
||||
<name>DeviceInfoWidget</name>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="63"/>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="150"/>
|
||||
<source>The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.</source>
|
||||
<translation>The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.</translation>
|
||||
</message>
|
||||
@ -941,7 +943,7 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<translation>Flags:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
|
||||
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="307"/>
|
||||
<source>Mountpoint already in use. Please select another one.</source>
|
||||
<translation>Mountpoint already in use. Please select another one.</translation>
|
||||
</message>
|
||||
@ -969,7 +971,7 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<translation>Confirm passphrase</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="150"/>
|
||||
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/>
|
||||
<source>Please enter the same passphrase in both boxes.</source>
|
||||
<translation>Please enter the same passphrase in both boxes.</translation>
|
||||
</message>
|
||||
@ -1038,17 +1040,17 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<context>
|
||||
<name>FinishedViewStep</name>
|
||||
<message>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="56"/>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="60"/>
|
||||
<source>Finish</source>
|
||||
<translation>Finish</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="117"/>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="126"/>
|
||||
<source>Installation Complete</source>
|
||||
<translation>Installation Complete</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
|
||||
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="127"/>
|
||||
<source>The installation of %1 is complete.</source>
|
||||
<translation>The installation of %1 is complete.</translation>
|
||||
</message>
|
||||
@ -1159,6 +1161,16 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<source>The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.</source>
|
||||
<translation>The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="66"/>
|
||||
<source>&Cancel</source>
|
||||
<translation type="unfinished">&Cancel</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
|
||||
<source>&OK</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>LicensePage</name>
|
||||
@ -1575,7 +1587,7 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<translation>Install boot &loader on:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="160"/>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="161"/>
|
||||
<source>Are you sure you want to create a new partition table on %1?</source>
|
||||
<translation>Are you sure you want to create a new partition table on %1?</translation>
|
||||
</message>
|
||||
@ -2286,4 +2298,4 @@ The installer will quit and all changes will be lost.</translation>
|
||||
<translation>Welcome</translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
</TS>
|
||||
|
||||
@ -1,27 +1,54 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2017-08-21 17:55-0400\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-09-04 08:16-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
|
||||
#: src/modules/dummypython/main.py:44
|
||||
msgid "Dummy python job."
|
||||
msgstr "Dummy python job."
|
||||
|
||||
#: src/modules/dummypython/main.py:97
|
||||
msgid "Dummy python step {}"
|
||||
msgstr "Dummy python step {}"
|
||||
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
||||
|
||||
#: src/modules/machineid/main.py:35
|
||||
msgid "Generate machine-id."
|
||||
msgstr "Generate machine-id."
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypython/main.py:44
|
||||
msgid "Dummy python job."
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypython/main.py:97
|
||||
msgid "Dummy python step {}"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/packages/main.py:59
|
||||
#, python-format
|
||||
msgid "Processing packages (%(count)d / %(total)d)"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/packages/main.py:61
|
||||
#, python-format
|
||||
msgid "Installing one package."
|
||||
msgid_plural "Installing %(num)d packages."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/modules/packages/main.py:64
|
||||
#, python-format
|
||||
msgid "Removing one package."
|
||||
msgid_plural "Removing %(num)d packages."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/modules/packages/main.py:68
|
||||
msgid "Install packages."
|
||||
msgstr ""
|
||||
|
||||
@ -1,39 +1,42 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2017-08-21 17:55-0400\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-09-04 08:16-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:84
|
||||
msgid "Click me!"
|
||||
msgstr "Click me!"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:94
|
||||
msgid "A new QLabel."
|
||||
msgstr "A new QLabel."
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:97
|
||||
msgid "Dummy PythonQt ViewStep"
|
||||
msgstr "Dummy PythonQt ViewStep"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:183
|
||||
msgid "The Dummy PythonQt Job"
|
||||
msgstr "The Dummy PythonQt Job"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:186
|
||||
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
|
||||
msgstr "This is the Dummy PythonQt Job. The dummy job says: {}"
|
||||
msgstr ""
|
||||
|
||||
#: src/modules/dummypythonqt/main.py:190
|
||||
msgid "A status message for Dummy PythonQt Job."
|
||||
msgstr "A status message for Dummy PythonQt Job."
|
||||
msgstr ""
|
||||
|
||||
@ -262,12 +262,20 @@ class FstabGenerator(object):
|
||||
check=check,
|
||||
)
|
||||
|
||||
return dict(device="UUID=" + partition["uuid"],
|
||||
mount_point=mount_point or "swap",
|
||||
fs=filesystem,
|
||||
options=options,
|
||||
check=check,
|
||||
)
|
||||
if "luksMapperName" in partition:
|
||||
return dict(device="/dev/mapper/" + partition["luksMapperName"],
|
||||
mount_point=mount_point or "swap",
|
||||
fs=filesystem,
|
||||
options=options,
|
||||
check=check,
|
||||
)
|
||||
else:
|
||||
return dict(device="UUID=" + partition["uuid"],
|
||||
mount_point=mount_point or "swap",
|
||||
fs=filesystem,
|
||||
options=options,
|
||||
check=check,
|
||||
)
|
||||
|
||||
def print_fstab_line(self, dct, file=None):
|
||||
""" Prints line to '/etc/fstab' file. """
|
||||
|
||||
@ -40,6 +40,8 @@ def modify_grub_default(partitions, root_mount_point, distributor):
|
||||
dracut_bin = libcalamares.utils.target_env_call(
|
||||
["sh", "-c", "which dracut"]
|
||||
)
|
||||
have_dracut = dracut_bin == 0 # Shell exit value 0 means success
|
||||
|
||||
use_splash = ""
|
||||
swap_uuid = ""
|
||||
swap_outer_uuid = ""
|
||||
@ -50,7 +52,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
|
||||
|
||||
cryptdevice_params = []
|
||||
|
||||
if dracut_bin == 0:
|
||||
if have_dracut:
|
||||
for partition in partitions:
|
||||
if partition["fs"] == "linuxswap":
|
||||
swap_uuid = partition["uuid"]
|
||||
|
||||
@ -41,7 +41,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale,
|
||||
upperText->setText( tr( "The system locale setting affects the language and character "
|
||||
"set for some command line user interface elements.<br/>"
|
||||
"The current setting is <strong>%1</strong>." )
|
||||
.arg( guessedLCLocale ) );
|
||||
.arg( guessedLCLocale ) );
|
||||
mainLayout->addWidget( upperText );
|
||||
setMinimumWidth( upperText->fontMetrics().height() * 24 );
|
||||
|
||||
@ -61,8 +61,11 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale,
|
||||
}
|
||||
|
||||
QDialogButtonBox* dbb = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
|
||||
Qt::Horizontal,
|
||||
this );
|
||||
Qt::Horizontal,
|
||||
this );
|
||||
dbb->button( QDialogButtonBox::Cancel )->setText( tr( "&Cancel" ) );
|
||||
dbb->button( QDialogButtonBox::Ok )->setText( tr( "&OK" ) );
|
||||
|
||||
mainLayout->addWidget( dbb );
|
||||
|
||||
connect( dbb->button( QDialogButtonBox::Ok ), &QPushButton::clicked,
|
||||
@ -83,9 +86,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale,
|
||||
} );
|
||||
|
||||
if ( selected > -1 )
|
||||
{
|
||||
m_localesWidget->setCurrentRow( selected );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user