diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3415b4cd4..9a2204613 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,11 @@
---
name: Bug report
-about: Hi! Thank you for helping improve Calamares. If you are seeing a problem in installing a specific distribution, you should **probably** report the problem in the distribution's bug tracker, first. That helps filter out issues with packaging, mis-configuration, etc. that Calamares has no control over. If you are a distribution packager or maintainer, this page is for you.
+about: Create a report to help us improve
---
+
+> Hi! Thank you for helping improve Calamares. If you are seeing a problem in installing a specific distribution, you should **probably** report the problem in the distribution's bug tracker, first. That helps filter out issues with packaging, mis-configuration, etc. that Calamares has no control over. If you are a distribution packager or maintainer, this page is for you.
+
**Describe the bug**
A clear and concise description of what the bug is. Please include 32/64 bit machine details, EFI/BIOS details, and disk setup.
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 8bd9c5bda..54a23b4e7 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -1,4 +1,6 @@
-
+
+
+BootInfoWidget
@@ -45,6 +47,14 @@
%1 (%2)
+
+ Calamares::BlankViewStep
+
+
+
+
+
+Calamares::DebugWindow
@@ -97,7 +107,7 @@
Calamares::ExecutionViewStep
-
+ Install
@@ -105,7 +115,7 @@
Calamares::JobThread
-
+ Done
@@ -113,12 +123,12 @@
Calamares::ProcessJob
-
+ Run command %1 %2
-
+ Running command %1 %2
@@ -126,32 +136,32 @@
Calamares::PythonJob
-
+ Running %1 operation.
-
+ Bad working directory path
-
+ Working directory %1 for python job %2 is not readable.
-
+ Bad main script file
-
+ Main script file %1 for python job %2 is not readable.
-
+ Boost.Python error in job "%1".
@@ -159,97 +169,112 @@
Calamares::ViewManager
-
+ &Back
-
-
+
+ &Next
-
-
+
+ &Cancel
-
-
+
+ Cancel installation without changing the system.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Install
-
+ Cancel installation?
-
+ Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.
-
+ &Yes
-
+ &No
-
+ &Close
-
+ Continue with setup?
-
+ The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
-
+ &Install now
-
+ Go &back
-
+ &Done
-
+ The installation is complete. Close the installer.
-
+ Error
-
+ Installation Failed
@@ -436,17 +461,17 @@ The installer will quit and all changes will be lost.
ClearMountsJob
-
+ Clear mounts for partitioning operations on %1
-
+ Clearing mounts for partitioning operations on %1.
-
+ Cleared all mounts for %1
@@ -554,27 +579,27 @@ The installer will quit and all changes will be lost.
Si&ze:
-
+ En&crypt
-
+ Logical
-
+ Primary
-
+ GPT
-
+ Mountpoint already in use. Please select another one.
@@ -776,7 +801,7 @@ The installer will quit and all changes will be lost.
DummyCppJob
-
+ Dummy C++ Job
@@ -834,7 +859,7 @@ The installer will quit and all changes will be lost.
Flags:
-
+ Mountpoint already in use. Please select another one.
@@ -1003,12 +1028,12 @@ The installer will quit and all changes will be lost.
KeyboardPage
-
+ Set keyboard model to %1.<br/>
-
+ Set keyboard layout to %1/%2.
@@ -1052,64 +1077,64 @@ The installer will quit and all changes will be lost.
Form
-
+ I accept the terms and conditions above.
-
+ <h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.
-
+ Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.
-
+ <h1>License Agreement</h1>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
-
+ Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
-
+ %1 is an untranslatable product name, example: Creative Audigy driver<strong>%1 driver</strong><br/>by %2
-
+ %1 is usually a vendor name, example: Nvidia graphics driver<strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font>
-
+ <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font>
-
+ <strong>%1 codec</strong><br/><font color="Grey">by %2</font>
-
+ <strong>%1 package</strong><br/><font color="Grey">by %2</font>
-
+ <strong>%1</strong><br/><font color="Grey">by %2</font>
-
+ <a href="%1">view license agreement</a>
@@ -1583,34 +1608,34 @@ The installer will quit and all changes will be lost.
PartitionModel
-
-
+
+ Free Space
-
-
+
+ New partition
-
+ Name
-
+ File System
-
+ Mount Point
-
+ Size
@@ -1639,8 +1664,8 @@ The installer will quit and all changes will be lost.
-
- &Create
+
+
@@ -1658,17 +1683,17 @@ The installer will quit and all changes will be lost.
Install boot &loader on:
-
+ Are you sure you want to create a new partition table on %1?
-
+ Can not create new partition
-
+ The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
@@ -1676,97 +1701,97 @@ The installer will quit and all changes will be lost.
PartitionViewStep
-
+ Gathering system information...
-
+ Partitions
-
+ Install %1 <strong>alongside</strong> another operating system.
-
+ <strong>Erase</strong> disk and install %1.
-
+ <strong>Replace</strong> a partition with %1.
-
+ <strong>Manual</strong> partitioning.
-
+ Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-
+ <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-
+ <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-
+ <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-
+ Disk <strong>%1</strong> (%2)
-
+ Current:
-
+ After:
-
+ No EFI system partition configured
-
+ An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-
+ EFI system partition flag not set
-
+ An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-
+ Boot partition not encrypted
-
+ A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
@@ -1912,22 +1937,22 @@ Output:
Default
-
+ unknown
-
+ extended
-
+ unformatted
-
+ swap
@@ -2109,29 +2134,29 @@ Output:
SetHostNameJob
-
+ Set hostname %1
-
+ Set hostname <strong>%1</strong>.
-
+ Setting hostname %1.
-
-
+
+ Internal Error
-
-
+
+ Cannot write hostname to target system
@@ -2583,9 +2608,9 @@ Output:
WelcomeViewStep
-
+ Welcome
-
\ No newline at end of file
+
diff --git a/lang/python.pot b/lang/python.pot
index fab6d56ba..2062b9031 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,57 +2,57 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
-#
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-28 04:57-0400\n"
+"POT-Creation-Date: 2018-06-18 07:46-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: src/modules/umount/main.py:40
msgid "Unmount file systems."
-msgstr "Unmount file systems."
+msgstr ""
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
-msgstr "Dummy python job."
+msgstr ""
#: src/modules/dummypython/main.py:97
msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+msgstr ""
#: src/modules/machineid/main.py:35
msgid "Generate machine-id."
-msgstr "Generate machine-id."
+msgstr ""
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+msgstr ""
-#: src/modules/packages/main.py:63 src/modules/packages/main.py:73
+#: src/modules/packages/main.py:64 src/modules/packages/main.py:74
msgid "Install packages."
-msgstr "Install packages."
+msgstr ""
-#: src/modules/packages/main.py:66
+#: src/modules/packages/main.py:67
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
-#: src/modules/packages/main.py:69
+#: src/modules/packages/main.py:70
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot
index 1fc28e16d..2cac1d0c0 100644
--- a/src/modules/dummypythonqt/lang/dummypythonqt.pot
+++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot
@@ -2,41 +2,41 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
-#
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-07 18:58+0100\n"
+"POT-Creation-Date: 2018-06-18 07:46-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \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 ""